Enable wepoll on Windows (tests off) (#59)

resetius · Nov 24, 2024 · e93b170 · e93b170
1 parent 3c2084d
commit e93b170
Show file tree

Hide file tree

Showing 10 changed files with 102 additions and 24 deletions.
diff --git a/coroio/all.hpp b/coroio/all.hpp
@@ -17,11 +17,34 @@
 #include "poll.hpp"
 
 #ifdef __linux__
+
+#ifndef HAVE_EPOLL
+#define HAVE_EPOLL
+#endif
+
+#ifndef HAVE_URING
+#define HAVE_URING
+#endif
+
 #include "epoll.hpp"
 #include "uring.hpp"
 #endif
 
+#ifdef _WIN32
+
+#ifndef HAVE_EPOLL
+#define HAVE_EPOLL
+#endif
+
+#include "epoll.hpp"
+#endif
+
 #if defined(__APPLE__) || defined(__FreeBSD__)
+
+#ifndef HAVE_KQUEUE
+#define HAVE_KQUEUE
+#endif
+
 #include "kqueue.hpp"
 #endif
 

diff --git a/coroio/epoll.cpp b/coroio/epoll.cpp
@@ -1,19 +1,48 @@
-#ifdef __linux__
+#if defined(__linux__) || defined(_WIN32)
 #include "epoll.hpp"
 
 namespace NNet {
 
+namespace {
+#ifdef _WIN32
+int epoll_pwait2(HANDLE ephnd, struct epoll_event* events, int maxevents, const struct timespec* ts, const void* /*sigmask*/) {
+    int timeout = 0;
+    if (ts) {
+        timeout  = ts->tv_sec;
+        timeout += ts->tv_nsec / 1000000;
+    }
+    // TODO: support sigmask
+    return epoll_wait(ephnd, events, maxevents, timeout);
+}
+#endif
+}
+
+#ifdef __linux__
+static constexpr int epoll_flags = EPOLL_CLOEXEC;
+static constexpr int invalid_handle = -1;
+#else
+static constexpr int epoll_flags = 0;
+static constexpr HANDLE invalid_handle = nullptr;
+#endif
+
 TEPoll::TEPoll()
-    : Fd_(epoll_create1(EPOLL_CLOEXEC))
+    : Fd_(epoll_create1(epoll_flags))
 {
-    if (Fd_ < 0) {
+    if (Fd_ ==  invalid_handle) {
         throw std::system_error(errno, std::generic_category(), "epoll_create1");
     }
 }
 
 TEPoll::~TEPoll()
 {
-    if (Fd_ >= 0) { close(Fd_); }
+    if (Fd_ != invalid_handle) {
+#ifdef __linux__
+        close(Fd_);
+#endif
+#ifdef _WIN32
+        epoll_close(Fd_);
+#endif
+    }
 }
 
 void TEPoll::Poll() {

diff --git a/coroio/epoll.hpp b/coroio/epoll.hpp
@@ -1,7 +1,13 @@
 #pragma once
 
+#ifdef __linux__
 #include <sys/epoll.h>
 #include <unistd.h>
+#endif
+
+#ifdef _WIN32
+#include "wepoll.h"
+#endif
 
 #include "base.hpp"
 #include "poller.hpp"
@@ -20,7 +26,14 @@ class TEPoll: public TPollerBase {
     void Poll();
 
 private:
+#ifdef __linux__
     int Fd_;
+#endif
+
+#ifdef _WIN32
+    HANDLE Fd_;
+#endif
+
     std::vector<THandlePair> InEvents_;       // all events in epoll
     std::vector<epoll_event> OutEvents_; // events out from epoll_wait
 };

diff --git a/examples/bench.cpp b/examples/bench.cpp
@@ -165,16 +165,17 @@ int main(int argc, char** argv) {
     else if (!strcmp(method, "poll")) {
         run_test<TPoll>(num_pipes, num_writes, num_active);
     }
-#ifdef __linux__
+#ifdef HAVE_EPOLL
     else if (!strcmp(method, "epoll")) {
         run_test<TEPoll>(num_pipes, num_writes, num_active);
     }
+#endif
+#ifdef HAVE_URING
     else if (!strcmp(method, "uring")) {
         run_test<TUring>(num_pipes, num_writes, num_active);
     }
 #endif
-
-#if defined(__APPLE__) || defined(__FreeBSD__)
+#ifdef HAVE_KQUEUE
     else if (!strcmp(method, "kqueue")) {
         run_test<TKqueue>(num_pipes, num_writes, num_active);
     }

diff --git a/examples/echoclient.cpp b/examples/echoclient.cpp
@@ -78,15 +78,17 @@ int main(int argc, char** argv) {
     else if (method == "poll") {
         run<TPoll>(debug, address);
     }
-#ifdef __linux__
+#ifdef HAVE_EPOLL
     else if (method == "epoll") {
         run<TEPoll>(debug, address);
     }
+#endif
+#ifdef HAVE_URING
     else if (method == "uring") {
         run<TUring>(debug, address);
     }
 #endif
-#if defined(__APPLE__) || defined(__FreeBSD__)
+#ifdef HAVE_KQUEUE
     else if (method == "kqueue") {
         run<TKqueue>(debug, address);
     }

diff --git a/examples/echoserver.cpp b/examples/echoserver.cpp
@@ -5,12 +5,13 @@ using NNet::TAddress;
 using NNet::TSelect;
 using NNet::TPoll;
 
-#ifdef __linux__
+#ifdef HAVE_EPOLL
 using NNet::TEPoll;
+#endif
+#ifdef HAVE_URING
 using NNet::TUring;
 #endif
-
-#if defined(__APPLE__) || defined(__FreeBSD__)
+#ifdef HAVE_KQUEUE
 using NNet::TKqueue;
 #endif
 
@@ -90,15 +91,17 @@ int main(int argc, char** argv) {
     else if (method == "poll") {
         run<TPoll>(debug, address, buffer_size);
     }
-#ifdef __linux__
+#ifdef HAVE_EPOLL
     else if (method == "epoll") {
         run<TEPoll>(debug, address, buffer_size);
     }
+#endif
+#ifdef HAVE_URING
     else if (method == "uring") {
         run<TUring>(debug, address, buffer_size);
     }
 #endif
-#if defined(__APPLE__) || defined(__FreeBSD__)
+#ifdef HAVE_KQUEUE
     else if (method == "kqueue") {
         run<TKqueue>(debug, address, buffer_size);
     }

diff --git a/examples/resolver.cpp b/examples/resolver.cpp
@@ -65,15 +65,17 @@ int main(int argc, char** argv) {
     else if (method == "poll") {
         run<TPoll>(type);
     }
-#ifdef __linux__
+#ifdef HAVE_EPOLL
     else if (method == "epoll") {
         run<TEPoll>(type);
     }
+#endif
+#ifdef HAVE_URING
     else if (method == "uring") {
         run<TUring>(type);
     }
 #endif
-#if defined(__APPLE__) || defined(__FreeBSD__)
+#ifdef HAVE_KQUEUE
     else if (method == "kqueue") {
         run<TKqueue>(type);
     }

diff --git a/examples/sslechoclient.cpp b/examples/sslechoclient.cpp
@@ -78,15 +78,17 @@ int main(int argc, char** argv) {
     else if (method == "poll") {
         run<TPoll>(debug, address);
     }
-#ifdef __linux__
+#ifdef HAVE_EPOLL
     else if (method == "epoll") {
         run<TEPoll>(debug, address);
     }
+#endif
+#ifdef HAVE_URING
     else if (method == "uring") {
         run<TUring>(debug, address);
     }
 #endif
-#if defined(__APPLE__) || defined(__FreeBSD__)
+#ifdef HAVE_KQUEUE
     else if (method == "kqueue") {
         run<TKqueue>(debug, address);
     }

diff --git a/examples/sslechoserver.cpp b/examples/sslechoserver.cpp
@@ -5,12 +5,13 @@ using NNet::TAddress;
 using NNet::TSelect;
 using NNet::TPoll;
 
-#ifdef __linux__
+#ifdef HAVE_EPOLL
 using NNet::TEPoll;
+#endif
+#ifdef HAVE_URING
 using NNet::TUring;
 #endif
-
-#if defined(__APPLE__) || defined(__FreeBSD__)
+#ifdef HAVE_KQUEUE
 using NNet::TKqueue;
 #endif
 
@@ -104,15 +105,17 @@ int main(int argc, char** argv) {
     else if (method == "poll") {
         run<TPoll>(debug, address, buffer_size);
     }
-#ifdef __linux__
+#ifdef HAVE_EPOLL
     else if (method == "epoll") {
         run<TEPoll>(debug, address, buffer_size);
     }
+#endif
+#ifdef HAVE_URING
     else if (method == "uring") {
         run<TUring>(debug, address, buffer_size);
     }
 #endif
-#if defined(__APPLE__) || defined(__FreeBSD__)
+#ifdef HAVE_KQUEUE
     else if (method == "kqueue") {
         run<TKqueue>(debug, address, buffer_size);
     }

diff --git a/tests/tests.cpp b/tests/tests.cpp
@@ -1166,7 +1166,7 @@ void test_uring_cancel(void** ) {
 #elif defined(__APPLE__) || defined(__FreeBSD__)
 #define my_unit_poller(f) my_unit_test3(f, TSelect, TPoll, TKqueue)
 #elif defined(_WIN32)
-#define my_unit_poller(f) my_unit_test(f, TSelect)
+#define my_unit_poller(f) my_unit_test2(f, TSelect, TPoll)
 #else
 #define my_unit_poller(f) my_unit_test2(f, TSelect, TPoll)
 #endif