From: hkuang <hkuang@google.com>
Date: Wed, 4 Feb 2015 00:40:13 +0000 (-0800)
Subject: Mute the harmless tsan error in frame parallel decode.
X-Git-Tag: v1.4.0~176^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=41e376e494c39ac4f6e442e715d773e887da968e;p=platform%2Fupstream%2Flibvpx.git

Mute the harmless tsan error in frame parallel decode.

Change-Id: I52565fd90461221f89134997a0782cb1b681df01
---

diff --git a/vp9/decoder/vp9_dthread.c b/vp9/decoder/vp9_dthread.c
index 7aa8888..d2a2b81 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