Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(463)

Unified Diff: ui/events/ozone/evdev/touch_event_converter.cc

Issue 144233006: evdev: Fix infinite loop when devices are unplugged (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: dropped EventConverterEvdev Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/events/ozone/evdev/key_event_converter.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/ozone/evdev/touch_event_converter.cc
diff --git a/ui/events/ozone/evdev/touch_event_converter.cc b/ui/events/ozone/evdev/touch_event_converter.cc
index 651e8f0088b5548d7d3321d4226ff486bbba9242..517f0d78b248ca1a5a104016788afccbe35b3b08 100644
--- a/ui/events/ozone/evdev/touch_event_converter.cc
+++ b/ui/events/ozone/evdev/touch_event_converter.cc
@@ -4,6 +4,7 @@
#include "ui/events/ozone/evdev/touch_event_converter.h"
+#include <errno.h>
#include <fcntl.h>
#include <linux/input.h>
#include <poll.h>
@@ -116,8 +117,13 @@ void TouchEventConverterEvdev::OnFileCanWriteWithoutBlocking(int /* fd */) {
void TouchEventConverterEvdev::OnFileCanReadWithoutBlocking(int fd) {
input_event inputs[MAX_FINGERS * 6 + 1];
ssize_t read_size = read(fd, inputs, sizeof(inputs));
- if (read_size <= 0)
+ if (read_size < 0) {
+ if (errno == EINTR || errno == EAGAIN)
+ return;
+ PLOG(ERROR) << "error reading device " << path_.value();
+ Stop();
return;
+ }
for (unsigned i = 0; i < read_size / sizeof(*inputs); i++) {
const input_event& input = inputs[i];
« no previous file with comments | « ui/events/ozone/evdev/key_event_converter.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698