shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-01 00:51:24 +03:00
Code

udevd: explicitly read out uevents we create ourselves

Browse Source 
Rather than skippling ctrl handling whenever we have handlede inotify events
(and hence may have synthesized a 'change' event), just call the uevent
handling explicitly from on_inotify() so that the event queue is up-to-date.
This commit is contained in:
Tom Gundersen 2015-05-12 16:51:31 +02:00
parent e82e8fa5b1
commit a8389097c0
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/udev/udevd.c
View File

@ -910,9 +910,16 @@ static int on_inotify(sd_event_source *s, int fd, uint32_t revents, void *userda
continue; continue;
log_debug("inotify event: %x for %s", e->mask, udev_device_get_devnode(dev)); log_debug("inotify event: %x for %s", e->mask, udev_device_get_devnode(dev));
if (e->mask & IN_CLOSE_WRITE) if (e->mask & IN_CLOSE_WRITE) {
synthesize_change(dev); synthesize_change(dev);
else if (e->mask & IN_IGNORED)
/* settle might be waiting on us to determine the queue
* state. If we just handled an inotify event, we might have
* generated a "change" event, but we won't have queued up
* the resultant uevent yet. Do that.
*/
on_uevent(NULL, -1, 0, monitor);
} else if (e->mask & IN_IGNORED)
udev_watch_end(udev, dev); udev_watch_end(udev, dev);
} }
@ -1565,22 +1572,9 @@ int main(int argc, char *argv[]) {
continue; continue;
/* device node watch */ /* device node watch */
if (is_inotify) { if (is_inotify)
on_inotify(NULL, fd_inotify, 0, udev); on_inotify(NULL, fd_inotify, 0, udev);
/*
* settle might be waiting on us to determine the queue
* state. If we just handled an inotify event, we might have
* generated a "change" event, but we won't have queued up
* the resultant uevent yet.
*
* Before we go ahead and potentially tell settle that the
* queue is empty, lets loop one more time to update the
* queue state again before deciding.
*/
continue;
}
/* tell settle that we are busy or idle, this needs to be before the /* tell settle that we are busy or idle, this needs to be before the
* PING handling * PING handling
*/ */