diff options
| author | Wan-Teh Chang <wtc-at-google.com@ffmpeg.org> | 2017-07-18 09:11:09 -0700 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2017-07-27 17:14:17 -0400 |
| commit | 58fbcf885d97d9b83c54cc57e3631c76caa208cf (patch) | |
| tree | 813bcf2cc173835001d91050f51cb9d241d51888 /libavcodec | |
| parent | 8c3b329da21a05a977b21d1a3ad3ed8ce72f997b (diff) | |
| download | ffmpeg-58fbcf885d97d9b83c54cc57e3631c76caa208cf.tar.gz | |
pthread_frame: revert 2e664b9c1e73c80aab91070c1eb7676f04bdd12d.
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>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/pthread_frame.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index 2cea232a36..08e182c3d1 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -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); |