diff options
| author | Roger Dingledine <arma@torproject.org> | 2009-08-27 21:42:58 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2009-08-27 21:42:58 -0400 |
| commit | 659552a3c6a107ec3023178a29852c262ef8e827 (patch) | |
| tree | 1437c620bfa4dad8c0a6e40b882d1d1addaee644 /src/common/log.c | |
| parent | 1092fdca53ec0110b4e4c0bf51a5881ee68c4ac8 (diff) | |
| parent | 127069f3d2b739dfc50b04ad982c2a7a2764f1a7 (diff) | |
| download | tor-659552a3c6a107ec3023178a29852c262ef8e827.tar.gz tor-659552a3c6a107ec3023178a29852c262ef8e827.zip | |
Merge branch 'maint-0.2.1'
Diffstat (limited to 'src/common/log.c')
| -rw-r--r-- | src/common/log.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/common/log.c b/src/common/log.c index b12462a42f..c25e98d5f8 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -92,7 +92,8 @@ should_log_function_name(log_domain_mask_t domain, int severity) } /** A mutex to guard changes to logfiles and logging. */ -static tor_mutex_t *log_mutex = NULL; +static tor_mutex_t log_mutex; +static int log_mutex_initialized = 0; /** Linked list of logfile_t. */ static logfile_t *logfiles = NULL; @@ -103,9 +104,9 @@ static int syslog_count = 0; #endif #define LOCK_LOGS() STMT_BEGIN \ - tor_mutex_acquire(log_mutex); \ + tor_mutex_acquire(&log_mutex); \ STMT_END -#define UNLOCK_LOGS() STMT_BEGIN tor_mutex_release(log_mutex); STMT_END +#define UNLOCK_LOGS() STMT_BEGIN tor_mutex_release(&log_mutex); STMT_END /** What's the lowest log level anybody cares about? Checking this lets us * bail out early from log_debug if we aren't debugging. */ @@ -446,8 +447,9 @@ logs_free_all(void) log_free(victim); } tor_free(appname); - tor_mutex_free(log_mutex); - log_mutex = NULL; + + /* We _could_ destroy the log mutex here, but that would screw up any logs + * that happened between here and the end of execution. */ } /** Remove and free the log entry <b>victim</b> from the linked-list @@ -543,8 +545,10 @@ add_stream_log(const log_severity_list_t *severity, void init_logging(void) { - if (!log_mutex) - log_mutex = tor_mutex_new(); + if (!log_mutex_initialized) { + tor_mutex_init(&log_mutex); + log_mutex_initialized = 1; + } } /** Add a log handler to receive messages during startup (before the real |