summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2014-01-17 10:15:33 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2014-01-22 09:15:14 +1000
commit642c91fc6a5e55cead3bd85bbc599792fcd6df50 (patch)
tree85f81c223fc7005029c45d75b13a8270070b163d
parent0c0188698554a00eb0d910ef7610998156724f49 (diff)
downloadlibevdev-642c91fc6a5e55cead3bd85bbc599792fcd6df50.tar.gz
Warn about a SYN_DROPPED right after finishing a sync
If the first event after a completed device sync is a SYN_DROPPED, warn the user that they're not fast enough handling this device. The test for this is rather complicated since we can't write SYN_DROPPED through uinput so we have to juggle the device fd and a pipe and switch between the two at the right time (taking into account that libevdev will read events from the fd whenever it can). Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--libevdev/libevdev.c11
-rw-r--r--test/test-libevdev-events.c108
2 files changed, 116 insertions, 3 deletions
diff --git a/libevdev/libevdev.c b/libevdev/libevdev.c
index 59625a4..cf532e3 100644
--- a/libevdev/libevdev.c
+++ b/libevdev/libevdev.c
@@ -816,8 +816,6 @@ libevdev_next_event(struct libevdev *dev, unsigned int flags, struct input_event
dev->sync_state = SYNC_NONE;
}
- /* FIXME: if the first event after SYNC_IN_PROGRESS is a SYN_DROPPED, log this */
-
/* Always read in some more events. Best case this smoothes over a potential SYN_DROPPED,
worst case we don't read fast enough and end up with SYN_DROPPED anyway.
@@ -856,8 +854,15 @@ libevdev_next_event(struct libevdev *dev, unsigned int flags, struct input_event
if (flags & LIBEVDEV_READ_FLAG_SYNC && dev->queue_nsync > 0) {
dev->queue_nsync--;
rc = LIBEVDEV_READ_STATUS_SYNC;
- if (dev->queue_nsync == 0)
+ if (dev->queue_nsync == 0) {
+ struct input_event next;
dev->sync_state = SYNC_NONE;
+
+ if (queue_peek(dev, 0, &next) == 0 &&
+ next.type == EV_SYN && next.code == SYN_DROPPED)
+ log_info("SYN_DROPPED received after finished "
+ "sync - you're not keeping up\n");
+ }
}
out:
diff --git a/test/test-libevdev-events.c b/test/test-libevdev-events.c
index 47bbdb9..666b98d 100644
--- a/test/test-libevdev-events.c
+++ b/test/test-libevdev-events.c
@@ -25,6 +25,7 @@
#include <errno.h>
#include <unistd.h>
#include <fcntl.h>
+#include <stdio.h>
#include "test-common.h"
@@ -122,6 +123,112 @@ START_TEST(test_syn_dropped_event)
}
END_TEST
+void double_syn_dropped_logfunc(enum libevdev_log_priority priority,
+ void *data,
+ const char *file, int line,
+ const char *func,
+ const char *format, va_list args)
+{
+ unsigned int *hit = data;
+ *hit = 1;
+}
+
+START_TEST(test_double_syn_dropped_event)
+{
+ struct uinput_device* uidev;
+ struct libevdev *dev;
+ int rc;
+ struct input_event ev;
+ int pipefd[2];
+ unsigned int logfunc_hit = 0;
+
+ rc = test_create_device(&uidev, &dev,
+ EV_SYN, SYN_REPORT,
+ EV_SYN, SYN_DROPPED,
+ EV_REL, REL_X,
+ EV_REL, REL_Y,
+ EV_KEY, BTN_LEFT,
+ -1);
+ ck_assert_msg(rc == 0, "Failed to create device: %s", strerror(-rc));
+
+ libevdev_set_log_function(double_syn_dropped_logfunc, &logfunc_hit);
+
+ /* This is a bit complicated:
+ we can't get SYN_DROPPED through uinput, so we push two events down
+ uinput, and fetch one off libevdev (reading in the other one on the
+ way). Then write a SYN_DROPPED on a pipe, switch the fd and read
+ one event off the wire (but returning the second event from
+ before). Switch back, so that when we do read off the SYN_DROPPED
+ we have the fd back on the device and the ioctls work.
+ */
+ uinput_device_event(uidev, EV_KEY, BTN_LEFT, 1);
+ uinput_device_event(uidev, EV_SYN, SYN_REPORT, 0);
+ rc = libevdev_next_event(dev, LIBEVDEV_READ_FLAG_NORMAL, &ev);
+ ck_assert_int_eq(rc, LIBEVDEV_READ_STATUS_SUCCESS);
+ ck_assert_int_eq(ev.type, EV_KEY);
+ ck_assert_int_eq(ev.code, BTN_LEFT);
+ rc = pipe2(pipefd, O_NONBLOCK);
+ ck_assert_int_eq(rc, 0);
+
+ libevdev_change_fd(dev, pipefd[0]);
+ ev.type = EV_SYN;
+ ev.code = SYN_DROPPED;
+ ev.value = 0;
+ rc = write(pipefd[1], &ev, sizeof(ev));
+ ck_assert_int_eq(rc, sizeof(ev));
+ rc = libevdev_next_event(dev, LIBEVDEV_READ_FLAG_NORMAL, &ev);
+
+ /* sneak in a button change event while we're not looking, this way
+ * the sync queue contains 2 events: BTN_LEFT and SYN_REPORT. */
+ uinput_device_event(uidev, EV_KEY, BTN_LEFT, 0);
+ read(pipefd[0], &ev, sizeof(ev));
+
+ libevdev_change_fd(dev, uinput_device_get_fd(uidev));
+
+ ck_assert_int_eq(rc, LIBEVDEV_READ_STATUS_SUCCESS);
+ ck_assert_int_eq(ev.type, EV_SYN);
+ ck_assert_int_eq(ev.code, SYN_REPORT);
+ rc = libevdev_next_event(dev, LIBEVDEV_READ_FLAG_NORMAL, &ev);
+ ck_assert_int_eq(rc, LIBEVDEV_READ_STATUS_SYNC);
+ ck_assert_int_eq(ev.type, EV_SYN);
+ ck_assert_int_eq(ev.code, SYN_DROPPED);
+
+ rc = libevdev_next_event(dev, LIBEVDEV_READ_FLAG_SYNC, &ev);
+ ck_assert_int_eq(rc, LIBEVDEV_READ_STATUS_SYNC);
+ ck_assert_int_eq(ev.type, EV_KEY);
+ ck_assert_int_eq(ev.code, BTN_LEFT);
+ ck_assert_int_eq(ev.value, 0);
+
+ /* now write the second SYN_DROPPED on the pipe so we pick it up
+ * before we finish syncing. */
+ libevdev_change_fd(dev, pipefd[0]);
+ ev.type = EV_SYN;
+ ev.code = SYN_DROPPED;
+ ev.value = 0;
+ rc = write(pipefd[1], &ev, sizeof(ev));
+ ck_assert_int_eq(rc, sizeof(ev));
+
+ rc = libevdev_next_event(dev, LIBEVDEV_READ_FLAG_SYNC, &ev);
+ ck_assert_int_eq(rc, LIBEVDEV_READ_STATUS_SYNC);
+ ck_assert_int_eq(ev.type, EV_SYN);
+ ck_assert_int_eq(ev.code, SYN_REPORT);
+ ck_assert_int_eq(ev.value, 0);
+
+ /* back to enable the ioctls again */
+ libevdev_change_fd(dev, uinput_device_get_fd(uidev));
+
+ ck_assert_int_eq(logfunc_hit, 1);
+
+ libevdev_free(dev);
+ uinput_device_free(uidev);
+
+ close(pipefd[0]);
+ close(pipefd[1]);
+
+ libevdev_set_log_function(test_logfunc_abort_on_error, NULL);
+}
+END_TEST
+
START_TEST(test_event_type_filtered)
{
struct uinput_device* uidev;
@@ -1206,6 +1313,7 @@ libevdev_events(void)
TCase *tc = tcase_create("event polling");
tcase_add_test(tc, test_next_event);
tcase_add_test(tc, test_syn_dropped_event);
+ tcase_add_test(tc, test_double_syn_dropped_event);
tcase_add_test(tc, test_event_type_filtered);
tcase_add_test(tc, test_event_code_filtered);
tcase_add_test(tc, test_has_event_pending);