[systemd-commits] Makefile.am src/libudev

[Kay Sievers]

 Makefile.am                   |    2 +-
 src/libudev/libudev-monitor.c |    5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit b30b4260255702345eab1ac076bb00869057c16b
Author: Kay Sievers <kay at vrfy.org>
Date:   Mon Jun 18 15:45:01 2012 +0200

    libudev: clarify that udev_monitor_receive_device() is non-blocking
    
    Based on a patch from: Sam Thursfield <ssssam at gmail.com>
    https://bugs.freedesktop.org/show_bug.cgi?id=51202

diff --git a/Makefile.am b/Makefile.am
index 98a8506..77b4aa7 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 32319ac..2ad9e1c 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.
  *