From db8c959049d21fe63e48c270f1fc12b32a0cf0ec Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 23 Sep 2014 10:50:55 -0700 Subject: Copy epoll(2) changes to minadb. Bug: 17588403 Change-Id: Ib3525824ff09330bd9d6f9e96d662e5a55a20ec2 --- minadbd/fdevent.c | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/minadbd/fdevent.c b/minadbd/fdevent.c index 5c374a71b..b62781753 100644 --- a/minadbd/fdevent.c +++ b/minadbd/fdevent.c @@ -102,8 +102,7 @@ static fdevent list_pending = { static fdevent **fd_table = 0; static int fd_table_max = 0; -#ifdef CRAPTASTIC -//HAVE_EPOLL +#ifdef __linux__ #include @@ -111,32 +110,16 @@ static int epoll_fd = -1; 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) -- cgit v1.2.3