Reunified the master and client socket listener loops to cut down on thread diversity

diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index 31a9c7ba150b732ffd594a8ae037aacd7dde9960..816ed3f16d0f527627d6571c4746d7406bef580d 100644 (file)
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -1139,6 +1139,10 @@ void *worker_thread(void *blah) {
        int retval = 0;
        struct timeval tv;
        int force_purge = 0;
+       struct ServiceFunctionHook *serviceptr;
+       int ssock;                      /* Descriptor for client socket */
+       CitContext *con = NULL;         /* Temporary context pointer */
+       int i;
 
        ++num_workers;
 
@@ -1155,6 +1159,15 @@ do_select:       force_purge = 0;
                FD_ZERO(&readfds);
                highest = 0;
 
+               /* First, add the various master sockets to the fdset. */
+               for (serviceptr = ServiceHookTable; serviceptr != NULL; serviceptr = serviceptr->next ) {
+                       FD_SET(serviceptr->msock, &readfds);
+                       if (serviceptr->msock > highest) {
+                               highest = serviceptr->msock;
+                       }
+               }
+
+               /* Next, add all of the client sockets. */
                begin_critical_section(S_SESSION_TABLE);
                for (ptr = ContextList; ptr != NULL; ptr = ptr->next) {
                        if ((ptr->state == CON_SYS) && (ptr->client_socket == 0))
@@ -1231,6 +1244,53 @@ do_select:       force_purge = 0;
                        }
                }
 
+               /* Next, check to see if it's a new client connecting * on a master socket. */
+
+               else if ((retval > 0) && (!server_shutting_down)) for (serviceptr = ServiceHookTable; serviceptr != NULL; serviceptr = serviceptr->next) {
+
+                       if (FD_ISSET(serviceptr->msock, &readfds)) {
+                               ssock = accept(serviceptr->msock, NULL, 0);
+                               if (ssock >= 0) {
+                                       syslog(LOG_DEBUG, "New client socket %d", ssock);
+
+                                       /* The master socket is non-blocking but the client
+                                        * sockets need to be blocking, otherwise certain
+                                        * operations barf on FreeBSD.  Not a fatal error.
+                                        */
+                                       if (fcntl(ssock, F_SETFL, 0) < 0) {
+                                               syslog(LOG_EMERG,
+                                                       "citserver: Can't set socket to blocking: %s\n",
+                                                       strerror(errno));
+                                       }
+
+                                       /* New context will be created already
+                                        * set up in the CON_EXECUTING state.
+                                        */
+                                       con = CreateNewContext();
+
+                                       /* Assign our new socket number to it. */
+                                       con->client_socket = ssock;
+                                       con->h_command_function = serviceptr->h_command_function;
+                                       con->h_async_function = serviceptr->h_async_function;
+                                       con->h_greeting_function = serviceptr->h_greeting_function;
+                                       con->ServiceName = serviceptr->ServiceName;
+                                       
+                                       /* Determine whether it's a local socket */
+                                       if (serviceptr->sockpath != NULL) {
+                                               con->is_local_socket = 1;
+                                       }
+       
+                                       /* Set the SO_REUSEADDR socket option */
+                                       i = 1;
+                                       setsockopt(ssock, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i));
+                                       con->state = CON_GREETING;
+                                       retval--;
+                                       if (retval == 0)
+                                               break;
+                               }
+                       }
+               }
+
                /* It must be a client socket.  Find a context that has data
                 * waiting on its socket *and* is in the CON_IDLE state.  Any
                 * active sockets other than our chosen one are marked as
@@ -1309,122 +1369,6 @@ SKIP_SELECT:
 
 
 
-
-/*
- * A function to handle selecting on master sockets.
- * In other words it handles new connections.
- * It is a thread.
- */
-void *select_on_master(void *blah)
-{
-       struct ServiceFunctionHook *serviceptr;
-       fd_set master_fds;
-       int highest;
-       struct timeval tv;
-       int ssock;                      /* Descriptor for client socket */
-       CitContext *con = NULL;         /* Temporary context pointer */
-       int m;
-       int i;
-       int retval;
-
-       while (!server_shutting_down) {
-               /* Initialize the fdset. */
-               FD_ZERO(&master_fds);
-               highest = 0;
-
-               /* First, add the various master sockets to the fdset. */
-               for (serviceptr = ServiceHookTable; serviceptr != NULL;
-               serviceptr = serviceptr->next ) {
-                       m = serviceptr->msock;
-                       FD_SET(m, &master_fds);
-                       if (m > highest) {
-                               highest = m;
-                       }
-               }
-
-               if (!server_shutting_down) {
-                       tv.tv_sec = 60;         /* wake up every second if no input */
-                       tv.tv_usec = 0;
-                       retval = select(highest + 1, &master_fds, NULL, NULL, &tv);
-               }
-               else {
-                       retval = -1 ;
-               }
-
-               /* Now figure out who made this select() unblock.
-                * First, check for an error or exit condition.
-                */
-               if (retval < 0) {
-                       if (errno == EBADF) {
-                               syslog(LOG_NOTICE, "select() failed: (%s)\n",
-                                       strerror(errno));
-                               continue;
-                       }
-                       if (errno != EINTR) {
-                               syslog(LOG_EMERG, "Exiting (%s)\n", strerror(errno));
-                               server_shutting_down = 1;
-                       } else {
-#if 0
-                               syslog(LOG_DEBUG, "Interrupted CtdlThreadSelect.\n");
-#endif
-                               if (server_shutting_down) return(NULL);
-                               continue;
-                       }
-               }
-
-               /* Next, check to see if it's a new client connecting
-                * on a master socket.
-                */
-               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);
-                               if (ssock >= 0) {
-                                       syslog(LOG_DEBUG, "New client socket %d\n", ssock);
-
-                                       /* The master socket is non-blocking but the client
-                                        * sockets need to be blocking, otherwise certain
-                                        * operations barf on FreeBSD.  Not a fatal error.
-                                        */
-                                       if (fcntl(ssock, F_SETFL, 0) < 0) {
-                                               syslog(LOG_EMERG,
-                                                       "citserver: Can't set socket to blocking: %s\n",
-                                                       strerror(errno));
-                                       }
-
-                                       /* New context will be created already
-                                        * set up in the CON_EXECUTING state.
-                                        */
-                                       con = CreateNewContext();
-
-                                       /* Assign our new socket number to it. */
-                                       con->client_socket = ssock;
-                                       con->h_command_function = serviceptr->h_command_function;
-                                       con->h_async_function = serviceptr->h_async_function;
-                                       con->h_greeting_function = serviceptr->h_greeting_function;
-                                       con->ServiceName = serviceptr->ServiceName;
-                                       
-                                       /* Determine whether it's a local socket */
-                                       if (serviceptr->sockpath != NULL) {
-                                               con->is_local_socket = 1;
-                                       }
-       
-                                       /* Set the SO_REUSEADDR socket option */
-                                       i = 1;
-                                       setsockopt(ssock, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i));
-                                       con->state = CON_GREETING;
-                                       retval--;
-                                       if (retval == 0)
-                                               break;
-                               }
-                       }
-               }
-       }
-       return NULL;
-}
-
-
-
 /*
  * SyslogFacility()
  * Translate text facility name to syslog.h defined value.

diff --git a/citadel/sysdep_decls.h b/citadel/sysdep_decls.h
index a71efe59ac0d11aa277ab3a70e2c3869ee8e98de..d301ffb142b5823a9ae6b689b6fe7c155fe9e7be 100644 (file)
--- a/citadel/sysdep_decls.h
+++ b/citadel/sysdep_decls.h
@@ -62,7 +62,6 @@ void cmd_nset (char *cmdbuf);
 int convert_login (char *NameToConvert);
 void init_master_fdset(void);
 void *worker_thread(void *);
-void *select_on_master(void *);
 
 extern volatile int exit_signal;
 extern volatile int shutdown_and_halt;

diff --git a/citadel/threads.c b/citadel/threads.c
index eda189281c83ad572183fb60482fb26948b3d8db..fc960da18e01d6c80b17b8902878f98f8621fd57 100644 (file)
--- a/citadel/threads.c
+++ b/citadel/threads.c
@@ -196,8 +196,6 @@ void go_threading(void)
        /* Second call to module init functions now that threading is up */
        initialise_modules(1);
 
-       CtdlThreadCreate(select_on_master);
-
        /* Begin with one worker thread.  We will expand the pool if necessary */
        CtdlThreadCreate(worker_thread);