]> code.citadel.org Git - citadel.git/blobdiff - citadel/sysdep.c
Moved all threading code into threads.c
[citadel.git] / citadel / sysdep.c
index 1d24919c7ac02c042629948a5701b2ffb664f3a5..fe372b76d337be8aa3f7b658876fd4d50effc037 100644 (file)
@@ -49,9 +49,7 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <grp.h>
-#ifdef HAVE_PTHREAD_H
-#include <pthread.h>
-#endif
+#include <libcitadel.h>
 #include "citadel.h"
 #include "server.h"
 #include "sysdep_decls.h"
@@ -60,7 +58,6 @@
 #include "config.h"
 #include "database.h"
 #include "housekeeping.h"
-#include "tools.h"
 #include "modules/crypto/serv_crypto.h"        /* Needed for init_ssl, client_write_ssl, client_read_ssl, destruct_ssl */
 #include "ecrash.h"
 
@@ -72,6 +69,8 @@
 #include "snprintf.h"
 #endif
 
+#include "ctdl_module.h"
+#include "threads.h"
 
 #ifdef DEBUG_MEMORY_LEAKS
 struct igheap {
@@ -85,32 +84,48 @@ struct igheap *igheap = NULL;
 #endif
 
 
-pthread_mutex_t Critters[MAX_SEMAPHORES];      /* Things needing locking */
 pthread_key_t MyConKey;                                /* TSD key for MyContext() */
 
 int verbosity = DEFAULT_VERBOSITY;             /* Logging level */
 
 struct CitContext masterCC;
 time_t last_purge = 0;                         /* Last dead session purge */
-static int num_threads = 0;                    /* Current number of threads */
 int num_sessions = 0;                          /* Current number of sessions */
 
 int syslog_facility = LOG_DAEMON;
 int enable_syslog = 0;
 
-void DestroyWorkerList(void);
+
+/*
+ * Create an interface to lprintf that follows the coding convention.
+ * This is here until such time as we have replaced all calls to lprintf with CtdlLogPrintf
+ */
+void CtdlLogPrintf(enum LogLevel loglevel, const char *format, ...)
+{
+       va_list arg_ptr;
+       va_start(arg_ptr, format);
+       vlprintf(loglevel, format, arg_ptr);
+       va_end(arg_ptr);
+}
+
 
 /*
  * lprintf()  ...   Write logging information
  */
 void lprintf(enum LogLevel loglevel, const char *format, ...) {   
        va_list arg_ptr;
+       va_start(arg_ptr, format);
+       vlprintf(loglevel, format, arg_ptr);
+       va_end(arg_ptr);
+}
+
+void vlprintf(enum LogLevel loglevel, const char *format, va_list arg_ptr)
+{
        char buf[SIZ], buf2[SIZ];
 
        if (enable_syslog) {
-               va_start(arg_ptr, format);
-                       vsyslog((syslog_facility | loglevel), format, arg_ptr);
-               va_end(arg_ptr);
+               vsyslog((syslog_facility | loglevel), format, arg_ptr);
        }
 
        /* stderr output code */
@@ -140,9 +155,7 @@ void lprintf(enum LogLevel loglevel, const char *format, ...) {
                                tim.tm_mday, tim.tm_hour, tim.tm_min,
                                tim.tm_sec, (long)tv.tv_usec);
                }
-               va_start(arg_ptr, format);   
-                       vsprintf(buf2, format, arg_ptr);   
-               va_end(arg_ptr);   
+               vsprintf(buf2, format, arg_ptr);   
 
                fprintf(stderr, "%s%s", buf, buf2);
                fflush(stderr);
@@ -155,28 +168,22 @@ void lprintf(enum LogLevel loglevel, const char *format, ...) {
  * Signal handler to shut down the server.
  */
 
-volatile int time_to_die = 0;
+volatile int exit_signal = 0;
 volatile int shutdown_and_halt = 0;
 volatile int restart_server = 0;
 volatile int running_as_daemon = 0;
 
 static RETSIGTYPE signal_cleanup(int signum) {
-       lprintf(CTDL_DEBUG, "Caught signal %d; shutting down.\n", signum);
-       time_to_die = 1;
-       master_cleanup(signum);
-}
-
-
-
-
-void InitialiseSemaphores(void)
-{
-       int i;
-
-       /* Set up a bunch of semaphores to be used for critical sections */
-       for (i=0; i<MAX_SEMAPHORES; ++i) {
-               pthread_mutex_init(&Critters[i], NULL);
+       CtdlLogPrintf(CTDL_DEBUG, "Caught signal %d; shutting down.\n", signum);
+#ifdef THREADS_USESIGNALS
+       if (CT)
+       {
+               CtdlLogPrintf(CTDL_DEBUG, "Thread \"%s\" caught signal %d.\n", CT->name, signum);
+               CT->signal = signum;
        }
+       else
+#endif
+               exit_signal = signum;
 }
 
 
@@ -210,7 +217,7 @@ void init_sysdep(void) {
         * session to which the calling thread is currently bound.
         */
        if (pthread_key_create(&MyConKey, NULL) != 0) {
-               lprintf(CTDL_CRIT, "Can't create TSD key: %s\n",
+               CtdlLogPrintf(CTDL_CRIT, "Can't create TSD key: %s\n",
                        strerror(errno));
        }
 
@@ -245,36 +252,6 @@ void init_sysdep(void) {
 }
 
 
-/*
- * Obtain a semaphore lock to begin a critical section.
- */
-void begin_critical_section(int which_one)
-{
-       /* lprintf(CTDL_DEBUG, "begin_critical_section(%d)\n", which_one); */
-
-       /* For all types of critical sections except those listed here,
-        * ensure nobody ever tries to do a critical section within a
-        * transaction; this could lead to deadlock.
-        */
-       if (    (which_one != S_FLOORCACHE)
-#ifdef DEBUG_MEMORY_LEAKS
-               && (which_one != S_DEBUGMEMLEAKS)
-#endif
-               && (which_one != S_RPLIST)
-       ) {
-               cdb_check_handles();
-       }
-       pthread_mutex_lock(&Critters[which_one]);
-}
-
-/*
- * Release a semaphore lock to end a critical section.
- */
-void end_critical_section(int which_one)
-{
-       pthread_mutex_unlock(&Critters[which_one]);
-}
-
 
 
 /*
@@ -312,7 +289,7 @@ int ig_tcp_server(char *ip_addr, int port_number, int queue_len, char **errormes
                snprintf(*errormessage, SIZ, 
                                 "citserver: Can't create a socket: %s",
                                 strerror(errno));
-               lprintf(CTDL_EMERG, "%s\n", *errormessage);
+               CtdlLogPrintf(CTDL_EMERG, "%s\n", *errormessage);
                return(-1);
        }
 
@@ -324,7 +301,7 @@ int ig_tcp_server(char *ip_addr, int port_number, int queue_len, char **errormes
                snprintf(*errormessage, SIZ, 
                                 "citserver: Can't bind: %s",
                                 strerror(errno));
-               lprintf(CTDL_EMERG, "%s\n", *errormessage);
+               CtdlLogPrintf(CTDL_EMERG, "%s\n", *errormessage);
                close(s);
                return(-1);
        }
@@ -335,7 +312,7 @@ int ig_tcp_server(char *ip_addr, int port_number, int queue_len, char **errormes
                snprintf(*errormessage, SIZ, 
                                 "citserver: Can't set socket to non-blocking: %s",
                                 strerror(errno));
-               lprintf(CTDL_EMERG, "%s\n", *errormessage);
+               CtdlLogPrintf(CTDL_EMERG, "%s\n", *errormessage);
                close(s);
                return(-1);
        }
@@ -345,7 +322,7 @@ int ig_tcp_server(char *ip_addr, int port_number, int queue_len, char **errormes
                snprintf(*errormessage, SIZ, 
                                 "citserver: Can't listen: %s",
                                 strerror(errno));
-               lprintf(CTDL_EMERG, "%s\n", *errormessage);
+               CtdlLogPrintf(CTDL_EMERG, "%s\n", *errormessage);
                close(s);
                return(-1);
        }
@@ -373,7 +350,7 @@ int ig_uds_server(char *sockpath, int queue_len, char **errormessage)
                *errormessage = (char*) malloc(SIZ + 1);
                snprintf(*errormessage, SIZ, "citserver: can't unlink %s: %s",
                        sockpath, strerror(errno));
-               lprintf(CTDL_EMERG, "%s\n", *errormessage);
+               CtdlLogPrintf(CTDL_EMERG, "%s\n", *errormessage);
                return(-1);
        }
 
@@ -387,7 +364,7 @@ int ig_uds_server(char *sockpath, int queue_len, char **errormessage)
                snprintf(*errormessage, SIZ, 
                         "citserver: Can't create a socket: %s",
                         strerror(errno));
-               lprintf(CTDL_EMERG, "%s\n", *errormessage);
+               CtdlLogPrintf(CTDL_EMERG, "%s\n", *errormessage);
                return(-1);
        }
 
@@ -396,7 +373,7 @@ int ig_uds_server(char *sockpath, int queue_len, char **errormessage)
                snprintf(*errormessage, SIZ, 
                         "citserver: Can't bind: %s",
                         strerror(errno));
-               lprintf(CTDL_EMERG, "%s\n", *errormessage);
+               CtdlLogPrintf(CTDL_EMERG, "%s\n", *errormessage);
                return(-1);
        }
 
@@ -406,7 +383,7 @@ int ig_uds_server(char *sockpath, int queue_len, char **errormessage)
                snprintf(*errormessage, SIZ, 
                         "citserver: Can't set socket to non-blocking: %s",
                         strerror(errno));
-               lprintf(CTDL_EMERG, "%s\n", *errormessage);
+               CtdlLogPrintf(CTDL_EMERG, "%s\n", *errormessage);
                close(s);
                return(-1);
        }
@@ -416,7 +393,7 @@ int ig_uds_server(char *sockpath, int queue_len, char **errormessage)
                snprintf(*errormessage, SIZ, 
                         "citserver: Can't listen: %s",
                         strerror(errno));
-               lprintf(CTDL_EMERG, "%s\n", *errormessage);
+               CtdlLogPrintf(CTDL_EMERG, "%s\n", *errormessage);
                return(-1);
        }
 
@@ -455,7 +432,7 @@ struct CitContext *CreateNewContext(void) {
 
        me = (struct CitContext *) malloc(sizeof(struct CitContext));
        if (me == NULL) {
-               lprintf(CTDL_ALERT, "citserver: can't allocate memory!!\n");
+               CtdlLogPrintf(CTDL_ALERT, "citserver: can't allocate memory!!\n");
                return NULL;
        }
        memset(me, 0, sizeof(struct CitContext));
@@ -571,26 +548,28 @@ void client_write(char *buf, int nbytes)
 #ifndef HAVE_TCP_BUFFERING
        int old_buffer_len = 0;
 #endif
-
-       if (CC->redirect_buffer != NULL) {
-               if ((CC->redirect_len + nbytes + 2) >= CC->redirect_alloc) {
-                       CC->redirect_alloc = (CC->redirect_alloc * 2) + nbytes;
-                       CC->redirect_buffer = realloc(CC->redirect_buffer,
-                                               CC->redirect_alloc);
+       t_context *Ctx;
+
+       Ctx = CC;
+       if (Ctx->redirect_buffer != NULL) {
+               if ((Ctx->redirect_len + nbytes + 2) >= Ctx->redirect_alloc) {
+                       Ctx->redirect_alloc = (Ctx->redirect_alloc * 2) + nbytes;
+                       Ctx->redirect_buffer = realloc(Ctx->redirect_buffer,
+                                               Ctx->redirect_alloc);
                }
-               memcpy(&CC->redirect_buffer[CC->redirect_len], buf, nbytes);
-               CC->redirect_len += nbytes;
-               CC->redirect_buffer[CC->redirect_len] = 0;
+               memcpy(&Ctx->redirect_buffer[Ctx->redirect_len], buf, nbytes);
+               Ctx->redirect_len += nbytes;
+               Ctx->redirect_buffer[Ctx->redirect_len] = 0;
                return;
        }
 
 #ifndef HAVE_TCP_BUFFERING
        /* If we're buffering for later, do that now. */
-       if (CC->buffering) {
-               old_buffer_len = CC->buffer_len;
-               CC->buffer_len += nbytes;
-               CC->output_buffer = realloc(CC->output_buffer, CC->buffer_len);
-               memcpy(&CC->output_buffer[old_buffer_len], buf, nbytes);
+       if (Ctx->buffering) {
+               old_buffer_len = Ctx->buffer_len;
+               Ctx->buffer_len += nbytes;
+               Ctx->output_buffer = realloc(Ctx->output_buffer, Ctx->buffer_len);
+               memcpy(&Ctx->output_buffer[old_buffer_len], buf, nbytes);
                return;
        }
 #endif
@@ -598,23 +577,23 @@ void client_write(char *buf, int nbytes)
        /* Ok, at this point we're not buffering.  Go ahead and write. */
 
 #ifdef HAVE_OPENSSL
-       if (CC->redirect_ssl) {
+       if (Ctx->redirect_ssl) {
                client_write_ssl(buf, nbytes);
                return;
        }
 #endif
 
        while (bytes_written < nbytes) {
-               retval = write(CC->client_socket, &buf[bytes_written],
+               retval = write(Ctx->client_socket, &buf[bytes_written],
                        nbytes - bytes_written);
                if (retval < 1) {
-                       lprintf(CTDL_ERR,
+                       CtdlLogPrintf(CTDL_ERR,
                                "client_write(%d bytes) failed: %s (%d)\n",
                                nbytes - bytes_written,
                                strerror(errno), errno);
                        cit_backtrace();
-                       lprintf(CTDL_DEBUG, "Tried to send: %s",  &buf[bytes_written]);
-                       CC->kill_me = 1;
+                       // CtdlLogPrintf(CTDL_DEBUG, "Tried to send: %s",  &buf[bytes_written]);
+                       Ctx->kill_me = 1;
                        return;
                }
                bytes_written = bytes_written + retval;
@@ -651,6 +630,7 @@ int client_read_to(char *buf, int bytes, int timeout)
 {
        int len,rlen;
        fd_set rfds;
+       int fd;
        struct timeval tv;
        int retval;
 
@@ -660,20 +640,21 @@ int client_read_to(char *buf, int bytes, int timeout)
        }
 #endif
        len = 0;
+       fd = CC->client_socket;
        while(len<bytes) {
                FD_ZERO(&rfds);
-               FD_SET(CC->client_socket, &rfds);
+               FD_SET(fd, &rfds);
                tv.tv_sec = timeout;
                tv.tv_usec = 0;
 
-               retval = select( (CC->client_socket)+1, 
-                                       &rfds, NULL, NULL, &tv);
+               retval = select( (fd)+1, 
+                                &rfds, NULL, NULL, &tv);
 
-               if (FD_ISSET(CC->client_socket, &rfds) == 0) {
+               if (FD_ISSET(fd, &rfds) == 0) {
                        return(0);
                }
 
-               rlen = read(CC->client_socket, &buf[len], bytes-len);
+               rlen = read(fd, &buf[len], bytes-len);
                if (rlen<1) {
                        /* The socket has been disconnected! */
                        CC->kill_me = 1;
@@ -721,22 +702,57 @@ int client_getln(char *buf, int bufsize)
        /* Strip the trailing LF, and the trailing CR if present.
         */
        buf[i] = 0;
-       while ( (!IsEmptyStr(buf)) && ((buf[strlen(buf)-1]==10) || (buf[strlen(buf)-1] == 13)) ) {
-               buf[strlen(buf)-1] = 0;
+       while ( (i > 0)
+               && ( (buf[i - 1]==13)
+                    || ( buf[i - 1]==10)) ) {
+               i--;
+               buf[i] = 0;
        }
-       if (retval < 0) safestrncpy(buf, "000", bufsize);
+       if (retval < 0) safestrncpy(&buf[i], "000", bufsize - i);
        return(retval);
 }
 
 
+/*
+ * Cleanup any contexts that are left lying around
+ */
+void context_cleanup(void)
+{
+       struct CitContext *ptr = NULL;
+       struct CitContext *rem = NULL;
+
+       /*
+        * Clean up the contexts.
+        * There are no threads so no critical_section stuff is needed.
+        */
+       ptr = ContextList;
+       
+       /* We need to update the ContextList because some modules may want to itterate it
+        * Question is should we NULL it before iterating here or should we just keep updating it
+        * as we remove items?
+        *
+        * Answer is to NULL it first to prevent modules from doing any actions on the list at all
+        */
+       ContextList=NULL;
+       while (ptr != NULL){
+               /* Remove the session from the active list */
+               rem = ptr->next;
+               --num_sessions;
+               
+               lprintf(CTDL_DEBUG, "Purging session %d\n", ptr->cs_pid);
+               RemoveContext(ptr);
+               free (ptr);
+               ptr = rem;
+       }
+}
+
 
 /*
  * The system-dependent part of master_cleanup() - close the master socket.
  */
 void sysdep_master_cleanup(void) {
        struct ServiceFunctionHook *serviceptr;
-
-/////  DestroyWorkerList();
+       
        /*
         * close all protocol master sockets
         */
@@ -744,11 +760,11 @@ void sysdep_master_cleanup(void) {
            serviceptr = serviceptr->next ) {
 
                if (serviceptr->tcp_port > 0)
-                       lprintf(CTDL_INFO, "Closing listener on port %d\n",
+                       CtdlLogPrintf(CTDL_INFO, "Closing listener on port %d\n",
                                serviceptr->tcp_port);
 
                if (serviceptr->sockpath != NULL)
-                       lprintf(CTDL_INFO, "Closing listener on '%s'\n",
+                       CtdlLogPrintf(CTDL_INFO, "Closing listener on '%s'\n",
                                serviceptr->sockpath);
 
                close(serviceptr->msock);
@@ -758,10 +774,12 @@ void sysdep_master_cleanup(void) {
                        unlink(serviceptr->sockpath);
                }
        }
+       
+       context_cleanup();
+       
 #ifdef HAVE_OPENSSL
        destruct_ssl();
 #endif
-       serv_calendar_destroy();
        CtdlDestroyProtoHooks();
        CtdlDestroyDeleteHooks();
        CtdlDestroyXmsgHooks();
@@ -772,6 +790,8 @@ void sysdep_master_cleanup(void) {
        CtdlDestroyFixedOutputHooks();  
        CtdlDestroySessionHooks();
        CtdlDestroyServiceHook();
+       CtdlDestroyRoomHooks();
+       CtdlDestroyDirectoryServiceFuncs();
        #ifdef HAVE_BACKTRACE
        eCrash_Uninit();
        #endif
@@ -779,7 +799,6 @@ void sysdep_master_cleanup(void) {
 
 
 
-
 /*
  * Terminate another session.
  * (This could justifiably be moved out of sysdep.c because it
@@ -854,7 +873,11 @@ void start_daemon(int unused) {
                else {
                        fp = fopen(file_pid_file, "w");
                        if (fp != NULL) {
-                               fprintf(fp, ""F_PID_T"\n", child);
+               /*
+                * NB.. The pid file contains the pid of the actual server.
+                * This is not the pid of the watcher process
+                */
+                               fprintf(fp, ""F_PID_T"\n", current_child);
                                fclose(fp);
                        }
                        waitpid(current_child, &status, 0);
@@ -915,148 +938,17 @@ int convert_login(char NameToConvert[]) {
        }
 }
 
-struct worker_node *worker_list = NULL;
-
-
-/*
- * create a worker thread. this function must always be called from within
- * an S_WORKER_LIST critical section!
- */
-void create_worker(void) {
-       int ret;
-       struct worker_node *n;
-       pthread_attr_t attr;
-
-       n = malloc(sizeof(struct worker_node));
-       if (n == NULL) {
-               lprintf(CTDL_EMERG, "can't allocate worker_node, exiting\n");
-               time_to_die = -1;
-               return;
-       }
-
-       if ((ret = pthread_attr_init(&attr))) {
-               lprintf(CTDL_EMERG, "pthread_attr_init: %s\n", strerror(ret));
-               time_to_die = -1;
-               return;
-       }
-
-       /* Our per-thread stacks need to be bigger than the default size,
-        * otherwise the MIME parser crashes on FreeBSD, and the IMAP service
-        * crashes on 64-bit Linux.
-        */
-       if ((ret = pthread_attr_setstacksize(&attr, THREADSTACKSIZE))) {
-               lprintf(CTDL_EMERG, "pthread_attr_setstacksize: %s\n",
-                       strerror(ret));
-               time_to_die = -1;
-               pthread_attr_destroy(&attr);
-               return;
-       }
-
-       if ((ret = pthread_create(&n->tid, &attr, worker_thread, NULL) != 0))
-       {
-
-               lprintf(CTDL_ALERT, "Can't create worker thread: %s\n",
-                       strerror(ret));
-       }
-
-       n->next = worker_list;
-       worker_list = n;
-       pthread_attr_destroy(&attr);
-}
-
-void DestroyWorkerList(void)
-{
-       struct CitContext *ptr;         /* general-purpose utility pointer */
-       struct CitContext *rem = NULL;  /* list of sessions to be destroyed */
-
-       begin_critical_section(S_SESSION_TABLE);
-       ptr = ContextList;
-       while (ptr != NULL){
-               /* Remove the session from the active list */
-               rem = ptr->next;
-               --num_sessions;
-               
-               lprintf(CTDL_DEBUG, "Purging session %d\n", rem->cs_pid);
-               end_critical_section(S_SESSION_TABLE);
-               RemoveContext(ptr);
-               begin_critical_section(S_SESSION_TABLE);
-               free (ptr);
-               ptr = rem;
-       }
-       end_critical_section(S_SESSION_TABLE);
-
-       struct worker_node *cur, *p;
-       cur = worker_list;
-       while (cur != NULL)
-       {
-               p = cur->next;
-               free (cur);
-               cur = p;
-       }
-       worker_list = NULL;
-}
-
-/*
- * Create the maintenance threads and begin their operation.
- */
-void create_maintenance_threads(void) {
-       int ret;
-       pthread_attr_t attr;
-
-       if ((ret = pthread_attr_init(&attr))) {
-               lprintf(CTDL_EMERG, "pthread_attr_init: %s\n", strerror(ret));
-               time_to_die = -1;
-               return;
-       }
-
-       /* Our per-thread stacks need to be bigger than the default size,
-        * otherwise the MIME parser crashes on FreeBSD, and the IMAP service
-        * crashes on 64-bit Linux.
-        */
-       if ((ret = pthread_attr_setstacksize(&attr, THREADSTACKSIZE))) {
-               lprintf(CTDL_EMERG, "pthread_attr_setstacksize: %s\n",
-                       strerror(ret));
-               time_to_die = -1;
-               pthread_attr_destroy(&attr);
-               return;
-       }
-       
-       struct MaintenanceThreadHook *fcn;
-
-       lprintf(CTDL_DEBUG, "Performing startup of maintenance thread hooks\n");
-
-       for (fcn = MaintenanceThreadHookTable; fcn != NULL; fcn = fcn->next) {
-               if ((ret = pthread_create(&(fcn->MaintenanceThread_tid), &attr, fcn->fcn_ptr, NULL) != 0)) {
-                       lprintf(CTDL_ALERT, "Can't create thread: %s\n", strerror(ret));
-               }
-               else
-               {
-                       lprintf(CTDL_NOTICE, "Spawned a new maintenance thread \"%s\" (%ld). \n", fcn->name,
-                               fcn->MaintenanceThread_tid);
-               }
-       }
-
-
-       pthread_attr_destroy(&attr);
-}
-
-
-
 /*
  * Purge all sessions which have the 'kill_me' flag set.
  * This function has code to prevent it from running more than once every
  * few seconds, because running it after every single unbind would waste a lot
  * of CPU time and keep the context list locked too much.  To force it to run
  * anyway, set "force" to nonzero.
- *
- *
- * After that's done, we raise the size of the worker thread pool
- * if such an action is appropriate.
  */
 void dead_session_purge(int force) {
-       struct CitContext *ptr;         /* general-purpose utility pointer */
+       struct CitContext *ptr, *ptr2;          /* general-purpose utility pointer */
        struct CitContext *rem = NULL;  /* list of sessions to be destroyed */
-
+       
        if (force == 0) {
                if ( (time(NULL) - last_purge) < 5 ) {
                        return; /* Too soon, go away */
@@ -1064,27 +956,30 @@ void dead_session_purge(int force) {
        }
        time(&last_purge);
 
-       begin_critical_section(S_SESSION_TABLE);
-       for (ptr = ContextList; ptr != NULL; ptr = ptr->next) {
-               if ( (ptr->state == CON_IDLE) && (ptr->kill_me) ) {
-
+       if (try_critical_section(S_SESSION_TABLE))
+               return;
+               
+       ptr = ContextList;
+       while (ptr) {
+               ptr2 = ptr;
+               ptr = ptr->next;
+               
+               if ( (ptr2->state == CON_IDLE) && (ptr2->kill_me) ) {
                        /* Remove the session from the active list */
-                       if (ptr->prev) {
-                               ptr->prev->next = ptr->next;
+                       if (ptr2->prev) {
+                               ptr2->prev->next = ptr2->next;
                        }
                        else {
-                               ContextList = ptr->next;
+                               ContextList = ptr2->next;
                        }
-                       if (ptr->next) {
-                               ptr->next->prev = ptr->prev;
+                       if (ptr2->next) {
+                               ptr2->next->prev = ptr2->prev;
                        }
 
                        --num_sessions;
-
                        /* And put it on our to-be-destroyed list */
-                       ptr->next = rem;
-                       rem = ptr;
-
+                       ptr2->next = rem;
+                       rem = ptr2;
                }
        }
        end_critical_section(S_SESSION_TABLE);
@@ -1094,20 +989,12 @@ void dead_session_purge(int force) {
         * is allocated privately on this thread's stack.
         */
        while (rem != NULL) {
-               lprintf(CTDL_DEBUG, "Purging session %d\n", rem->cs_pid);
+               CtdlLogPrintf(CTDL_DEBUG, "Purging session %d\n", rem->cs_pid);
                RemoveContext(rem);
                ptr = rem;
                rem = rem->next;
                free(ptr);
        }
-
-       /* Raise the size of the worker thread pool if necessary. */
-       if ( (num_sessions > num_threads)
-          && (num_threads < config.c_max_workers) ) {
-               begin_critical_section(S_WORKER_LIST);
-               create_worker();
-               end_critical_section(S_WORKER_LIST);
-       }
 }
 
 
@@ -1154,16 +1041,9 @@ void *worker_thread(void *arg) {
        struct timeval tv;
        int force_purge = 0;
        int m;
+       
 
-       num_threads++;
-
-       cdb_allocate_tsd();
-
-       // Register for tracing
-       #ifdef HAVE_BACKTRACE
-       eCrash_RegisterThread("WorkerThread", 0);
-       #endif
-       while (!time_to_die) {
+       while (!CtdlThreadCheckStop()) {
 
                /* make doubly sure we're not holding any stale db handles
                 * which might cause a deadlock.
@@ -1209,30 +1089,34 @@ do_select:      force_purge = 0;
                        }
                }
 
-               if (!time_to_die) {
+               if (!CtdlThreadCheckStop()) {
                        tv.tv_sec = 1;          /* wake up every second if no input */
                        tv.tv_usec = 0;
-                       retval = select(highest + 1, &readfds, NULL, NULL, &tv);
+                       retval = CtdlThreadSelect(highest + 1, &readfds, NULL, NULL, &tv);
                }
 
-               if (time_to_die) return(NULL);
+               if (CtdlThreadCheckStop()) return(NULL);
 
                /* Now figure out who made this select() unblock.
                 * First, check for an error or exit condition.
                 */
                if (retval < 0) {
                        if (errno == EBADF) {
-                               lprintf(CTDL_NOTICE, "select() failed: (%s)\n",
+                               CtdlLogPrintf(CTDL_NOTICE, "select() failed: (%s)\n",
                                        strerror(errno));
                                goto do_select;
                        }
                        if (errno != EINTR) {
-                               lprintf(CTDL_EMERG, "Exiting (%s)\n", strerror(errno));
-                               time_to_die = 1;
-                       } else if (!time_to_die)
+                               CtdlLogPrintf(CTDL_EMERG, "Exiting (%s)\n", strerror(errno));
+                               CtdlThreadStopAll();
+                       } else if (!CtdlThreadCheckStop()) {
+                               CtdlLogPrintf(CTDL_DEBUG, "Un handled select failure.\n");
                                goto do_select;
+                       }
+               }
+               else if(retval == 0) {
+                       goto SKIP_SELECT;
                }
-
                /* Next, check to see if it's a new client connecting
                 * on a master socket.
                 */
@@ -1242,7 +1126,7 @@ do_select:        force_purge = 0;
                        if (FD_ISSET(serviceptr->msock, &readfds)) {
                                ssock = accept(serviceptr->msock, NULL, 0);
                                if (ssock >= 0) {
-                                       lprintf(CTDL_DEBUG,
+                                       CtdlLogPrintf(CTDL_DEBUG,
                                                "New client socket %d\n",
                                                ssock);
 
@@ -1251,7 +1135,7 @@ do_select:        force_purge = 0;
                                         * operations barf on FreeBSD.  Not a fatal error.
                                         */
                                        if (fcntl(ssock, F_SETFL, 0) < 0) {
-                                               lprintf(CTDL_EMERG,
+                                               CtdlLogPrintf(CTDL_EMERG,
                                                        "citserver: Can't set socket to blocking: %s\n",
                                                        strerror(errno));
                                        }
@@ -1338,13 +1222,8 @@ SKIP_SELECT:
 
                dead_session_purge(force_purge);
                do_housekeeping();
-               check_sched_shutdown();
        }
-       if (con != NULL) free (con);//// TODO: could this harm other threads? 
        /* If control reaches this point, the server is shutting down */        
-       #ifdef HAVE_BACKTRACE
-       eCrash_UnregisterThread();
-       #endif
        return(NULL);
 }
 
@@ -1493,7 +1372,7 @@ void dump_heap(void) {
        struct igheap *thisheap;
 
        for (thisheap = igheap; thisheap != NULL; thisheap = thisheap->next) {
-               lprintf(CTDL_CRIT, "UNFREED: %30s : %d\n",
+               CtdlLogPrintf(CTDL_CRIT, "UNFREED: %30s : %d\n",
                        thisheap->file, thisheap->line);
        }
 }