From b30b4260255702345eab1ac076bb00869057c16b Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Mon, 18 Jun 2012 15:45:01 +0200 Subject: [PATCH 1/1] libudev: clarify that udev_monitor_receive_device() is non-blocking Based on a patch from: Sam Thursfield https://bugs.freedesktop.org/show_bug.cgi?id=51202 --- Makefile.am | 2 +- src/libudev/libudev-monitor.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 98a85063c..77b4aa74e 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 32319aca7..2ad9e1c3a 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. * -- 2.30.2