faster multi-threads web server

diff --git a/src/web_client.c b/src/web_client.c
index 6969caea8c8ee8da7f2900018dcae00d7feb4d27..368a24b5c6bd846ed866e09066a43d56804e5409 100644 (file)
--- a/src/web_client.c
+++ b/src/web_client.c
@@ -2191,8 +2191,21 @@ void *web_client_main(void *ptr)
        debug(D_WEB_CLIENT, "%llu: done...", w->id);
 
        web_client_reset(w);
+
+       // close the sockets/files now
+       // to free file descriptors
+       if(w->ifd == w->ofd) {
+               if(w->ifd != -1) close(w->ifd);
+       }
+       else {
+               if(w->ifd != -1) close(w->ifd);
+               if(w->ofd != -1) close(w->ifd);
+       }
+       w->ifd = -1;
+       w->ofd = -1;
+
        w->obsolete = 1;
-       pthread_exit(NULL);
 
+       pthread_exit(NULL);
        return NULL;
 }

diff --git a/src/web_server.c b/src/web_server.c
index c3821202703a4f99c324893919b9edd76acce12a..2c788df3d6978ed38b7b8d8ea827fef8e1782950 100644 (file)
--- a/src/web_server.c
+++ b/src/web_server.c
@@ -202,6 +202,8 @@ int create_listen_socket(void) {
 // 3. spawns a new pthread to serve the client (this is optimal for keep-alive clients)
 // 4. cleans up old web_clients that their pthreads have been exited
 
+#define CLEANUP_EVERY_EVENTS 1000
+
 void *socket_listen_main_multi_threaded(void *ptr) {
        if(ptr) { ; }
 
@@ -210,7 +212,7 @@ void *socket_listen_main_multi_threaded(void *ptr) {
 
        struct web_client *w;
        struct timeval tv;
-       int retval, failures = 0;
+       int retval, failures = 0, counter = 0;
 
        if(ptr) { ; }
 
@@ -227,7 +229,7 @@ void *socket_listen_main_multi_threaded(void *ptr) {
 
        for(;;) {
                tv.tv_sec = 0;
-               tv.tv_usec = 200000;
+               tv.tv_usec = 100000;
 
                if(likely(listen_fd >= 0))
                        FD_SET(listen_fd, &ifds);
@@ -274,25 +276,30 @@ void *socket_listen_main_multi_threaded(void *ptr) {
                        else debug(D_WEB_CLIENT, "LISTENER: select() didn't do anything.");
 
                }
-               //else {
-               //      debug(D_WEB_CLIENT, "LISTENER: select() timeout.");
-               //}
-
-               failures = 0;
+               else {
+                       debug(D_WEB_CLIENT, "LISTENER: select() timeout.");
+                       counter = CLEANUP_EVERY_EVENTS;
+               }
 
                // cleanup unused clients
-               for (w = web_clients; w; ) {
-                       if (w->obsolete) {
-                               debug(D_WEB_CLIENT, "%llu: Removing client.", w->id);
-                               // pthread_cancel(w->thread);
-                               // pthread_join(w->thread, NULL);
-                               w = web_client_free(w);
+               counter++;
+               if(counter > CLEANUP_EVERY_EVENTS) {
+                       counter = 0;
+                       for (w = web_clients; w;) {
+                               if (w->obsolete) {
+                                       debug(D_WEB_CLIENT, "%llu: Removing client.", w->id);
+                                       // pthread_cancel(w->thread);
+                                       // pthread_join(w->thread, NULL);
+                                       w = web_client_free(w);
 #ifdef NETDATA_INTERNAL_CHECKS
-                               log_allocations();
+                                       log_allocations();
 #endif
+                               }
+                               else w = w->next;
                        }
-                       else w = w->next;
                }
+
+               failures = 0;
        }
 
        error("LISTENER: exit!");