Merge branch 'core-rewrite' of git://git.musicpd.org/normalperson/mpd

* 'core-rewrite' of git://git.musicpd.org/normalperson/mpd:
  Remove ob_wait_sync and cleanup triggering in playlist
  fix output buffer deadlock when daemonizing
  log.c: thread-safety for warning log
  core rewrite (decode,player,outputBuffer,playlist)

1 files changed, 13 insertions, 4 deletions

diff --git a/src/log.c b/src/log.c
index 8a2d48410..2f4c1af0f 100644
--- a/src/log.c
+++ b/src/log.c
@@ -29,6 +29,7 @@ static unsigned int logLevel = LOG_LEVEL_LOW;
 static int warningFlushed;
 static int stdout_mode = 1;
 static char *warningBuffer;
+static pthread_mutex_t warning_buffer_lock = PTHREAD_MUTEX_INITIALIZER;
 static int out_fd = -1;
 static int err_fd = -1;
 static const char *out_filename;
@@ -75,12 +76,16 @@ static void do_log(FILE *fp, const char *fmt, va_list args)
 {
 	if (!stdout_mode)
 		fwrite(log_date(), LOG_DATE_LEN, 1, fp);
+	fprintf(fp, "%08x: ", pthread_self());
 	vfprintf(fp, fmt, args);
 }
 
 void flushWarningLog(void)
 {
-	char *s = warningBuffer;
+	char *s;
+
+	pthread_mutex_lock(&warning_buffer_lock);
+	s = warningBuffer;
 
 	DEBUG("flushing warning messages\n");
 
@@ -97,8 +102,8 @@ void flushWarningLog(void)
 
 		warningBuffer = NULL;
 	}
-
 	warningFlushed = 1;
+	pthread_mutex_unlock(&warning_buffer_lock);
 
 	DEBUG("done flushing warning messages\n");
 }
@@ -188,10 +193,14 @@ void WARNING(const char *fmt, ...)
 {
 	va_list args;
 	va_start(args, fmt);
-	if (warningFlushed) {
+
+	pthread_mutex_lock(&warning_buffer_lock);
+	if (warningFlushed)
 		do_log(stderr, fmt, args);
-	} else
+	else
 		buffer_warning(fmt, args);
+	pthread_mutex_unlock(&warning_buffer_lock);
+
 	va_end(args);
 }