projects
/
NeonServV5.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f6e5f83
)
fixed log mutex location
author
pk910
<philipp@zoelle1.de>
Thu, 27 Sep 2012 23:22:12 +0000
(
01:22
+0200)
committer
pk910
<philipp@zoelle1.de>
Thu, 27 Sep 2012 23:22:12 +0000
(
01:22
+0200)
src/log.c
patch
|
blob
|
history
src/main.c
patch
|
blob
|
history
diff --git
a/src/log.c
b/src/log.c
index 9907f2b392fdc01260161c47d88a1b057e4f07f4..44d63df1d6dbad73890dee3cf3e74ba7ab8ff177 100644
(file)
--- a/
src/log.c
+++ b/
src/log.c
@@
-31,6
+31,9
@@
static void load_log_targets();
static void unload_log_targets();
static int reload_log_targets(int init);
static void unload_log_targets();
static int reload_log_targets(int init);
+#ifdef HAVE_THREADS
+static pthread_mutex_t log_sync;
+#endif
#define LOG_TARGET_TYPE_FILE 1
#define LOG_TARGET_TYPE_STDOUT 2
#define LOG_TARGET_TYPE_FILE 1
#define LOG_TARGET_TYPE_STDOUT 2
@@
-284,6
+287,9
@@
static IOHANDLER_LOG_BACKEND(log_iohandler_backend) {
}
void init_log() {
}
void init_log() {
+ #if HAVE_THREADS
+ THREAD_MUTEX_INIT(log_sync);
+ #endif
load_log_targets();
bind_reload(reload_log_targets, 0);
iolog_backend = log_iohandler_backend;
load_log_targets();
bind_reload(reload_log_targets, 0);
iolog_backend = log_iohandler_backend;
diff --git
a/src/main.c
b/src/main.c
index d2c482af117619ca01653c4aa38b113f3f628933..c88c02cbfcefc866a8b82526d2e3a65809cc1414 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-52,7
+52,6
@@
struct ProcessState process_state;
#ifdef HAVE_THREADS
pthread_mutex_t cache_sync;
pthread_mutex_t whohandler_sync, whohandler_mass_sync;
#ifdef HAVE_THREADS
pthread_mutex_t cache_sync;
pthread_mutex_t whohandler_sync, whohandler_mass_sync;
-static pthread_mutex_t log_sync;
static pthread_t *current_threads = NULL;
#endif
static pthread_t *current_threads = NULL;
#endif
@@
-336,7
+335,6
@@
int main(int argc, char *argv[]) {
free(modulelist);
#if HAVE_THREADS
free(modulelist);
#if HAVE_THREADS
- THREAD_MUTEX_INIT(log_sync);
THREAD_MUTEX_INIT(cache_sync);
THREAD_MUTEX_INIT(whohandler_sync);
THREAD_MUTEX_INIT(whohandler_mass_sync);
THREAD_MUTEX_INIT(cache_sync);
THREAD_MUTEX_INIT(whohandler_sync);
THREAD_MUTEX_INIT(whohandler_mass_sync);