* Removed code from some of the utilities which was still attempting

[citadel.git] / citadel / sysdep.c

diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index fa15477e0d1cd6a0ba008a4612949626365dacbb..1220155690896468ff7673d47196ad43c0db0945 100644 (file)
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -31,23 +31,26 @@
 #include <pthread.h>
 #include "citadel.h"
 #include "server.h"
-#include "proto.h"
+#include "sysdep_decls.h"
+#include "citserver.h"
+#include "support.h"
+#include "config.h"
+#include "database.h"
+#include "housekeeping.h"
+#include "dynloader.h"
 
 #ifdef NEED_SELECT_H
 #include <sys/select.h>
 #endif
 
-extern struct CitContext *ContextList;
-extern struct config config;
-extern char bbs_home_directory[];
-extern int home_specified;
-
 pthread_mutex_t Critters[MAX_SEMAPHORES];      /* Things needing locking */
 pthread_key_t MyConKey;                                /* TSD key for MyContext() */
 
 int msock;                                     /* master listening socket */
 int verbosity = 3;                             /* Logging level */
 
+struct CitContext masterCC;
+
 
 /*
  * lprintf()  ...   Write logging information
@@ -81,7 +84,7 @@ void init_sysdep(void) {
                }
 
        /*
-        * Set up a place to put thread-specific data.
+        * Set up a place to put thred-specific data.
         * We only need a single pointer per thread - it points to the
         * thread's CitContext structure in the ContextList linked list.
         */
@@ -93,10 +96,10 @@ void init_sysdep(void) {
         * The action for unexpected signals and exceptions should be to
         * call master_cleanup() to gracefully shut down the server.
         */
-       signal(SIGINT, master_cleanup);
-       signal(SIGQUIT, master_cleanup);
-       signal(SIGHUP, master_cleanup);
-       signal(SIGTERM, master_cleanup);
+       signal(SIGINT, (void(*)(int))master_cleanup);
+       signal(SIGQUIT, (void(*)(int))master_cleanup);
+       signal(SIGHUP, (void(*)(int))master_cleanup);
+       signal(SIGTERM, (void(*)(int))master_cleanup);
        }
 
 
@@ -108,7 +111,6 @@ void begin_critical_section(int which_one)
        int oldval;
 
        lprintf(8, "begin_critical_section(%d)\n", which_one);
-       if (CC != NULL) hook_crit_get(CC->cs_pid, which_one);
 
        /* Don't get interrupted during the critical section */
        pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, &oldval);
@@ -116,7 +118,6 @@ void begin_critical_section(int which_one)
        /* Obtain a semaphore */
        pthread_mutex_lock(&Critters[which_one]);
 
-       if (CC != NULL) hook_crit_got(CC->cs_pid, which_one);
        }
 
 /*
@@ -127,7 +128,6 @@ void end_critical_section(int which_one)
        int oldval;
 
        lprintf(8, "  end_critical_section(%d)\n", which_one);
-       if (CC != NULL) hook_crit_end(CC->cs_pid, which_one);
 
        /* Let go of the semaphore */
        pthread_mutex_unlock(&Critters[which_one]);
@@ -213,7 +213,10 @@ int ig_tcp_server(int port_number, int queue_len)
  * Return a pointer to a thread's own CitContext structure (new)
  */
 struct CitContext *MyContext(void) {
-       return (struct CitContext *) pthread_getspecific(MyConKey);
+       struct CitContext *retCC;
+       retCC = (struct CitContext *) pthread_getspecific(MyConKey);
+       if (retCC == NULL) retCC = &masterCC;
+       return(retCC);
        }
 
 
@@ -229,6 +232,7 @@ struct CitContext *CreateNewContext(void) {
                lprintf(1, "citserver: can't allocate memory!!\n");
                pthread_exit(NULL);
                }
+       bzero(me, sizeof(struct CitContext));
 
        begin_critical_section(S_SESSION_TABLE);
        me->next = ContextList;
@@ -428,7 +432,7 @@ int client_gets(char *buf)
  * The system-dependent part of master_cleanup() - close the master socket.
  */
 void sysdep_master_cleanup(void) {
-       lprintf(3, "Closing master socket %d\n", msock);
+       lprintf(7, "Closing master socket %d\n", msock);
        close(msock);
        }
 
@@ -592,7 +596,8 @@ int main(int argc, char **argv)
        char tracefile[128];            /* Name of file to log traces to */
        int a, i;                       /* General-purpose variables */
        char convbuf[128];
-
+       char modpath[128];
+        
        /* specify default port name and trace file */
        strcpy(tracefile, "");
 
@@ -643,20 +648,21 @@ int main(int argc, char **argv)
        /* Initialize... */
        init_sysdep();
        openlog("citserver",LOG_PID,LOG_USER);
-
+        lprintf(1, "Initting modules...\n");
+        snprintf(modpath, 128, "%s/modules", BBSDIR);
+        DLoader_Init(modpath);
+        lprintf(1, "Modules done initializing...\n");
+/*
+        lprintf(1, "First symtab item:");
+        lprintf(1, my_symtab->fcn_name);
+        lprintf(1, "\n");
+*/                                                 
        /* Load site-specific parameters */
        lprintf(7, "Loading citadel.config\n");
        get_config();
-       hook_init();
-
-       /* Databases must be opened *after* config is loaded, otherwise we might
-        * end up working in the wrong directory.
-        */
-       lprintf(7, "Opening databases\n");
-       open_databases();
 
-       lprintf(7, "Checking floor reference counts\n");
-       check_ref_counts();
+       /* Do non system dependent startup functions */
+       master_startup();
 
        /*
         * Bind the server to our favourite port.