MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pthread_frame: revert 2e664b9c1e.

Browse Source 
The patch does not fix the tsan warning it was intended to fix.
Reverting the patch moves the av_log() back to the outside of the lock.

Signed-off-by: Wan-Teh Chang <wtc@google.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
This commit is contained in:
Wan-Teh Chang 2017-07-18 09:11:09 -07:00 committed by Ronald S. Bultje
parent 8c3b329da2
commit 58fbcf885d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/pthread_frame.c
View File

@ -570,11 +570,12 @@ void ff_thread_report_progress(ThreadFrame *f, int n, int field)
p = f->owner[field]->internal->thread_ctx;
pthread_mutex_lock(&p->progress_mutex);
if (atomic_load_explicit(&p->debug_threads, memory_order_relaxed))
av_log(f->owner[field], AV_LOG_DEBUG,
"%p finished %d field %d\n", progress, n, field);
pthread_mutex_lock(&p->progress_mutex);
atomic_store_explicit(&progress[field], n, memory_order_release);
pthread_cond_broadcast(&p->progress_cond);
@ -592,10 +593,11 @@ void ff_thread_await_progress(ThreadFrame *f, int n, int field)
p = f->owner[field]->internal->thread_ctx;
pthread_mutex_lock(&p->progress_mutex);
if (atomic_load_explicit(&p->debug_threads, memory_order_relaxed))
av_log(f->owner[field], AV_LOG_DEBUG,
"thread awaiting %d field %d from %p\n", n, field, progress);
pthread_mutex_lock(&p->progress_mutex);
while (atomic_load_explicit(&progress[field], memory_order_relaxed) < n)
pthread_cond_wait(&p->progress_cond, &p->progress_mutex);
pthread_mutex_unlock(&p->progress_mutex);