Changeset 118 in Main for trunk/Server/http.c

Timestamp:

Sep 21, 2024, 6:03:27 PM (8 weeks ago)

Author:

Nishi

Message:

use poll for select by default

File:

• trunk/Server/http.c (modified) (4 diffs)

trunk/Server/http.c

@@ -19 +19 @@
 #include <winsock2.h>
 #else
+#ifdef USE_POLL
+#include <poll.h>
+#else
 #include <sys/select.h>
+#endif
 #endif
 
@@ -46 +50 @@
         char cbuf[2];
         int phase = 0;
+
+#ifdef USE_POLL
+        struct pollfd pollfds[1];
+        pollfds[0].fd = sock;
+        pollfds[0].events = POLLIN | POLLPRI;
+#else
         fd_set fds;
+#endif
 
         bool bad = false;
@@ -64 +75 @@
 
         while(1) {
+#ifndef USE_POLL
                 FD_ZERO(&fds);
                 FD_SET(sock, &fds);
@@ -69 +81 @@
                 tv.tv_sec = 5;
                 tv.tv_usec = 0;
+#endif
 #ifndef NO_SSL
                 if(ssl == NULL || !SSL_has_pending(ssl)) {
 #endif
+#ifdef USE_POLL
+                        int n = poll(pollfds, 1, 5000);
+#else
 #ifdef __HAIKU__
-                        int n = select(32, &fds, NULL, NULL, &tv);
+                int n = select(32, &fds, NULL, NULL, &tv);
 #else
                 int n = select(FD_SETSIZE, &fds, NULL, NULL, &tv);
+#endif
 #endif
                         if(n <= 0) {