commit 0ab784d4707e88405fd85d6467487bf2ee9d84a0
author Elliott Hughes <enh@google.com> Tue Sep 23 18:57:33 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 23 18:57:33 2014 +0000
tree c21f3a5b301af9ac55259593c2e5dcbf7fb214fe
parent 830b77bc5c492d98eb0bc1ca515478c2e116991a
parent 790e7c0ac46bca5ad511ba8764bbb0e9646c6f2a

am 790e7c0a: am 3772545c: Merge "Switch adb to epoll(2)."

* commit '790e7c0ac46bca5ad511ba8764bbb0e9646c6f2a':
  Switch adb to epoll(2).

adb/fdevent.c

diff --git a/adb/fdevent.c b/adb/fdevent.c
index 43e600c..57c9c15 100644
--- a/adb/fdevent.c
+++ b/adb/fdevent.c
@@ -93,8 +93,7 @@
 static fdevent **fd_table = 0;
 static int fd_table_max = 0;
 
-#ifdef CRAPTASTIC
-//HAVE_EPOLL
+#ifdef __linux__
 
 #include <sys/epoll.h>
 
@@ -102,32 +101,16 @@
 
 static void fdevent_init()
 {
-        /* XXX: what's a good size for the passed in hint? */
-    epoll_fd = epoll_create(256);
-
-    if(epoll_fd < 0) {
+    epoll_fd = epoll_create1(EPOLL_CLOEXEC);
+    if(epoll_fd == -1) {
         perror("epoll_create() failed");
         exit(1);
     }
-
-        /* mark for close-on-exec */
-    fcntl(epoll_fd, F_SETFD, FD_CLOEXEC);
 }
 
 static void fdevent_connect(fdevent *fde)
 {
-    struct epoll_event ev;
-
-    memset(&ev, 0, sizeof(ev));
-    ev.events = 0;
-    ev.data.ptr = fde;
-
-#if 0
-    if(epoll_ctl(epoll_fd, EPOLL_CTL_ADD, fde->fd, &ev)) {
-        perror("epoll_ctl() failed\n");
-        exit(1);
-    }
-#endif
+    // Nothing to do here. fdevent_update will handle the EPOLL_CTL_ADD.
 }
 
 static void fdevent_disconnect(fdevent *fde)