removed debug output from mysqlConn.c

[NeonServV5.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index 329aa5d13c60a3c3072e2365985b6b173fa39503..12c689958eb768c0c88c89fd185872a57d4950cf 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)
@@ -90,6 +101,14 @@
 #define COMPILER "Unknown"
 #endif
 
+#ifdef ENABLE_MEMORY_DEBUG
+#include "memoryDebug.h"
+#endif
+
+#define PID_FILE "neonserv.pid"
+#define CONF_FILE "neonserv.conf"
+#define LOG_FILE "neonserv.log"
+
 #define SOCKET_SELECT_TIME    1
 #define SOCKET_RECONNECT_TIME 20
 
@@ -101,6 +120,7 @@
 #define TOPICLEN        500
 #define CHANNELLEN      200
 #define MAXLEN          512
+#define MAXLOGLEN       1024
 #define TRIGGERLEN      50
 #define MAXNUMPARAMS    200 /* maximum number of parameters in one line */
 #define MAXLANGUAGES    5
@@ -121,21 +141,38 @@
 
 #define TEMPUSER_LIST_INDEX VALID_NICK_CHARS_FIRST_LEN
 
+#define LOGLEVEL_INFO  0x01
+#define LOGLEVEL_ERROR 0x02
+#define LOGLEVEL_RAW   0x04
+#define LOGLEVEL_MYSQL 0x08
+
 #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;
+
+int getCurrentThreadID();
 #endif
 
+void exit_daemon();
+
 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();
 
 void statistics_update();
 
+void putlog(int loglevel, const char *text, ...) PRINTF_LIKE(2, 3);
+
+#define perror(errmsg) (putlog(LOGLEVEL_ERROR, "ERROR (%s:%d) %s", __FILE__, __LINE__, errmsg))
+
 #endif
\ No newline at end of file