* added server command line option "-f" to defrag databases on startup

[citadel.git] / citadel / citserver.c

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 5e685dbd97543d984f416e4728d59806f34bebbb..e79fc29dbfae7b8de124e2b0815a921071076903 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -40,6 +40,7 @@
 
 struct CitContext *ContextList = NULL;
 int ScheduledShutdown = 0;
+int do_defrag = 0;
 
 /*
  * Various things that need to be initialized at startup
@@ -48,6 +49,9 @@ void master_startup(void) {
        lprintf(7, "Opening databases\n");
        open_databases();
 
+       if (do_defrag)
+               defrag_databases();
+
        lprintf(7, "Checking floor reference counts\n");
        check_ref_counts();
 
@@ -88,6 +92,29 @@ void master_cleanup(void) {
        }
 
 
+/*
+ * Free any per-session data allocated by modules or whatever
+ */
+void deallocate_user_data(struct CitContext *con)
+{
+       struct CtdlSessData *ptr;
+
+       begin_critical_section(S_SESSION_TABLE);
+       while (con->FirstSessData != NULL) {
+               lprintf(9, "Deallocating user data symbol %ld\n",
+                       con->FirstSessData->sym_id);
+               if (con->FirstSessData->sym_data != NULL)
+                       phree(con->FirstSessData->sym_data);
+               ptr = con->FirstSessData->next;
+               phree(con->FirstSessData);
+               con->FirstSessData = ptr;
+       }
+       end_critical_section(S_SESSION_TABLE);
+}
+
+
+
+
 /*
  * Gracefully terminate the session and thread.
  * (This is called as a cleanup handler by the thread library.)
@@ -115,6 +142,9 @@ void cleanup_stuff(void *arg)
        /* Deallocate any message list we might have in memory */
        if (CC->msglist != NULL) phree(CC->msglist);
 
+       /* Deallocate any user-data attached to this session */
+       deallocate_user_data(CC);
+
        /* Now get rid of the session and context */
        lprintf(7, "cleanup_stuff() calling RemoveContext(%d)\n", CC->cs_pid);
        RemoveContext(CC);
@@ -126,6 +156,73 @@ void cleanup_stuff(void *arg)
        }
 
 
+/*
+ * Get a dynamic symbol number for per-session user data.
+ * This API call should be made only ONCE per symbol per citserver run.
+ */
+int CtdlGetDynamicSymbol() 
+{
+       static unsigned int next_symbol = SYM_MAX;
+       return ++next_symbol;
+}
+
+
+
+/*
+ * Return a pointer to some generic per-session user data.
+ * (This function returns NULL if the requested symbol is not allocated.)
+ *
+ * NOTE: we use critical sections for allocating and de-allocating these,
+ *       but not for locating one.
+ */
+void *CtdlGetUserData(unsigned long requested_sym) 
+{
+       struct CtdlSessData *ptr;
+
+       for (ptr = CC->FirstSessData; ptr != NULL; ptr = ptr->next)
+               if (ptr->sym_id == requested_sym)
+                       return(ptr->sym_data);
+
+       lprintf(2, "ERROR! CtdlGetUserData(%ld) symbol not allocated\n",
+               requested_sym);
+       return NULL;
+}
+
+
+/*
+ * Allocate some generic per-session user data.
+ */
+void CtdlAllocUserData(unsigned long requested_sym, size_t num_bytes)
+{
+       struct CtdlSessData *ptr;
+
+       lprintf(9, "CtdlAllocUserData(%ld) called\n", requested_sym);
+
+       for (ptr = CC->FirstSessData; ptr != NULL; ptr = ptr->next)  {
+               if (ptr->sym_id == requested_sym) {
+                       lprintf(2, "ERROR: CtdlAllocUserData() requested for"
+                               " symbol id %ld already registered\n", 
+                               requested_sym);
+                       return;
+               }
+       }
+
+       ptr = mallok(sizeof(struct CtdlSessData));
+       ptr->sym_id = requested_sym;
+       ptr->sym_data = mallok(num_bytes);
+
+       begin_critical_section(S_SESSION_TABLE);
+       ptr->next = CC->FirstSessData;
+       CC->FirstSessData = ptr;
+       end_critical_section(S_SESSION_TABLE);
+
+       lprintf(9, "CtdlAllocUserData(%ld) finished\n", requested_sym);
+}
+
+
+
+
+
 /*
  * set_wtmpsupp()  -  alter the session listing
  */
@@ -731,7 +828,7 @@ void *context_loop(struct CitContext *con)
        strcpy(CC->cs_clientname, "(unknown)");
        strcpy(CC->curr_user,"(not logged in)");
        strcpy(CC->net_node,"");
-       snprintf(CC->temp, sizeof CC->temp, "/tmp/CitServer.%d.%d", getpid(), CC->cs_pid);
+       snprintf(CC->temp, sizeof CC->temp, tmpnam(NULL));
        strcpy(CC->cs_room, "(no room)");
        strncpy(CC->cs_host, config.c_fqdn, sizeof CC->cs_host);
        CC->cs_host[sizeof CC->cs_host - 1] = 0;
@@ -741,6 +838,7 @@ void *context_loop(struct CitContext *con)
        CC->cs_flags = 0;
        CC->upload_type = UPL_FILE;
        CC->dl_is_net = 0;
+       CC->FirstSessData = NULL;
 
        num_sessions = session_count();
        CC->nologin = 0;