ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* commit '8e1e54154bc7a5e9dee206735474186c2276b111':
  Revert "Switch adb to epoll(2)."
This commit is contained in:
Dan Albert 2014-09-25 22:32:26 +00:00 • committed by Android Git Automerger
commit 0df62a7e15
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
adb/fdevent.c
View file

@ -93,7 +93,8 @@ static fdevent list_pending = {
static fdevent **fd_table = 0; static fdevent **fd_table = 0;
static int fd_table_max = 0; static int fd_table_max = 0;
#ifdef __linux__ #ifdef CRAPTASTIC
//HAVE_EPOLL
#include <sys/epoll.h> #include <sys/epoll.h>
@ -101,16 +102,32 @@ static int epoll_fd = -1;
static void fdevent_init() static void fdevent_init()
{ {
epoll_fd = epoll_create1(EPOLL_CLOEXEC); /* XXX: what's a good size for the passed in hint? */
if(epoll_fd == -1) { epoll_fd = epoll_create(256);
if(epoll_fd < 0) {
perror("epoll_create() failed"); perror("epoll_create() failed");
exit(1); exit(1);
} }
/* mark for close-on-exec */
fcntl(epoll_fd, F_SETFD, FD_CLOEXEC);
} }
static void fdevent_connect(fdevent *fde) 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) static void fdevent_disconnect(fdevent *fde)