From 3be57dc4a30f1a4b059fec4bd7e46ae03d3c7107 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 9 Jan 2013 23:01:04 +0100 Subject: fd_util: support eventfd() --- configure.ac | 2 +- src/fd_util.c | 14 ++++++++++++++ src/fd_util.h | 11 +++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 9ade4bdf..cdc23604 100644 --- a/configure.ac +++ b/configure.ac @@ -133,7 +133,7 @@ AC_SEARCH_LIBS([syslog], [bsd socket inet], AC_SEARCH_LIBS([socket], [socket]) AC_SEARCH_LIBS([gethostbyname], [nsl]) -AC_CHECK_FUNCS(pipe2 accept4) +AC_CHECK_FUNCS(pipe2 accept4 eventfd) AC_SEARCH_LIBS([exp], [m],, [AC_MSG_ERROR([exp() not found])]) diff --git a/src/fd_util.c b/src/fd_util.c index 882b4c7d..ea29d6ea 100644 --- a/src/fd_util.c +++ b/src/fd_util.c @@ -49,6 +49,10 @@ #include #endif +#ifdef HAVE_EVENTFD +#include +#endif + #ifndef WIN32 static int @@ -328,6 +332,16 @@ inotify_init_cloexec(void) #endif +#ifdef HAVE_EVENTFD + +int +eventfd_cloexec_nonblock(unsigned initval, int flags) +{ + return eventfd(initval, flags | EFD_CLOEXEC | EFD_NONBLOCK); +} + +#endif + int close_socket(int fd) { diff --git a/src/fd_util.h b/src/fd_util.h index c8a17c7e..e65c6a69 100644 --- a/src/fd_util.h +++ b/src/fd_util.h @@ -144,6 +144,17 @@ inotify_init_cloexec(void); #endif +#ifdef HAVE_EVENTFD + +/** + * Wrapper for eventfd() which sets the flags CLOEXEC and NONBLOCK + * flag (atomically if supported by the OS). + */ +int +eventfd_cloexec_nonblock(unsigned initval, int flags); + +#endif + /** * Portable wrapper for close(); use closesocket() on WIN32/WinSock. */ -- cgit v1.2.3