Began working on the 'clean shutdown' code for the new thread architecture.

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 366f6b6c11842de3a5768dce397d4fc3d86960ad..375d992b42c3ea06cca424385944a438aadd6b0f 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -791,7 +791,7 @@ void cmd_down(char *argbuf) {
                cprintf(Reply, CIT_OK + SERVER_SHUTTING_DOWN); 
        }
        CC->kill_me = KILLME_SERVER_SHUTTING_DOWN;
-       CtdlThreadStopAll();
+       server_shutting_down = 1;
 }
 
 
@@ -803,7 +803,7 @@ void cmd_halt(char *argbuf) {
        if (CtdlAccessCheck(ac_aide)) return;
 
        cprintf("%d Halting server.  Goodbye.\n", CIT_OK);
-       CtdlThreadStopAll();
+       server_shutting_down = 1;
        shutdown_and_halt = 1;
 }
 

diff --git a/citadel/housekeeping.c b/citadel/housekeeping.c
index 5773925dd382199bb84f54da25f88d31379a729d..f4d930d64802631a320086be954b50f409255f58 100644 (file)
--- a/citadel/housekeeping.c
+++ b/citadel/housekeeping.c
@@ -63,7 +63,7 @@
 void check_sched_shutdown(void) {
        if ((ScheduledShutdown == 1) && (ContextList == NULL)) {
                syslog(LOG_NOTICE, "Scheduled shutdown initiating.\n");
-               CtdlThreadStopAll();
+               server_shutting_down = 1;
        }
 }
 

diff --git a/citadel/locate_host.c b/citadel/locate_host.c
index 20704c927c3958f8a419f109fa70bf84018cef20..c3a19636930996eeecebb11db922588bf248829f 100644 (file)
--- a/citadel/locate_host.c
+++ b/citadel/locate_host.c
@@ -105,7 +105,7 @@ int rblcheck_backend(char *domain, char *txtbuf, int txtbufsize) {
 
        /* Make our DNS query. */
        answer = fixedans;
-       if (CtdlThreadCheckStop())
+       if (server_shutting_down)
        {
                if (txtbuf != NULL) {
                        snprintf(txtbuf, txtbufsize, "System shutting down");
@@ -136,7 +136,7 @@ int rblcheck_backend(char *domain, char *txtbuf, int txtbufsize) {
                        return(1);
                }
        }
-       if (CtdlThreadCheckStop())
+       if (server_shutting_down)
        {
                if (txtbuf != NULL)
                        snprintf(txtbuf, txtbufsize, "System shutting down");
@@ -153,7 +153,7 @@ int rblcheck_backend(char *domain, char *txtbuf, int txtbufsize) {
         * nameserver we're using.
         */
        len = res_query(domain, C_IN, T_TXT, answer, PACKETSZ);
-       if (CtdlThreadCheckStop())
+       if (server_shutting_down)
        {
                if (txtbuf != NULL) {
                        snprintf(txtbuf, txtbufsize, "System shutting down");

diff --git a/citadel/modules/expire/serv_expire.c b/citadel/modules/expire/serv_expire.c
index 70ddb316c4f2ae2e93218af2a3df5ac0ce8c194c..c92ae6d80fcd3a618ff6b8e44d87677ce70e532e 100644 (file)
--- a/citadel/modules/expire/serv_expire.c
+++ b/citadel/modules/expire/serv_expire.c
@@ -876,55 +876,55 @@ void purge_databases(void)
 
        syslog(LOG_INFO, "Auto-purger: starting.\n");
 
-       if (!CtdlThreadCheckStop())
+       if (!server_shutting_down)
        {
                retval = PurgeUsers();
                syslog(LOG_NOTICE, "Purged %d users.\n", retval);
        }
                
-       if (!CtdlThreadCheckStop())
+       if (!server_shutting_down)
        {
                PurgeMessages();
                syslog(LOG_NOTICE, "Expired %d messages.\n", messages_purged);
        }
 
-       if (!CtdlThreadCheckStop())
+       if (!server_shutting_down)
        {
                        retval = PurgeRooms();
                        syslog(LOG_NOTICE, "Expired %d rooms.\n", retval);
        }
 
-       if (!CtdlThreadCheckStop())
+       if (!server_shutting_down)
        {
                        retval = PurgeVisits();
                        syslog(LOG_NOTICE, "Purged %d visits.\n", retval);
        }
 
-       if (!CtdlThreadCheckStop())
+       if (!server_shutting_down)
        {
                retval = PurgeUseTable();
                        syslog(LOG_NOTICE, "Purged %d entries from the use table.\n", retval);
        }
 
-       if (!CtdlThreadCheckStop())
+       if (!server_shutting_down)
        {
                retval = PurgeEuidIndexTable();
                syslog(LOG_NOTICE, "Purged %d entries from the EUID index.\n", retval);
        }
 
-       if (!CtdlThreadCheckStop())
+       if (!server_shutting_down)
        {
                retval = PurgeStaleOpenIDassociations();
                syslog(LOG_NOTICE, "Purged %d stale OpenID associations.\n", retval);
        }
 
-       if (!CtdlThreadCheckStop())
+       if (!server_shutting_down)
        {
                        retval = TDAP_ProcessAdjRefCountQueue();
                syslog(LOG_NOTICE, "Processed %d message reference count adjustments.\n", retval);
        }
 
-       if (!CtdlThreadCheckStop())
+       if (!server_shutting_down)
        {
                syslog(LOG_INFO, "Auto-purger: finished.\n");
                last_purge = now;       /* So we don't do it again soon */

diff --git a/citadel/modules/fulltext/serv_fulltext.c b/citadel/modules/fulltext/serv_fulltext.c
index bac3e90b98bf04fe8fb9af9e134c7acbe992159a..db0edbdd11bc04dc23bf512934f07303f14e8508 100644 (file)
--- a/citadel/modules/fulltext/serv_fulltext.c
+++ b/citadel/modules/fulltext/serv_fulltext.c
@@ -228,7 +228,7 @@ void ft_index_msg(long msgnum, void *userdata) {
  */
 void ft_index_room(struct ctdlroom *qrbuf, void *data)
 {
-       if (CtdlThreadCheckStop())
+       if (server_shutting_down)
                return;
                
        CtdlGetRoom(&CC->room, qrbuf->QRname);
@@ -321,7 +321,7 @@ void do_fulltext_indexing(void) {
                        ft_index_message(ft_newmsgs[i], 1);
 
                        /* Check to see if we need to quit early */
-                       if (CtdlThreadCheckStop()) {
+                       if (server_shutting_down) {
                                syslog(LOG_DEBUG, "Indexer quitting early\n");
                                ft_newhighest = ft_newmsgs[i];
                                break;
@@ -343,7 +343,7 @@ void do_fulltext_indexing(void) {
        }
        end_time = time(NULL);
 
-       if (CtdlThreadCheckStop()) {
+       if (server_shutting_down) {
                is_running = 0;
                return;
        }

diff --git a/citadel/modules/migrate/serv_migrate.c b/citadel/modules/migrate/serv_migrate.c
index 10404772b3f2647a0fb676e77a84730d58033984..091822c38a97598fe44d7c6c4a8fa2255bd86ecb 100644 (file)
--- a/citadel/modules/migrate/serv_migrate.c
+++ b/citadel/modules/migrate/serv_migrate.c
@@ -831,7 +831,7 @@ void migr_xml_end(void *data, const char *el) {
                        msglist = NULL;
                        msglist_alloc = 0;
                        syslog(LOG_DEBUG, "Imported %d messages.\n", msgcount);
-                       if (CtdlThreadCheckStop()) {
+                       if (server_shutting_down) {
                                return;
                }
        }
@@ -932,7 +932,7 @@ void migr_do_import(void) {
                linelen = strlen(buf);
                strcpy(&buf[linelen++], "\n");
 
-               if (CtdlThreadCheckStop())
+               if (server_shutting_down)
                        break;  // Should we break or return?
                
                if (buf[0] == '\0')

diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c
index 4e831cd18efe36e3c6f7a2c7b3173330109ae3b4..c9d255c4f28180c079cd6cc5c1b28dbfdf22e673 100644 (file)
--- a/citadel/modules/network/serv_network.c
+++ b/citadel/modules/network/serv_network.c
@@ -1969,7 +1969,7 @@ void receive_spool(int *sock, char *remote_nodename) {
                 * If shutting down we can exit here and unlink the temp file.
                 * this shouldn't loose us any messages.
                 */
-               if (CtdlThreadCheckStop())
+               if (server_shutting_down)
                {
                        fclose(fp);
                        unlink(tempfilename);
@@ -2011,7 +2011,7 @@ void receive_spool(int *sock, char *remote_nodename) {
        fclose(fp);
 
        /* Last chance for shutdown exit */
-       if (CtdlThreadCheckStop())
+       if (server_shutting_down)
        {
                unlink(tempfilename);
                return;
@@ -2082,7 +2082,7 @@ void transmit_spool(int *sock, char *remote_nodename)
                bytes_to_write = plen;
                while (bytes_to_write > 0L) {
                        /* Exit if shutting down */
-                       if (CtdlThreadCheckStop())
+                       if (server_shutting_down)
                        {
                                close(fd);
                                return;
@@ -2115,7 +2115,7 @@ ABORTUPL:
        close(fd);
 
        /* Last chance for shutdown exit */
-       if(CtdlThreadCheckStop())
+       if(server_shutting_down)
                return;
                
        if (sock_puts(sock, "UCLS 1") < 0) return;
@@ -2188,9 +2188,9 @@ void network_poll_node(char *node, char *secret, char *host, char *port) {
                }
        
                /* At this point we are authenticated. */
-               if (!CtdlThreadCheckStop())
+               if (!server_shutting_down)
                        receive_spool(&sock, node);
-               if (!CtdlThreadCheckStop())
+               if (!server_shutting_down)
                        transmit_spool(&sock, node);
        }
 
@@ -2227,7 +2227,7 @@ void network_poll_other_citadel_nodes(int full_poll) {
 
        /* Use the string tokenizer to grab one line at a time */
        for (i=0; i<num_tokens(working_ignetcfg, '\n'); ++i) {
-               if(CtdlThreadCheckStop())
+               if(server_shutting_down)
                        return;
                extract_token(linebuf, working_ignetcfg, i, '\n', sizeof linebuf);
                extract_token(node, linebuf, 0, '|', sizeof node);
@@ -2337,14 +2337,14 @@ void network_do_queue(void) {
        /* 
         * Go ahead and run the queue
         */
-       if (full_processing && !CtdlThreadCheckStop()) {
+       if (full_processing && !server_shutting_down) {
                syslog(LOG_DEBUG, "network: loading outbound queue\n");
                CtdlForEachRoom(network_queue_room, NULL);
        }
 
        if (rplist != NULL) {
                syslog(LOG_DEBUG, "network: running outbound queue\n");
-               while (rplist != NULL && !CtdlThreadCheckStop()) {
+               while (rplist != NULL && !server_shutting_down) {
                        char spoolroomname[ROOMNAMELEN];
                        safestrncpy(spoolroomname, rplist->name, sizeof spoolroomname);
                        begin_critical_section(S_RPLIST);
@@ -2369,7 +2369,7 @@ void network_do_queue(void) {
        }
 
        /* If there is anything in the inbound queue, process it */
-       if (!CtdlThreadCheckStop()) {
+       if (!server_shutting_down) {
                network_do_spoolin();
        }
 

diff --git a/citadel/modules/pop3client/serv_pop3client.c b/citadel/modules/pop3client/serv_pop3client.c
index d91ded9a4b7fd39526bec521a5729dc742b1b096..c6e6ba052512e5650cd4ca548c9a1a76f9763174 100644 (file)
--- a/citadel/modules/pop3client/serv_pop3client.c
+++ b/citadel/modules/pop3client/serv_pop3client.c
@@ -85,7 +85,7 @@ void pop3_do_fetching(char *roomname, char *pop3host, char *pop3user, char *pop3
        syslog(LOG_DEBUG, "POP3: %s %s %s <password>\n", roomname, pop3host, pop3user);
        syslog(LOG_NOTICE, "Connecting to <%s>\n", pop3host);
        
-       if (CtdlThreadCheckStop())
+       if (server_shutting_down)
                return;
                
        sock = sock_connect(pop3host, "110");
@@ -94,7 +94,7 @@ void pop3_do_fetching(char *roomname, char *pop3host, char *pop3user, char *pop3
                return;
        }
        
-       if (CtdlThreadCheckStop())
+       if (server_shutting_down)
                goto bail;
 
        syslog(LOG_DEBUG, "Connected!\n");
@@ -107,7 +107,7 @@ void pop3_do_fetching(char *roomname, char *pop3host, char *pop3user, char *pop3
        syslog(LOG_DEBUG, ">%s\n", buf);
        if (strncasecmp(buf, "+OK", 3)) goto bail;
 
-       if (CtdlThreadCheckStop())
+       if (server_shutting_down)
                goto bail;
 
        /* Identify ourselves.  NOTE: we have to append a CR to each command.  The LF will
@@ -122,7 +122,7 @@ void pop3_do_fetching(char *roomname, char *pop3host, char *pop3user, char *pop3
        syslog(LOG_DEBUG, ">%s\n", buf);
        if (strncasecmp(buf, "+OK", 3)) goto bail;
 
-       if (CtdlThreadCheckStop())
+       if (server_shutting_down)
                goto bail;
 
        /* Password */
@@ -133,7 +133,7 @@ void pop3_do_fetching(char *roomname, char *pop3host, char *pop3user, char *pop3
        syslog(LOG_DEBUG, ">%s\n", buf);
        if (strncasecmp(buf, "+OK", 3)) goto bail;
 
-       if (CtdlThreadCheckStop())
+       if (server_shutting_down)
                goto bail;
 
        /* Get the list of messages */
@@ -144,11 +144,11 @@ void pop3_do_fetching(char *roomname, char *pop3host, char *pop3user, char *pop3
        syslog(LOG_DEBUG, ">%s\n", buf);
        if (strncasecmp(buf, "+OK", 3)) goto bail;
 
-       if (CtdlThreadCheckStop())
+       if (server_shutting_down)
                goto bail;
 
        do {
-               if (CtdlThreadCheckStop())
+               if (server_shutting_down)
                        goto bail;
 
                if (sock_getln(&sock, buf, sizeof buf) < 0) goto bail;
@@ -181,7 +181,7 @@ void pop3_do_fetching(char *roomname, char *pop3host, char *pop3user, char *pop3
 
                snprintf(utmsgid, sizeof utmsgid, "pop3/%s/%s@%s", roomname, this_uidl, pop3host);
 
-               if (CtdlThreadCheckStop())
+               if (server_shutting_down)
                        goto bail;
 
                cdbut = cdb_fetch(CDB_USETABLE, utmsgid, strlen(utmsgid));
@@ -204,7 +204,7 @@ void pop3_do_fetching(char *roomname, char *pop3host, char *pop3user, char *pop3
                        syslog(LOG_DEBUG, ">%s\n", buf);
                        if (strncasecmp(buf, "+OK", 3)) goto bail;
        
-                       if (CtdlThreadCheckStop())
+                       if (server_shutting_down)
                                goto bail;
 
                        /* If we get to this point, the message is on its way.  Read it. */
@@ -265,7 +265,7 @@ void pop3client_scan_room(struct ctdlroom *qrbuf, void *data)
        FILE *fp;
        struct pop3aggr *pptr;
 
-       if (CtdlThreadCheckStop())
+       if (server_shutting_down)
                return;
 
        assoc_file_name(filename, sizeof filename, qrbuf, ctdl_netcfg_dir);
@@ -331,7 +331,7 @@ void pop3client_scan(void) {
        syslog(LOG_DEBUG, "pop3client started\n");
        CtdlForEachRoom(pop3client_scan_room, NULL);
 
-       while (palist != NULL && !CtdlThreadCheckStop()) {
+       while (palist != NULL && !server_shutting_down) {
                if ((palist->interval && time(NULL) > (last_run + palist->interval))
                        || (time(NULL) > last_run + config.c_pop3_fetch))
                                pop3_do_fetching(palist->roomname, palist->pop3host,

diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c
index f9e6544deb23677df3782cb96a1659b2c317b4c2..dd662ed085c2a7bb9fc02de17bed59f8249755a0 100644 (file)
--- a/citadel/modules/rssclient/serv_rssclient.c
+++ b/citadel/modules/rssclient/serv_rssclient.c
@@ -374,7 +374,7 @@ int LookupUrl(StrBuf *ShorterUrlStr)
                curl_easy_setopt(curl, CURLOPT_INTERFACE, config.c_ip_addr);
        }
 
-       if (CtdlThreadCheckStop())
+       if (server_shutting_down)
                goto shutdown ;
 
        rc = curl_easy_perform(curl);
@@ -1302,13 +1302,13 @@ void rss_do_fetching(rssnetcfg *Cfg) {
                curl_easy_setopt(curl, CURLOPT_INTERFACE, config.c_ip_addr);
        }
 
-       if (CtdlThreadCheckStop())
+       if (server_shutting_down)
        {
                curl_easy_cleanup(curl);
                return;
        }
        
-       if (CtdlThreadCheckStop())
+       if (server_shutting_down)
                goto shutdown ;
 
        res = curl_easy_perform(curl);
@@ -1316,7 +1316,7 @@ void rss_do_fetching(rssnetcfg *Cfg) {
                syslog(LOG_ALERT, "libcurl error %d: %s\n", res, errmsg);
        }
 
-       if (CtdlThreadCheckStop())
+       if (server_shutting_down)
                goto shutdown ;
 
 
@@ -1410,7 +1410,7 @@ void rssclient_scan_room(struct ctdlroom *qrbuf, void *data)
 
        assoc_file_name(filename, sizeof filename, qrbuf, ctdl_netcfg_dir);
 
-       if (CtdlThreadCheckStop())
+       if (server_shutting_down)
                return;
                
        /* Only do net processing for rooms that have netconfigs */
@@ -1419,7 +1419,7 @@ void rssclient_scan_room(struct ctdlroom *qrbuf, void *data)
                return;
        }
 
-       while (fgets(buf, sizeof buf, fp) != NULL && !CtdlThreadCheckStop()) {
+       while (fgets(buf, sizeof buf, fp) != NULL && !server_shutting_down) {
                buf[strlen(buf)-1] = 0;
 
                extract_token(instr, buf, 0, '|', sizeof instr);
@@ -1500,7 +1500,7 @@ void rssclient_scan(void) {
        syslog(LOG_DEBUG, "rssclient started\n");
        CtdlForEachRoom(rssclient_scan_room, NULL);
 
-       while (rnclist != NULL && !CtdlThreadCheckStop()) {
+       while (rnclist != NULL && !server_shutting_down) {
                rss_do_fetching(rnclist);
                rptr = rnclist;
                rnclist = rnclist->next;

diff --git a/citadel/modules/smtp/serv_smtp.c b/citadel/modules/smtp/serv_smtp.c
index e2d9766a68826c900bb42f0431b26137b9c1c5bf..885bf950f1193111294a3ddaa515868a2910fb93 100644 (file)
--- a/citadel/modules/smtp/serv_smtp.c
+++ b/citadel/modules/smtp/serv_smtp.c
@@ -131,7 +131,7 @@ void smtp_greeting(int is_msa)
         */
        if ( (config.c_rbl_at_greeting) && (sSMTP->is_msa == 0) ) {
                if (rbl_check(message_to_spammer)) {
-                       if (CtdlThreadCheckStop())
+                       if (server_shutting_down)
                                cprintf("421 %s\r\n", message_to_spammer);
                        else
                                cprintf("550 %s\r\n", message_to_spammer);
@@ -584,7 +584,7 @@ void smtp_rcpt(char *argbuf) {
           && (!sSMTP->is_lmtp) ) {     /* Don't RBL LMTP clients */
                if (config.c_rbl_at_greeting == 0) {    /* Don't RBL again if we already did it */
                        if (rbl_check(message_to_spammer)) {
-                               if (CtdlThreadCheckStop())
+                               if (server_shutting_down)
                                        cprintf("421 %s\r\n", message_to_spammer);
                                else
                                        cprintf("550 %s\r\n", message_to_spammer);

diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index f9a2f07d6bc0723c1f0a3cbdee42fac1a5ed3416..0e674eba85faaa159116181f282055eaff9dece1 100644 (file)
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -101,6 +101,7 @@ volatile int running_as_daemon = 0;
 static RETSIGTYPE signal_cleanup(int signum) {
        syslog(LOG_DEBUG, "Caught signal %d; shutting down.", signum);
        exit_signal = signum;
+       server_shutting_down = 1;
 }
 
 static RETSIGTYPE signal_exit(int signum) {
@@ -482,7 +483,7 @@ int client_write(const char *buf, int nbytes)
                                        syslog(LOG_DEBUG, "client_write(%d bytes) select() interrupted.",
                                                nbytes-bytes_written
                                        );
-                                       if (CtdlThreadCheckStop()) {
+                                       if (server_shutting_down) {
                                                CC->kill_me = KILLME_SELECT_INTERRUPTED;
                                                return (-1);
                                        } else {
@@ -1141,7 +1142,7 @@ void *worker_thread(void *blah) {
 
        ++num_workers;
 
-       while (!CtdlThreadCheckStop()) {
+       while (!server_shutting_down) {
 
                /* make doubly sure we're not holding any stale db handles
                 * which might cause a deadlock.
@@ -1187,7 +1188,7 @@ do_select:        force_purge = 0;
                 * ahead and get ready to select().
                 */
 
-               if (!CtdlThreadCheckStop()) {
+               if (!server_shutting_down) {
                        tv.tv_sec = 1;          /* wake up every second if no input */
                        tv.tv_usec = 0;
                        retval = select(highest + 1, &readfds, NULL, NULL, &tv);
@@ -1206,16 +1207,16 @@ do_select:      force_purge = 0;
                        }
                        if (errno != EINTR) {
                                syslog(LOG_EMERG, "Exiting (%s)\n", strerror(errno));
-                               CtdlThreadStopAll();
+                               server_shutting_down = 1;
                                continue;
                        } else {
                                syslog(LOG_DEBUG, "Interrupted select()\n");
-                               if (CtdlThreadCheckStop()) return(NULL);
+                               if (server_shutting_down) return(NULL);
                                goto do_select;
                        }
                }
                else if (retval == 0) {
-                       if (CtdlThreadCheckStop()) return(NULL);
+                       if (server_shutting_down) return(NULL);
                }
 
                /* It must be a client socket.  Find a context that has data
@@ -1288,7 +1289,9 @@ SKIP_SELECT:
                do_housekeeping();
                --active_workers;
        }
-       /* If control reaches this point, the server is shutting down */        
+
+       /* If control reaches this point, the server is shutting down */
+       --num_workers;
        return(NULL);
 }
 
@@ -1316,7 +1319,7 @@ void *select_on_master(void *blah)
        CtdlFillSystemContext(&select_on_master_CC, "select_on_master");
        pthread_setspecific(MyConKey, (void *)&select_on_master_CC);
 
-       while (!CtdlThreadCheckStop()) {
+       while (!server_shutting_down) {
                /* Initialize the fdset. */
                FD_ZERO(&master_fds);
                highest = 0;
@@ -1331,7 +1334,7 @@ void *select_on_master(void *blah)
                        }
                }
 
-               if (!CtdlThreadCheckStop()) {
+               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);
@@ -1350,15 +1353,15 @@ void *select_on_master(void *blah)
                        }
                        if (errno != EINTR) {
                                syslog(LOG_EMERG, "Exiting (%s)\n", strerror(errno));
-                               CtdlThreadStopAll();
+                               server_shutting_down = 1;
                        } else {
                                syslog(LOG_DEBUG, "Interrupted CtdlThreadSelect.\n");
-                               if (CtdlThreadCheckStop()) return(NULL);
+                               if (server_shutting_down) return(NULL);
                                continue;
                        }
                }
                else if(retval == 0) {
-                       if (CtdlThreadCheckStop()) return(NULL);
+                       if (server_shutting_down) return(NULL);
                        continue;
                }
                /* Next, check to see if it's a new client connecting

diff --git a/citadel/threads.c b/citadel/threads.c
index d60867df87daddfc8d8822073b24a9d92554c9e7..20f852168061e77829983b461857f60ab199a5cd 100644 (file)
--- a/citadel/threads.c
+++ b/citadel/threads.c
@@ -66,6 +66,7 @@ int active_workers = 0;                               /* Number of ACTIVE worker threads */
 pthread_key_t ThreadKey;
 pthread_mutex_t Critters[MAX_SEMAPHORES];      /* Things needing locking */
 struct thread_tsd masterTSD;
+int server_shutting_down = 0;                  /* set to nonzero during shutdown */
 
 
 
@@ -127,27 +128,6 @@ void end_critical_section(int which_one)
 }
 
 
-/*
- * A function to tell all threads to exit
- */
-void CtdlThreadStopAll(void)
-{
-       terminate_all_sessions();               /* close all client sockets */
-       CtdlShutdownServiceHooks();             /* close all listener sockets to prevent new connections */
-       PerformSessionHooks(EVT_SHUTDOWN);      /* run any registered shutdown hooks */
-}
-
-
-/*
- * A function for a thread to check if it has been asked to stop
- */
-int CtdlThreadCheckStop(void)
-{
-
-       /* FIXME this needs to do something useful.  moar code pls ! */
-
-       return 0;
-}
 
 
 /*
@@ -223,16 +203,22 @@ void go_threading(void)
        /* The supervisor thread monitors worker threads and spawns more of them if it finds that
         * they are all in use.  FIXME make the 256 max threads a configurable value.
         */
-       while(!CtdlThreadCheckStop()) {
+       while (!server_shutting_down) {
                if ((active_workers == num_workers) && (num_workers < 256)) {
-                       syslog(LOG_DEBUG, "worker threads: %d, active: %d\n", num_workers, active_workers);
                        CtdlThreadCreate(worker_thread);
-                       syslog(LOG_DEBUG, "worker threads: %d, active: %d\n", num_workers, active_workers);
                }
                sleep(1);
        }
 
-       /* Shut down */
-       CtdlThreadStopAll();
-       exit(0);
+       /* When we get to this point we are getting ready to shut down our Citadel server */
+
+       terminate_all_sessions();               /* close all client sockets */
+       CtdlShutdownServiceHooks();             /* close all listener sockets to prevent new connections */
+       PerformSessionHooks(EVT_SHUTDOWN);      /* run any registered shutdown hooks */
+
+       int countdown = 10;
+       while ( (num_workers > 0) && (countdown-- > 0)) {
+               syslog(LOG_DEBUG, "Waiting for %d worker threads to exit", num_workers);
+               sleep(1);
+       }
 }

diff --git a/citadel/threads.h b/citadel/threads.h
index b673c6c074a13545188f41bcb9be89e0accf76e2..301cf113b30cca2b724738752ed2f71ee2e0b16b 100644 (file)
--- a/citadel/threads.h
+++ b/citadel/threads.h
@@ -35,14 +35,13 @@ extern struct thread_tsd masterTSD;
 
 extern int num_workers;
 extern int active_workers;
+extern int server_shutting_down;
 
 struct thread_tsd *MyThread(void);
 int try_critical_section (int which_one);
 void begin_critical_section (int which_one);
 void end_critical_section (int which_one);
 void go_threading(void);
-int CtdlThreadCheckStop(void);
-void CtdlThreadStopAll(void);
 void InitializeMasterTSD(void);
 
 #endif // THREADS_H