improved WHOHandler multi thread stability

[NeonServV5.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index 5002bcd6d0b3391e061be8a7b1ca649f7d9ca64e..6a2a99f575a38f666adb593a2a1b4d9f38b45684 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -52,7 +52,14 @@
     pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE_NP);\
     pthread_mutex_init(&var, &mutex_attr); \
 }
+#define THREAD_MUTEX_INIT_TYPE(var, type) { \
+    pthread_mutexattr_t mutex_attr; \
+    pthread_mutexattr_init(&mutex_attr);\
+    pthread_mutexattr_settype(&mutex_attr, type);\
+    pthread_mutex_init(&var, &mutex_attr); \
+}
 #define SYNCHRONIZE(var) pthread_mutex_lock(&var)
+#define SET_SYNCHRONIZE(var) pthread_mutex_trylock(&var)
 #define DESYNCHRONIZE(var) pthread_mutex_unlock(&var)
 #else
 #define THREAD_MUTEX_INIT(var)
@@ -109,6 +116,7 @@
 #define BOTWAR_DETECTION_TIME 7
 #define BOTWAR_DETECTION_EVENTS 6
 #define REWHO_TIMEOUT   10 /* wait 10 seconds before WHO an unauthed user again */
+#define TICKS_PER_SECOND 10
 
 //valid nick chars
 #define VALID_NICK_CHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890{|}~[\\]^-_`"
@@ -120,10 +128,14 @@
 
 #define TEMPUSER_LIST_INDEX VALID_NICK_CHARS_FIRST_LEN
 
+#define timeval_is_bigger(x,y) ((x.tv_sec > y.tv_sec) || (x.tv_sec == y.tv_sec && x.tv_usec > y.tv_usec))
+
 extern time_t start_time;
 extern int statistics_enabled;
 #ifdef HAVE_THREADS
 extern int running_threads;
+extern pthread_mutex_t cache_sync;
+extern pthread_mutex_t whohandler_sync, whohandler_mass_sync;
 #endif
 
 int stricmp (const char *s1, const char *s2);