added signal handler

[NeonServV5.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index 329aa5d13c60a3c3072e2365985b6b173fa39503..329f391ad4f8c0120c0aed51f8a70f9c0c8de80b 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -21,7 +21,6 @@
 #define NEONSERV_VERSION "5.3"
 #define VERSION_PATCHLEVEL 543
 
-#include <features.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -31,6 +30,7 @@
 #include <winsock2.h>
 #include <malloc.h>
 #else
+#include <features.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -45,14 +45,25 @@
 #include <time.h>
 #ifdef HAVE_THREADS
 #include <pthread.h>
-#include <sys/syscall.h>
+#ifdef WIN32
+#define pthread_self_tid() pthread_self().p
+#else
+#define pthread_self_tid() pthread_self()
+#endif
 #define THREAD_MUTEX_INIT(var) { \
     pthread_mutexattr_t mutex_attr; \
     pthread_mutexattr_init(&mutex_attr);\
     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)
@@ -127,11 +138,17 @@ 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;
+
+int getCurrentThreadID();
 #endif
 
 int stricmp (const char *s1, const char *s2);
 int stricmplen (const char *s1, const char *s2, int len);
 
+void restart_process();
+void cleanup();
 void restart_bot(int do_hard_restart);
 void stop_bot();
 void reload_config();