Commit 7858081e authored by Eric Wong's avatar Eric Wong Committed by Max Kellermann

log.c: thread-safety for warning log

I'm really no fan of the warning log, it's too complex for how little it gets used; but fixing it is another problem.
parent 5c26e732
...@@ -29,6 +29,7 @@ static unsigned int logLevel = LOG_LEVEL_LOW; ...@@ -29,6 +29,7 @@ static unsigned int logLevel = LOG_LEVEL_LOW;
static int warningFlushed; static int warningFlushed;
static int stdout_mode = 1; static int stdout_mode = 1;
static char *warningBuffer; static char *warningBuffer;
static pthread_mutex_t warning_buffer_lock = PTHREAD_MUTEX_INITIALIZER;
static int out_fd = -1; static int out_fd = -1;
static int err_fd = -1; static int err_fd = -1;
static const char *out_filename; static const char *out_filename;
...@@ -80,7 +81,10 @@ static void do_log(FILE *fp, const char *fmt, va_list args) ...@@ -80,7 +81,10 @@ static void do_log(FILE *fp, const char *fmt, va_list args)
void flushWarningLog(void) void flushWarningLog(void)
{ {
char *s = warningBuffer; char *s;
pthread_mutex_lock(&warning_buffer_lock);
s = warningBuffer;
DEBUG("flushing warning messages\n"); DEBUG("flushing warning messages\n");
...@@ -97,8 +101,8 @@ void flushWarningLog(void) ...@@ -97,8 +101,8 @@ void flushWarningLog(void)
warningBuffer = NULL; warningBuffer = NULL;
} }
warningFlushed = 1; warningFlushed = 1;
pthread_mutex_unlock(&warning_buffer_lock);
DEBUG("done flushing warning messages\n"); DEBUG("done flushing warning messages\n");
} }
...@@ -188,10 +192,14 @@ void WARNING(const char *fmt, ...) ...@@ -188,10 +192,14 @@ void WARNING(const char *fmt, ...)
{ {
va_list args; va_list args;
va_start(args, fmt); va_start(args, fmt);
if (warningFlushed) {
pthread_mutex_lock(&warning_buffer_lock);
if (warningFlushed)
do_log(stderr, fmt, args); do_log(stderr, fmt, args);
} else else
buffer_warning(fmt, args); buffer_warning(fmt, args);
pthread_mutex_unlock(&warning_buffer_lock);
va_end(args); va_end(args);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment