summaryrefslogtreecommitdiff
path: root/vp9/decoder
diff options
context:
space:
mode:
authorhkuang <hkuang@google.com>2015-02-03 16:40:13 -0800
committerhkuang <hkuang@google.com>2015-02-04 12:39:35 -0800
commit41e376e494c39ac4f6e442e715d773e887da968e (patch)
tree7eb4aed9d786c54a972e5b8022fec82bb8e38359 /vp9/decoder
parent1221641914b9c774cb4dc87c4c8578fb444611ef (diff)
downloadlibvpx-41e376e494c39ac4f6e442e715d773e887da968e.tar
libvpx-41e376e494c39ac4f6e442e715d773e887da968e.tar.gz
libvpx-41e376e494c39ac4f6e442e715d773e887da968e.tar.bz2
libvpx-41e376e494c39ac4f6e442e715d773e887da968e.zip
Mute the harmless tsan error in frame parallel decode.
Change-Id: I52565fd90461221f89134997a0782cb1b681df01
Diffstat (limited to 'vp9/decoder')
-rw-r--r--vp9/decoder/vp9_dthread.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/vp9/decoder/vp9_dthread.c b/vp9/decoder/vp9_dthread.c
index 7aa888848..d2a2b819c 100644
--- a/vp9/decoder/vp9_dthread.c
+++ b/vp9/decoder/vp9_dthread.c
@@ -45,6 +45,13 @@ void vp9_frameworker_signal_stats(VP9Worker *const worker) {
#endif
}
+// This macro prevents thread_sanitizer from reporting known concurrent writes.
+#if defined(__has_feature)
+#if __has_feature(thread_sanitizer)
+#define BUILDING_WITH_TSAN
+#endif
+#endif
+
// TODO(hkuang): Remove worker parameter as it is only used in debug code.
void vp9_frameworker_wait(VP9Worker *const worker, RefCntBuffer *const ref_buf,
int row) {
@@ -52,9 +59,11 @@ void vp9_frameworker_wait(VP9Worker *const worker, RefCntBuffer *const ref_buf,
if (!ref_buf)
return;
- // Enabling the following line of code will get harmless tsan error but
- // will get best performance.
- // if (ref_buf->row >= row && ref_buf->buf.corrupted != 1) return;
+#ifndef BUILDING_WITH_TSAN
+ // The following line of code will get harmless tsan error but it is the key
+ // to get best performance.
+ if (ref_buf->row >= row && ref_buf->buf.corrupted != 1) return;
+#endif
{
// Find the worker thread that owns the reference frame. If the reference