diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-26 16:04:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-26 16:04:16 +0000 |
| commit | 28ffde5ebd33d5b693906a93087e6eea627cd8d0 (patch) | |
| tree | 8e161f6b96fdbecabb389b35aaa9e2acc7fe6501 /minadbd | |
| parent | 530b61e0b5f154e5f38853c10a28e0ea6f41c2ca (diff) | |
| parent | f420f8eb6327a69954b8565d000060133439c39e (diff) | |
| download | bootable_recovery-28ffde5ebd33d5b693906a93087e6eea627cd8d0.zip bootable_recovery-28ffde5ebd33d5b693906a93087e6eea627cd8d0.tar.gz bootable_recovery-28ffde5ebd33d5b693906a93087e6eea627cd8d0.tar.bz2 | |
Merge "Revert "Copy epoll(2) changes to minadb.""
Diffstat (limited to 'minadbd')
| -rw-r--r-- | minadbd/fdevent.c | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/minadbd/fdevent.c b/minadbd/fdevent.c index b627817..5c374a7 100644 --- a/minadbd/fdevent.c +++ b/minadbd/fdevent.c @@ -102,7 +102,8 @@ static fdevent list_pending = { static fdevent **fd_table = 0; static int fd_table_max = 0; -#ifdef __linux__ +#ifdef CRAPTASTIC +//HAVE_EPOLL #include <sys/epoll.h> @@ -110,16 +111,32 @@ static int epoll_fd = -1; 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) |