summaryrefslogtreecommitdiffstats
path: root/minadbd
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-09-23 20:57:44 +0200
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-23 20:57:44 +0200
commit970c3947f39e8c880dd9f32002f9c7a9cdc96d54 (patch)
tree24108d07dade3925b8fff8d4997522ca0312db42 /minadbd
parentcreate block map for all update packages on /data (diff)
parentMerge "Copy epoll(2) changes to minadb." (diff)
downloadandroid_bootable_recovery-970c3947f39e8c880dd9f32002f9c7a9cdc96d54.tar
android_bootable_recovery-970c3947f39e8c880dd9f32002f9c7a9cdc96d54.tar.gz
android_bootable_recovery-970c3947f39e8c880dd9f32002f9c7a9cdc96d54.tar.bz2
android_bootable_recovery-970c3947f39e8c880dd9f32002f9c7a9cdc96d54.tar.lz
android_bootable_recovery-970c3947f39e8c880dd9f32002f9c7a9cdc96d54.tar.xz
android_bootable_recovery-970c3947f39e8c880dd9f32002f9c7a9cdc96d54.tar.zst
android_bootable_recovery-970c3947f39e8c880dd9f32002f9c7a9cdc96d54.zip
Diffstat (limited to 'minadbd')
-rw-r--r--minadbd/fdevent.c25
1 files 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 <sys/epoll.h>
@@ -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)