diff options
| author | Kay Sievers <kay@vrfy.org> | 2012-06-18 15:45:01 +0200 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2012-06-18 15:58:44 +0200 |
| commit | b30b4260255702345eab1ac076bb00869057c16b (patch) | |
| tree | f6707e6a9912a8bd581b32b5e9b4d2e0995266e1 | |
| parent | 10b6f904cc58c5a725f123e17819516eca606a3e (diff) | |
libudev: clarify that udev_monitor_receive_device() is non-blocking
Based on a patch from: Sam Thursfield <ssssam@gmail.com>
https://bugs.freedesktop.org/show_bug.cgi?id=51202
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | src/libudev/libudev-monitor.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 98a85063ca..77b4aa74ee 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,7 +28,7 @@ LIBUDEV_REVISION=1 LIBUDEV_AGE=0 LIBGUDEV_CURRENT=1 -LIBGUDEV_REVISION=1 +LIBGUDEV_REVISION=2 LIBGUDEV_AGE=1 LIBSYSTEMD_LOGIN_CURRENT=2 diff --git a/src/libudev/libudev-monitor.c b/src/libudev/libudev-monitor.c index 32319aca7b..2ad9e1c3ad 100644 --- a/src/libudev/libudev-monitor.c +++ b/src/libudev/libudev-monitor.c @@ -494,6 +494,11 @@ tag: * * Only socket connections with uid=0 are accepted. * + * The monitor socket is by default set to NONBLOCK. A variant of poll() on + * the file descriptor returned by udev_monitor_get_fd() should to be used to + * wake up when new devices arrive, or alternatively the file descriptor + * switched into blocking mode. + * * The initial refcount is 1, and needs to be decremented to * release the resources of the udev device. * |