[systemd-commits] src/device.c

[Kay Sievers]

 src/device.c |   17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

New commits:
commit 99448c1f01d79891e0afdfcf3ec8ed9fa92502ae
Author: Kay Sievers <kay.sievers at vrfy.org>
Date:   Fri Nov 26 04:51:30 2010 +0100

    udev: increase event buffer size, handle -ENOBUFS, handle filtered-out devices

diff --git a/src/device.c b/src/device.c
index 5c18d99..b576364 100644
--- a/src/device.c
+++ b/src/device.c
@@ -468,6 +468,9 @@ static int device_enumerate(Manager *m) {
                         goto fail;
                 }
 
+                if (udev_monitor_set_receive_buffer_size(m->udev_monitor, 128*1024*1024) < 0)
+                        log_error("Failed to set udev event buffer size.");
+
                 if (udev_monitor_filter_add_match_tag(m->udev_monitor, "systemd") < 0) {
                         r = -ENOMEM;
                         goto fail;
@@ -524,10 +527,20 @@ void device_fd_event(Manager *m, int events) {
         const char *action;
 
         assert(m);
-        assert(events == EPOLLIN);
+
+        if (events != EPOLLIN) {
+                static RATELIMIT_DEFINE(limit, 10*USEC_PER_SEC, 5);
+
+                if (!ratelimit_test(&limit))
+                        log_error("Failed to get udev event: %m");
+                return;
+        }
 
         if (!(dev = udev_monitor_receive_device(m->udev_monitor))) {
-                log_error("Failed to receive device.");
+                /*
+                 * libudev might filter-out devices which pass the bloom filter,
+                 * so getting NULL here is not neccessarily an error
+                 */
                 return;
         }