[Bug 226920] devel/glib20: pull the latest file monitor fix from upstream

[bugzilla-noreply at freebsd.org]

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=226920

--- Comment #16 from Ting-Wei Lan <lantw44 at gmail.com> ---
(In reply to lightside from comment #15)
THere was an assertion failure in _kqsub_free on line 364:

  360 static void
  361 _kqsub_free (kqueue_sub *sub)
  362 {
  363   g_assert (sub->deps == NULL);
  364   g_assert (sub->fd == -1);
  365 
  366   g_source_unref ((GSource *) sub->source);
  367   g_free (sub->filename);
  368   g_slice_free (kqueue_sub, sub);
  369 }

_kqsub_free was called by g_kqueue_file_monitor_cancel on line 326.

  323   if (kqueue_monitor->sub)
  324     {
  325       _kqsub_cancel (kqueue_monitor->sub);
  326       _kqsub_free (kqueue_monitor->sub);
  327       kqueue_monitor->sub = NULL;
  328     }

The previous function call, _kqsub_cancel, set sub->fd to -1 when it succeeded.

  371 static gboolean
  372 _kqsub_cancel (kqueue_sub *sub)
  373 {
  374   struct kevent ev;
  375 
  376   if (sub->deps)
  377     {
  378       dl_free (sub->deps);
  379       sub->deps = NULL;
  380     }
  381 
  382   _km_remove (sub);
  383 
  384   /* Only in the missing list?  We're done! */
  385   if (sub->fd == -1)
  386     return TRUE;
  387 
  388   EV_SET (&ev, sub->fd, EVFILT_VNODE, EV_DELETE, NOTE_ALL, 0, sub);
  389   if (kevent (kq_queue, &ev, 1, NULL, 0, NULL) == -1)
  390     {
  391       g_warning ("Unable to remove event for %s: %s", sub->filename,
g_strerror (errno));
  392       return FALSE;
  393     }
  394 
  395   close (sub->fd);
  396   sub->fd = -1;
  397 
  398   return TRUE;
  399 }

For _kqsub_cancel to return without setting sub->fd to -1, it must return on
line 392, which means the kevent call failed.

-- 
You are receiving this mail because:
You are on the CC list for the bug.