chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3d84d05
)
udev: increase event buffer size, handle -ENOBUFS, handle filtered-out devices
author
Kay Sievers
<kay.sievers@vrfy.org>
Fri, 26 Nov 2010 03:51:30 +0000
(
04:51
+0100)
committer
Kay Sievers
<kay.sievers@vrfy.org>
Fri, 26 Nov 2010 03:51:30 +0000
(
04:51
+0100)
src/device.c
patch
|
blob
|
history
diff --git
a/src/device.c
b/src/device.c
index 5c18d996eaf76f53630a6c6f8ba9d19be62114a0..b5763645e8851fedb87c6daf5bd3d93234eeba13 100644
(file)
--- a/
src/device.c
+++ b/
src/device.c
@@
-468,6
+468,9
@@
static int device_enumerate(Manager *m) {
goto fail;
}
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;
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);
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))) {
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;
}
return;
}