xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-24 03:59:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

avutil/log: make default av_log callback thread safe

Browse Source 
This uses a pthread mutex

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-10-16 23:23:18 +02:00
parent 094c40ca37
commit 423ae31354
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavutil/log.c
View File

@ -40,6 +40,11 @@
#include "internal.h" #include "internal.h"
#include "log.h" #include "log.h"
#if HAVE_PTHREADS
#include <pthread.h>
static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
#endif
#define LINE_SZ 1024 #define LINE_SZ 1024
static int av_log_level = AV_LOG_INFO; static int av_log_level = AV_LOG_INFO;
@ -221,6 +226,10 @@ void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl)
if (level > av_log_level) if (level > av_log_level)
return; return;
#if HAVE_PTHREADS
pthread_mutex_lock(&mutex);
#endif
format_line(ptr, level, fmt, vl, part, &print_prefix, type); format_line(ptr, level, fmt, vl, part, &print_prefix, type);
snprintf(line, sizeof(line), "%s%s%s", part[0].str, part[1].str, part[2].str); snprintf(line, sizeof(line), "%s%s%s", part[0].str, part[1].str, part[2].str);
@ -234,8 +243,7 @@ void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl)
count++; count++;
if (is_atty == 1) if (is_atty == 1)
fprintf(stderr, " Last message repeated %d times\r", count); fprintf(stderr, " Last message repeated %d times\r", count);
av_bprint_finalize(part+2, NULL); goto end;
return;
} }
if (count > 0) { if (count > 0) {
fprintf(stderr, " Last message repeated %d times\n", count); fprintf(stderr, " Last message repeated %d times\n", count);
@ -248,7 +256,11 @@ void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl)
colored_fputs(type[1], part[1].str); colored_fputs(type[1], part[1].str);
sanitize(part[2].str); sanitize(part[2].str);
colored_fputs(av_clip(level >> 3, 0, 6), part[2].str); colored_fputs(av_clip(level >> 3, 0, 6), part[2].str);
end:
av_bprint_finalize(part+2, NULL); av_bprint_finalize(part+2, NULL);
#if HAVE_PTHREADS
pthread_mutex_unlock(&mutex);
#endif
} }
static void (*av_log_callback)(void*, int, const char*, va_list) = static void (*av_log_callback)(void*, int, const char*, va_list) =