commit 736fd4a870781b9cf8a59c95fac8a518a462c49a
author Dan Albert <danalbert@google.com> Thu Sep 25 22:32:18 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 25 22:32:18 2014 +0000
tree 615c4586e9b07a0f1014e873a7d76bfdc4241bbb
parent fee8ffb8dacc7f3c18f1976af39c51a24eb206d6
parent 8e1e54154bc7a5e9dee206735474186c2276b111

am 8e1e5415: am 5b4a1767: Merge "Revert "Switch adb to epoll(2).""

* commit '8e1e54154bc7a5e9dee206735474186c2276b111':
  Revert "Switch adb to epoll(2)."

adb/fdevent.c

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