Changeset 118 in Main

Timestamp:

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

Author:

Nishi

Message:

use poll for select by default

Location:

trunk

Files:

• Server/http.c (modified) (4 diffs)
• Server/server.c (modified) (5 diffs)
• Server/tw_version.h (modified) (1 diff)
• config.h.tmpl (modified) (2 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) {

trunk/Server/server.c

@@ -39 +39 @@
 #include "strptime.h"
 #else
+#ifdef USE_POLL
+#include <poll.h>
+#else
 #include <sys/select.h>
+#endif
 #include <sys/socket.h>
 #include <arpa/inet.h>
@@ -54 +58 @@
 extern char tw_server[];
 
-fd_set fdset;
 int sockcount = 0;
 
@@ -802 +805 @@
 
 void tw_server_loop(void) {
-        struct timeval tv;
         int i;
 #if defined(__MINGW32__) || defined(__HAIKU__)
@@ -810 +812 @@
         }
 #endif
+#ifdef USE_POLL
+        struct pollfd pollfds[sockcount];
+        for(i = 0; i < sockcount; i++) {
+                pollfds[i].fd = sockets[i];
+                pollfds[i].events = POLLIN | POLLPRI;
+        }
+#else
+                fd_set fdset;
+                struct timeval tv;
+#endif
         while(1) {
-                FD_ZERO(&fdset);
-                for(i = 0; i < sockcount; i++) {
-                        FD_SET(sockets[i], &fdset);
-                }
-                tv.tv_sec = 1;
-                tv.tv_usec = 0;
+#ifdef USE_POLL
+                int ret = poll(pollfds, sockcount, 1000);
+#else
+                        FD_ZERO(&fdset);
+                        for(i = 0; i < sockcount; i++) {
+                                FD_SET(sockets[i], &fdset);
+                        }
+                        tv.tv_sec = 1;
+                        tv.tv_usec = 0;
 #ifdef __HAIKU__
-                int ret = select(32, &fdset, NULL, NULL, &tv);
+                        int ret = select(32, &fdset, NULL, NULL, &tv);
 #else
                         int ret = select(FD_SETSIZE, &fdset, NULL, NULL, &tv);
+#endif
 #endif
                 if(ret == -1) {
@@ -837 +853 @@
                         int i;
                         for(i = 0; i < sockcount; i++) {
-                                if(FD_ISSET(sockets[i], &fdset)) {
+                                bool cond;
+#ifdef USE_POLL
+                                cond = pollfds[i].revents & POLLIN;
+#else
+                                        cond = FD_ISSET(sockets[i], &fdset);
+#endif
+                                if(cond) {
                                         SOCKADDR claddr;
                                         int clen = sizeof(claddr);

trunk/Server/tw_version.h

@@ -4 +4 @@
 #define __TW_VERSION_H__
 
-#define TW_VERSION "1.01\0"
+#define TW_VERSION "1.02\0"
 
 const char* tw_get_version(void);

trunk/config.h.tmpl

@@ -5 +5 @@
 
 #undef NO_SSL
+#define USE_POLL
 
 /* DO NOT EDIT BELOW THIS LINE */
@@ -12 +13 @@
 #endif
 
+#if defined(__MINGW32__) && defined(USE_POLL)
+#undef USE_POLL
+/* Force select(2) for Windows */
+#endif
+
 #endif