removed CtdlClearSystemContext() entirely.

[citadel.git] / citadel / sysdep.c

diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index ea89f5ac5e9e3865be37c6c8111f6a0d1a61030d..6c721e206e6301ee7f15803b504d964face30207 100644 (file)
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -1200,6 +1200,7 @@ do_select:        force_purge = 0;
                        retval = select(highest + 1, &readfds, NULL, NULL, &tv);
                }
                else {
+                       --num_workers;
                        return NULL;
                }
 
@@ -1219,12 +1220,18 @@ do_select:      force_purge = 0;
 #if 0
                                syslog(LOG_DEBUG, "Interrupted select()\n");
 #endif
-                               if (server_shutting_down) return(NULL);
+                               if (server_shutting_down) {
+                                       --num_workers;
+                                       return(NULL);
+                               }
                                goto do_select;
                        }
                }
                else if (retval == 0) {
-                       if (server_shutting_down) return(NULL);
+                       if (server_shutting_down) {
+                               --num_workers;
+                               return(NULL);
+                       }
                }
 
                /* It must be a client socket.  Find a context that has data
@@ -1347,8 +1354,9 @@ void *select_on_master(void *blah)
                        tv.tv_usec = 0;
                        retval = select(highest + 1, &master_fds, NULL, NULL, &tv);
                }
-               else
-                       return NULL;
+               else {
+                       retval = -1 ;
+               }
 
                /* Now figure out who made this select() unblock.
                 * First, check for an error or exit condition.
@@ -1370,15 +1378,11 @@ void *select_on_master(void *blah)
                                continue;
                        }
                }
-               else if(retval == 0) {
-                       if (server_shutting_down) return(NULL);
-                       continue;
-               }
+
                /* Next, check to see if it's a new client connecting
                 * on a master socket.
                 */
-               else for (serviceptr = ServiceHookTable; serviceptr != NULL;
-                    serviceptr = serviceptr->next ) {
+               else if ((retval > 0) && (!server_shutting_down)) for (serviceptr = ServiceHookTable; serviceptr != NULL; serviceptr = serviceptr->next) {
 
                        if (FD_ISSET(serviceptr->msock, &master_fds)) {
                                ssock = accept(serviceptr->msock, NULL, 0);
@@ -1423,8 +1427,6 @@ void *select_on_master(void *blah)
                        }
                }
        }
-       CtdlClearSystemContext();
-
        return NULL;
 }