window: add wrapper for EPOLL_CLOEXEC

Android does not have EPOLL_CLOEXEC, so add a fallback.

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
Pekka Paalanen 13 years ago committed by Kristian Høgsberg
parent 200019c0c6
commit 647f2bfd2a
  1. 3
      clients/window.c
  2. 17
      shared/os-compatibility.c
  3. 3
      shared/os-compatibility.h

@ -62,6 +62,7 @@
#include <wayland-client.h> #include <wayland-client.h>
#include "../shared/cairo-util.h" #include "../shared/cairo-util.h"
#include "text-cursor-position-client-protocol.h" #include "text-cursor-position-client-protocol.h"
#include "../shared/os-compatibility.h"
#include "window.h" #include "window.h"
@ -3299,7 +3300,7 @@ display_create(int argc, char *argv[])
return NULL; return NULL;
} }
d->epoll_fd = epoll_create1(EPOLL_CLOEXEC); d->epoll_fd = os_epoll_create_cloexec();
d->display_fd = wl_display_get_fd(d->display, event_mask_update, d); d->display_fd = wl_display_get_fd(d->display, event_mask_update, d);
d->display_task.run = handle_display_data; d->display_task.run = handle_display_data;
display_watch_fd(d, d->display_fd, EPOLLIN, &d->display_task); display_watch_fd(d, d->display_fd, EPOLLIN, &d->display_task);

@ -25,6 +25,7 @@
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#include <sys/epoll.h>
#include "os-compatibility.h" #include "os-compatibility.h"
@ -76,3 +77,19 @@ os_socketpair_cloexec(int domain, int type, int protocol, int *sv)
return -1; return -1;
} }
int
os_epoll_create_cloexec(void)
{
int fd;
#ifdef EPOLL_CLOEXEC
fd = epoll_create1(EPOLL_CLOEXEC);
if (fd >= 0)
return fd;
if (errno != EINVAL)
return -1;
#endif
fd = epoll_create(1);
return set_cloexec_or_close(fd);
}

@ -36,4 +36,7 @@ backtrace(void **buffer, int size)
int int
os_socketpair_cloexec(int domain, int type, int protocol, int *sv); os_socketpair_cloexec(int domain, int type, int protocol, int *sv);
int
os_epoll_create_cloexec(void);
#endif /* OS_COMPATIBILITY_H */ #endif /* OS_COMPATIBILITY_H */

Loading…
Cancel
Save