destroy_network_queue_room() is now called via the cleanup hook mechanism.

[citadel.git] / citadel / citserver.c

diff --git a/citadel/citserver.c b/citadel/citserver.c
index a89ef729b6899d1d568662368d3231ff2ee53954..87f4f6f827d4c65be909a214d6e092a56f77152d 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -26,6 +26,10 @@
 # endif
 #endif
 
+#if HAVE_BACKTRACE
+#include <execinfo.h>
+#endif
+
 #include <ctype.h>
 #include <string.h>
 #include <dirent.h>
@@ -53,7 +57,7 @@
 #include "control.h"
 #include "tools.h"
 #include "euidindex.h"
-#include "serv_network.h"
+/*#include "serv_network.h"*/  /* Needed for destroy_network_queue_room called from master_cleanup */
 
 #ifndef HAVE_SNPRINTF
 #include "snprintf.h"
@@ -66,6 +70,28 @@ int ScheduledShutdown = 0;
 int do_defrag = 0;
 time_t server_startup_time;
 
+/**
+ * \brief print the actual stack frame.
+ */
+void cit_backtrace(void)
+{
+#ifdef HAVE_BACKTRACE
+       void *stack_frames[50];
+       size_t size, i;
+       char **strings;
+
+
+       size = backtrace(stack_frames, sizeof(stack_frames) / sizeof(void*));
+       strings = backtrace_symbols(stack_frames, size);
+       for (i = 0; i < size; i++) {
+               if (strings != NULL)
+                       lprintf(1, "%s\n", strings[i]);
+               else
+                       lprintf(1, "%p\n", stack_frames[i]);
+       }
+       free(strings);
+#endif
+}
 /*
  * Various things that need to be initialized at startup
  */
@@ -125,6 +151,7 @@ void master_startup(void) {
  */
 void master_cleanup(int exitcode) {
        struct CleanupFunctionHook *fcn;
+       struct MaintenanceThreadHook *m_fcn;
        static int already_cleaning_up = 0;
 
        if (already_cleaning_up) while(1) sleep(1);
@@ -138,20 +165,18 @@ void master_cleanup(int exitcode) {
        /* Close the AdjRefCount queue file */
        AdjRefCount(-1, 0);
 
-       /* Shut down the indexer thread */
-       lprintf(CTDL_INFO, "Waiting for the indexer thread to shut down\n");
-       pthread_join(indexer_thread_tid, NULL);
-
-       /* Shut down the checkpoint thread */
-       lprintf(CTDL_INFO, "Waiting for the checkpoint thread to shut down\n");
-       pthread_join(checkpoint_thread_tid, NULL);
+       for (m_fcn = MaintenanceThreadHookTable; m_fcn != NULL; m_fcn = m_fcn->next) {
+               lprintf(CTDL_INFO, "Waiting for maintenance thread \"%s\" to shut down\n", m_fcn->name);
+               pthread_join(m_fcn->MaintenanceThread_tid, NULL);
+       }
+       
 
        /* Close databases */
        lprintf(CTDL_INFO, "Closing databases\n");
        close_databases();
 
        /* flush the networker stuff */
-       destroy_network_queue_room();
+/*     destroy_network_queue_room();*/
 
        /* Do system-dependent stuff */
        sysdep_master_cleanup();
@@ -335,8 +360,14 @@ int is_public_client(void)
 
                fp = fopen(public_clients_file, "r");
                if (fp != NULL) while (fgets(buf, sizeof buf, fp)!=NULL) {
-                       for (i=0; i<strlen(buf); ++i) {
-                               if (buf[i] == '#') buf[i] = 0;
+                       char *ptr;
+                       ptr = buf;
+                       while (!IsEmptyStr(ptr)) {
+                               if (*ptr == '#') {
+                                       *ptr = 0;
+                                       break;
+                               }
+                               else ptr++;
                        }
                        while (isspace((buf[strlen(buf)-1]))) {
                                buf[strlen(buf)-1] = 0;
@@ -404,7 +435,7 @@ void cmd_iden(char *argbuf)
        safestrncpy(CC->cs_clientname, desc, sizeof CC->cs_clientname);
        CC->cs_clientname[31] = 0;
 
-       if (strlen(from_host) > 0) {
+       if (!IsEmptyStr(from_host)) {
                if (CC->is_local_socket) do_lookup = 1;
                else if (is_public_client()) do_lookup = 1;
        }
@@ -475,12 +506,12 @@ void cmd_mesg(char *mname)
        /* Otherwise, look for the requested file by name. */
        else {
                mesg_locate(targ, sizeof targ, buf2, 2, (const char **)dirs);
-               if (strlen(targ) == 0) {
+               if (IsEmptyStr(targ)) {
                        snprintf(buf2, sizeof buf2, "%s.%d",
                                                        buf, CC->cs_clientdev);
                        mesg_locate(targ, sizeof targ, buf2, 2,
                                                        (const char **)dirs);
-                       if (strlen(targ) == 0) {
+                       if (IsEmptyStr(targ)) {
                                mesg_locate(targ, sizeof targ, buf, 2,
                                                        (const char **)dirs);
                        }       
@@ -490,7 +521,7 @@ void cmd_mesg(char *mname)
        free(dirs[0]);
        free(dirs[1]);
 
-       if (strlen(targ)==0) {
+       if (IsEmptyStr(targ)) {
                cprintf("%d '%s' not found.  (Searching in %s and %s)\n",
                        ERROR + FILE_NOT_FOUND,
                        mname,
@@ -535,7 +566,7 @@ void cmd_emsg(char *mname)
        if (CtdlAccessCheck(ac_aide)) return;
 
        extract_token(buf, mname, 0, '|', sizeof buf);
-       for (a=0; a<strlen(buf); ++a) {         /* security measure */
+       for (a=0; !IsEmptyStr(&buf[a]); ++a) {          /* security measure */
                if (buf[a] == '/') buf[a] = '.';
        }
 
@@ -546,7 +577,7 @@ void cmd_emsg(char *mname)
        free(dirs[0]);
        free(dirs[1]);
 
-       if (strlen(targ)==0) {
+       if (IsEmptyStr(targ)) {
                snprintf(targ, sizeof targ, 
                                 "%s/%s",
                                 ctdl_hlp_dir, buf);
@@ -799,7 +830,7 @@ void cmd_scdn(char *argbuf)
        if (CtdlAccessCheck(ac_aide)) return;
 
        new_state = extract_int(argbuf, 0);
-       if (new_state > 1)
+       if ((new_state == 2) || (new_state == 3))
        {
                restart_server = 1;
                if (!running_as_daemon)