diff options
| -rw-r--r-- | src/event/WakeFD.cxx | 36 | ||||
| -rw-r--r-- | src/event/WakeFD.hxx | 11 |
2 files changed, 46 insertions, 1 deletions
diff --git a/src/event/WakeFD.cxx b/src/event/WakeFD.cxx index 7314342d8..a09f1bf7c 100644 --- a/src/event/WakeFD.cxx +++ b/src/event/WakeFD.cxx @@ -24,12 +24,24 @@ #include <unistd.h> +#ifdef HAVE_EVENTFD +#include <sys/eventfd.h> +#endif + bool WakeFD::Create() { assert(fds[0] == -1); assert(fds[1] == -1); +#ifdef HAVE_EVENTFD + fds[0] = eventfd_cloexec_nonblock(0, 0); + if (fds[0] >= 0) { + fds[1] = -2; + return true; + } +#endif + return pipe_cloexec_nonblock(fds) >= 0; } @@ -40,7 +52,10 @@ WakeFD::Destroy() /* By some strange reason this call hangs on Win32 */ close(fds[0]); #endif - close(fds[1]); +#ifdef HAVE_EVENTFD + if (!IsEventFD()) +#endif + close(fds[1]); #ifndef NDEBUG fds[0] = -1; @@ -52,6 +67,15 @@ bool WakeFD::Read() { assert(fds[0] >= 0); + +#ifdef HAVE_EVENTFD + if (IsEventFD()) { + eventfd_t value; + return read(fds[0], &value, + sizeof(value)) == (ssize_t)sizeof(value); + } +#endif + assert(fds[1] >= 0); char buffer[256]; @@ -62,6 +86,16 @@ void WakeFD::Write() { assert(fds[0] >= 0); + +#ifdef HAVE_EVENTFD + if (IsEventFD()) { + static constexpr eventfd_t value = 1; + gcc_unused ssize_t nbytes = + write(fds[0], &value, sizeof(value)); + return; + } +#endif + assert(fds[1] >= 0); gcc_unused ssize_t nbytes = write(fds[1], "", 1); diff --git a/src/event/WakeFD.hxx b/src/event/WakeFD.hxx index 7b2d52675..15b66b4cf 100644 --- a/src/event/WakeFD.hxx +++ b/src/event/WakeFD.hxx @@ -48,7 +48,9 @@ public: int Get() const { assert(fds[0] >= 0); +#ifndef HAVE_EVENTFD assert(fds[1] >= 0); +#endif return fds[0]; } @@ -64,6 +66,15 @@ public: * be combined to one wakeup. */ void Write(); + +private: +#ifdef HAVE_EVENTFD + bool IsEventFD() { + assert(fds[0] >= 0); + + return fds[1] == -2; + } +#endif }; #endif /* MAIN_NOTIFY_H */ |