* svn propset svn_keywords 'Id' on some files that didn't have it

[citadel.git] / citadel / threads.h

diff --git a/citadel/threads.h b/citadel/threads.h
index 5d21101386d89b22b5476ff931f71f70a5856734..fb337807774746ae86479248794e82428d4b9893 100644 (file)
--- a/citadel/threads.h
+++ b/citadel/threads.h
@@ -1,4 +1,4 @@
-/* $Id:$ */
+/* $Id$ */
 
 #ifndef THREADS_H
 #define THREADS_H
@@ -21,6 +21,49 @@
 #endif
 
 #include "server.h"
+#include "sysdep_decls.h"
+
+#ifndef timerclear
+#define timerclear(tvp)         ((tvp)->tv_sec = (tvp)->tv_usec = 0)
+#endif
+
+#ifndef timerisset
+#define timerisset(tvp)         ((tvp)->tv_sec || (tvp)->tv_usec)
+#endif
+
+#ifndef timercmp
+#define timercmp(tvp, uvp, cmp) \
+ (((tvp)->tv_sec == (uvp)->tv_sec) ? \
+     ((tvp)->tv_usec cmp (uvp)->tv_usec) : \
+     ((tvp)->tv_sec cmp (uvp)->tv_sec))
+#endif
+
+#ifndef timeradd
+#define timeradd(tvp, uvp, vvp) \
+ do { \
+  (vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec; \
+  (vvp)->tv_usec = (tvp)->tv_usec + (uvp)->tv_usec; \
+  if ((vvp)->tv_usec >= 1000000) { \
+   (vvp)->tv_sec++; \
+   (vvp)->tv_usec -= 1000000; \
+  } \
+ } while (0)
+#endif
+
+#ifndef timersub
+#define timersub(tvp, uvp, vvp) \
+ do { \
+  (vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec; \
+  (vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec; \
+  if ((vvp)->tv_usec < 0) { \
+   (vvp)->tv_sec--; \
+   (vvp)->tv_usec += 1000000; \
+  } \
+ } while (0)
+#endif
+ 
+
+// #define THREADS_USESIGNALS
 
 /*
  * Thread stuff
@@ -39,12 +82,13 @@ enum CtdlThreadState {
        CTDL_THREAD_RUNNING,
        CTDL_THREAD_LAST_STATE
 };
+typedef struct CtdlThreadNode CtdlThreadNode;
 
-extern struct CtdlThreadNode {
-       pthread_t tid;                          /* id as returned by pthread_create() */
+struct CtdlThreadNode{
+       citthread_t tid;                                /* id as returned by citthread_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 */
+       struct CitContext *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) */
@@ -54,30 +98,35 @@ extern struct CtdlThreadNode {
        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 */
+       time_t stop_ticker;                     /* A counter to determine how long it has taken for this thread to exit */
+       citthread_mutex_t ThreadMutex;          /* A mutex to sync this thread to others if this thread allows (also used for sleeping) */
+       citthread_cond_t ThreadCond;            /* A condition variable to sync this thread with others */
+       citthread_mutex_t SleepMutex;           /* A mutex for sleeping */
+       citthread_cond_t SleepCond;             /* A condition variable for sleeping */
+       citthread_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;
+       CtdlThreadNode *prev;           /* Previous thread in the thread table */
+       CtdlThreadNode *next;           /* Next thread in the thread table */
+} ;
+ 
+extern CtdlThreadNode *CtdlThreadList;
+
+typedef struct ThreadTSD ThreadTSD;
 
-typedef struct {
+struct ThreadTSD {
        DB_TXN *tid;            /* Transaction handle */
        DBC *cursors[MAXCDB];   /* Cursors, for traversals... */
-       struct CtdlThreadNode *self;    /* Pointer to this threads control structure */
-}ThreadTSD ;
+       CtdlThreadNode *self;   /* Pointer to this threads control structure */
+} ;
 
 extern double CtdlThreadLoadAvg;
 extern double CtdlThreadWorkerAvg;
-extern pthread_key_t ThreadKey;
+extern citthread_key_t ThreadKey;
 
 void ctdl_thread_internal_init_tsd(void);
 void ctdl_internal_thread_gc (void);
@@ -85,7 +134,7 @@ 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);
+CtdlThreadNode *ctdl_internal_create_thread(char *name, long flags, void *(*thread_func) (void *arg), void *args);
 void ctdl_thread_internal_check_scheduled(void);
 
 void InitialiseSemaphores(void);