diff mbox

[FFmpeg-devel,5/9] pthread_frame: use better memory orders for frame progress

Message ID 20170318085606.26011-6-nfxjfg@googlemail.com
State Accepted
Commit 343e2833994655c252d5236a3394bf6db7a4d8b1
Headers show

Commit Message

wm4 March 18, 2017, 8:56 a.m. UTC 
From: Wan-Teh Chang <wtc@google.com>

This improves commit 59c70227405c214b29971e6272f3a3ff6fcce3d0.

In ff_thread_report_progress(), the fast code path can load
progress[field] with the relaxed memory order, and the slow code path
can store progress[field] with the release memory order. These changes
are mainly intended to avoid confusion when one inspects the source code.
They are unlikely to have measurable performance improvement.

ff_thread_report_progress() and ff_thread_await_progress() form a pair.
ff_thread_await_progress() reads progress[field] with the acquire memory
order (in the fast code path). Therefore, one expects to see
ff_thread_report_progress() write progress[field] with the matching
release memory order.

In the fast code path in ff_thread_report_progress(), the atomic load of
progress[field] doesn't need the acquire memory order because the
calling thread is trying to make the data it just decoded visible to the
other threads, rather than trying to read the data decoded by other
threads.

In ff_thread_get_buffer(), initialize progress[0] and progress[1] using
atomic_init().

Signed-off-by: Wan-Teh Chang <wtc@google.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

Merges Libav commit 343e2833.

Signed-off-by: wm4 <nfxjfg@googlemail.com>
---
 libavcodec/pthread_frame.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
diff mbox

Patch

diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c
index b16c1b9928..2919e9546b 100644
--- a/libavcodec/pthread_frame.c
+++ b/libavcodec/pthread_frame.c
@@ -500,7 +500,7 @@  void ff_thread_report_progress(ThreadFrame *f, int n, int field)
     atomic_int *progress = f->progress ? (atomic_int*)f->progress->data : NULL;
 
     if (!progress ||
-        atomic_load_explicit(&progress[field], memory_order_acquire) >= n)
+        atomic_load_explicit(&progress[field], memory_order_relaxed) >= n)
         return;
 
     p = f->owner->internal->thread_ctx;
@@ -510,7 +510,7 @@  void ff_thread_report_progress(ThreadFrame *f, int n, int field)
 
     pthread_mutex_lock(&p->progress_mutex);
 
-    atomic_store(&progress[field], n);
+    atomic_store_explicit(&progress[field], n, memory_order_release);
 
     pthread_cond_broadcast(&p->progress_cond);
     pthread_mutex_unlock(&p->progress_mutex);
@@ -816,8 +816,8 @@  static int thread_get_buffer_internal(AVCodecContext *avctx, ThreadFrame *f, int
         }
         progress = (atomic_int*)f->progress->data;
 
-        atomic_store(&progress[0], -1);
-        atomic_store(&progress[1], -1);
+        atomic_init(&progress[0], -1);
+        atomic_init(&progress[1], -1);
     }
 
     pthread_mutex_lock(&p->parent->buffer_mutex);