Changed the way we do the TSD area.

[citadel.git] / citadel / sysdep_decls.h

diff --git a/citadel/sysdep_decls.h b/citadel/sysdep_decls.h
index f6b5b8d92c61eb2b540ccec0cdc77936746a6171..f2480f47de3bb1ca0aae85fae46ced38b75d1310 100644 (file)
--- a/citadel/sysdep_decls.h
+++ b/citadel/sysdep_decls.h
@@ -14,7 +14,22 @@
 #include <pthread.h>
 #include <stdarg.h>
 #include "sysdep.h"
+
+#ifdef HAVE_DB_H
+#include <db.h>
+#elif defined(HAVE_DB4_DB_H)
+#include <db4/db.h>
+#else
+#error Neither <db.h> nor <db4/db.h> was found by configure. Install db4-devel.
+#endif
+
+
+#if DB_VERSION_MAJOR < 4 || DB_VERSION_MINOR < 1
+#error Citadel requires Berkeley DB v4.1 or newer.  Please upgrade.
+#endif
+
 #include "server.h"
+#include "database.h"
 
 #if SIZEOF_SIZE_T == SIZEOF_INT 
 #define SIZE_T_FMT "%d"
@@ -96,11 +111,6 @@ extern volatile int restart_server;
 extern int verbosity;
 extern int rescan[];
 
-extern struct worker_node {
-        pthread_t tid;
-        struct worker_node *next;
-} *worker_list;
-
 
 
 /*
@@ -108,14 +118,6 @@ extern struct worker_node {
  */
 #define CTDLTHREAD_BIGSTACK    0x0001
 #define CTDLTHREAD_WORKER      0x0002
-extern double CtdlThreadLoadAvg;
-extern double CtdlThreadWorkerAvg;
-
-void ctdl_internal_thread_gc (void);
-void ctdl_thread_internal_init(void);
-void ctdl_thread_internal_cleanup(void);
-void ctdl_thread_internal_calc_loadavg(void);
-struct CtdlThreadNode *ctdl_internal_create_thread(char *name, long flags, void *(*thread_func) (void *arg), void *args);
 
 enum CtdlThreadState {
        CTDL_THREAD_INVALID,
@@ -138,13 +140,15 @@ extern struct CtdlThreadNode {
        long number;                            /* A unigue number for this thread (not implimented yet) */
        int wakefd_recv;                        /* An fd that this thread can sleep on (not implimented yet) */
        int wakefd_send;                        /* An fd that this thread can send out on (Not implimented yet) */
-       char *name;                             /* A name for this thread */
+       const char *name;                       /* A name for this thread */
        void *(*thread_func) (void *arg);       /* The actual function that does this threads work */
        void *user_args;                        /* Arguments passed to this threads work function */
        long flags;                             /* Flags that describe this thread */
-       enum CtdlThreadState state;                             /* Flag to show state of this thread */
+       enum CtdlThreadState state;             /* Flag to show state of this thread */
        pthread_mutex_t ThreadMutex;            /* A mutex to sync this thread to others if this thread allows (also used for sleeping) */
-       pthread_cond_t ThreadCond;              /* A condition variable to sync this thread with others (also used for sleeping) */
+       pthread_cond_t ThreadCond;              /* A condition variable to sync this thread with others */
+       pthread_mutex_t SleepMutex;             /* A mutex for sleeping */
+       pthread_cond_t SleepCond;               /* A condition variable for sleeping */
        pthread_attr_t attr;                    /* Attributes of this thread */
        struct timeval start_time;              /* Time this thread was started */
        struct timeval last_state_change;       /* Time when this thread last changed state */
@@ -156,6 +160,26 @@ extern struct CtdlThreadNode {
        struct CtdlThreadNode *next;            /* Next thread in the thread table */
 } *CtdlThreadList;
 
+typedef struct {
+       DB_TXN *tid;            /* Transaction handle */
+       DBC *cursors[MAXCDB];   /* Cursors, for traversals... */
+       struct CtdlThreadNode *self;    /* Pointer to this threads control structure */
+}ThreadTSD ;
+
+extern double CtdlThreadLoadAvg;
+extern double CtdlThreadWorkerAvg;
+extern pthread_key_t ThreadKey;
+
+void ctdl_thread_internal_init_tsd(void);
+void ctdl_internal_thread_gc (void);
+void ctdl_thread_internal_init(void);
+void ctdl_thread_internal_cleanup(void);
+void ctdl_thread_internal_calc_loadavg(void);
+void ctdl_thread_internal_free_tsd(void);
+struct CtdlThreadNode *ctdl_internal_create_thread(char *name, long flags, void *(*thread_func) (void *arg), void *args);
+
+
+
 extern int SyslogFacility(char *name);
 extern int syslog_facility;