Now do garbage collection every second.

[citadel.git] / citadel / server_main.c

diff --git a/citadel/server_main.c b/citadel/server_main.c
index f8b95019d2f96991213c0bd9ef1db8b661b0b705..85cea680b1a67790d6e3236c11336aa8b6554f0b 100644 (file)
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -44,6 +44,7 @@
 #ifdef HAVE_SYS_PRCTL_H
 #include <sys/prctl.h>
 #endif
+#include <libcitadel.h>
 #include "citadel.h"
 #include "server.h"
 #include "serv_extensions.h"
@@ -55,7 +56,6 @@
 #include "database.h"
 #include "user_ops.h"
 #include "housekeeping.h"
-#include "tools.h"
 #include "citadel_dirs.c"
 
 #include "modules_init.h"
@@ -215,6 +215,7 @@ int main(int argc, char **argv)
                "General Public License.\n");
        lprintf(CTDL_NOTICE, "\n");
        lprintf(CTDL_DEBUG, "Called as: %s\n", argv[0]);
+       lprintf(CTDL_INFO, "%s\n", libcitadel_version_string());
 
        /* Load site-specific parameters, and set the ipgm secret */
        lprintf(CTDL_INFO, "Loading citadel.config\n");
@@ -275,11 +276,7 @@ int main(int argc, char **argv)
        lprintf(CTDL_INFO, "Initializing server extensions\n");
        size = strlen(ctdl_home_directory) + 9;
        
-/*
-       initialize_server_extensions();
-*/
-       
-       initialise_modules();
+       initialise_modules(0);
        
        
 
@@ -324,26 +321,46 @@ int main(int argc, char **argv)
        /* We want to check for idle sessions once per minute */
        CtdlRegisterSessionHook(terminate_idle_sessions, EVT_TIMER);
 
+       /*
+        * Initialise the thread system
+        */
+       ctdl_thread_internal_init();
+       
        /*
         * Now create a bunch of worker threads.
         */
-       lprintf(CTDL_DEBUG, "Starting %d worker threads\n",
+       CtdlLogPrintf(CTDL_DEBUG, "Starting %d worker threads\n",
                config.c_min_workers-1);
-       begin_critical_section(S_WORKER_LIST);
+       begin_critical_section(S_THREAD_LIST);
        for (i=0; i<(config.c_min_workers-1); ++i) {
-               create_worker();
+               ctdl_internal_create_thread("Worker Thread", CTDLTHREAD_BIGSTACK + CTDLTHREAD_WORKER, worker_thread, NULL);
        }
-       end_critical_section(S_WORKER_LIST);
+       end_critical_section(S_THREAD_LIST);
+
+       /* Second call to module init functions now that threading is up */
+       initialise_modules(1);
 
-       /* Create the maintenance threads. */
-       create_maintenance_threads();
+       /*
+        * This thread is now used for garbage collection of other threads in the thread list
+        */
+       CtdlLogPrintf(CTDL_INFO, "Startup thread %d becoming garbage collector,\n", pthread_self());
 
-       /* This thread is now useless.  It can't be turned into a worker
-        * thread because its stack is too small, but it can't be killed
-        * either because the whole server process would exit.  So we just
-        * join to the first worker thread and exit when it exits.
+       /* Sleep 10 seconds before first garbage collection */  
+       CtdlThreadSleep(10);
+       
+       while (CtdlThreadGetCount())
+       {
+               ctdl_thread_internal_calc_loadavg();
+               CtdlThreadSleep(1);
+               ctdl_internal_thread_gc();
+               if (CtdlThreadGetCount() <= 1) // Shutting down clean up the garbage collector
+                       ctdl_internal_thread_gc();
+       }
+       /*
+        * If the above loop exits we must be shutting down since we obviously have no threads
         */
-       pthread_join(worker_list->tid, NULL);
-       master_cleanup(0);
+       ctdl_thread_internal_cleanup();
+       
+       master_cleanup(exit_signal);
        return(0);
 }