* 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 c9e683cf524e2adcf98c67222449347262ea0ee5..fb337807774746ae86479248794e82428d4b9893 100644 (file)
--- a/citadel/threads.h
+++ b/citadel/threads.h
@@ -1,4 +1,4 @@
-/* $Id:$ */
+/* $Id$ */
 
 #ifndef THREADS_H
 #define THREADS_H
@@ -23,6 +23,48 @@
 #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
  */
@@ -56,7 +98,7 @@ 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 */
-       int stop_ticker;                        /* A counter to determine how long it has taken for this thread to exit */
+       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 */