X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fthreads.h;h=11bad4f09e305606555a5f4930d5ebfe4b7d85ce;hb=0adb29d5fa73df9c3760478405aaf71fa37054c4;hp=5d21101386d89b22b5476ff931f71f70a5856734;hpb=965e0b21ce4bf3ec1861275098bdc4d1adecbfd1;p=citadel.git

diff --git a/citadel/threads.h b/citadel/threads.h
index 5d2110138..11bad4f09 100644
--- a/citadel/threads.h
+++ b/citadel/threads.h
@@ -1,4 +1,3 @@
-/* $Id:$ */
 
 #ifndef THREADS_H
 #define THREADS_H
@@ -21,77 +20,32 @@
 #endif
 
 #include "server.h"
+#include "sysdep_decls.h"
 
 /*
- * Thread stuff
+ * Things we need to keep track of per-thread instead of per-session
  */
-
-enum CtdlThreadState {
-	CTDL_THREAD_INVALID,
-	CTDL_THREAD_VALID,
-	CTDL_THREAD_CREATE,
-	CTDL_THREAD_CANCELLED,
-	CTDL_THREAD_EXITED,
-	CTDL_THREAD_STOPPING,
-	CTDL_THREAD_STOP_REQ,	/* Do NOT put any running states before this state */
-	CTDL_THREAD_SLEEPING,
-	CTDL_THREAD_BLOCKED,
-	CTDL_THREAD_RUNNING,
-	CTDL_THREAD_LAST_STATE
+struct thread_tsd {
+	DB_TXN *tid;            /* Transaction handle */
+	DBC *cursors[MAXCDB];   /* Cursors, for traversals... */
 };
 
-extern struct CtdlThreadNode {
-	pthread_t tid;				/* id as returned by pthread_create() */
-	pid_t pid;				/* pid, as best the OS will let us determine */
-	time_t when;				/* When to start a scheduled thread */
-	struct CitConext *Context;		/* The session context that this thread mught be working on or NULL if none */
-	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) */
-	int signal;				/* A field to store a signal we caught. */
-	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 */
-	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 */
-	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 */
-	double avg_sleeping;			/* Average sleeping time */
-	double avg_running;			/* Average running time */
-	double avg_blocked;			/* Average blocked time */
-	double load_avg;			/* Load average for this thread */
-	struct CtdlThreadNode *prev;		/* Previous thread in the thread table */
-	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;
+extern struct thread_tsd masterTSD;
+#define TSD MyThread()
 
-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);
-void ctdl_thread_internal_check_scheduled(void);
+extern int num_workers;
+extern int active_workers;
+extern int server_shutting_down;
 
-void InitialiseSemaphores(void);
+struct thread_tsd *MyThread(void);
 int try_critical_section (int which_one);
 void begin_critical_section (int which_one);
 void end_critical_section (int which_one);
 void go_threading(void);
+void InitializeMasterTSD(void);
+void CtdlThreadCreate(void *(*start_routine)(void*));
+
+
+extern pthread_mutex_t ThreadCountMutex;;
 
 #endif // THREADS_H