<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, May 21, 2013 at 12:12 PM, Dmitry Vyukov <span dir="ltr"><<a href="mailto:dvyukov@google.com" target="_blank">dvyukov@google.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: dvyukov<br>
Date: Tue May 21 03:12:35 2013<br>
New Revision: 182354<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=182354&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=182354&view=rev</a><br>
Log:<br>
tsan: detect when a thread ends with ignores enabled<br>
<br>
Added:<br>
    compiler-rt/trunk/lib/tsan/lit_tests/thread_end_with_ignore.cc<br>
    compiler-rt/trunk/lib/tsan/lit_tests/thread_end_with_ignore2.cc<br>
Modified:<br>
    compiler-rt/trunk/lib/tsan/rtl/tsan_rtl.cc<br>
    compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_thread.cc<br>
<br>
Added: compiler-rt/trunk/lib/tsan/lit_tests/thread_end_with_ignore.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/thread_end_with_ignore.cc?rev=182354&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/thread_end_with_ignore.cc?rev=182354&view=auto</a><br>

==============================================================================<br>
--- compiler-rt/trunk/lib/tsan/lit_tests/thread_end_with_ignore.cc (added)<br>
+++ compiler-rt/trunk/lib/tsan/lit_tests/thread_end_with_ignore.cc Tue May 21 03:12:35 2013<br>
@@ -0,0 +1,19 @@<br>
+// RUN: %clangxx_tsan -O1 %s -o %t && %t 2>&1 | FileCheck %s<br>
+#include <pthread.h><br>
+#include <stdio.h><br>
+<br>
+extern "C" void AnnotateIgnoreReadsBegin(const char *f, int l);<br>
+<br>
+void *Thread(void *x) {<br>
+  AnnotateIgnoreReadsBegin("", 0);<br>
+  return 0;<br>
+}<br>
+<br>
+int main() {<br>
+  pthread_t t;<br>
+  pthread_create(&t, 0, Thread, 0);<br>
+  pthread_join(t, 0);<br>
+}<br>
+<br>
+// CHECK: ThreadSanitizer: thread T1 finished with ignores enabled<br>
+<br>
<br>
Added: compiler-rt/trunk/lib/tsan/lit_tests/thread_end_with_ignore2.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/thread_end_with_ignore2.cc?rev=182354&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/thread_end_with_ignore2.cc?rev=182354&view=auto</a><br>

==============================================================================<br>
--- compiler-rt/trunk/lib/tsan/lit_tests/thread_end_with_ignore2.cc (added)<br>
+++ compiler-rt/trunk/lib/tsan/lit_tests/thread_end_with_ignore2.cc Tue May 21 03:12:35 2013<br>
@@ -0,0 +1,9 @@<br>
+// RUN: %clangxx_tsan -O1 %s -o %t && %t 2>&1 | FileCheck %s<br>
+extern "C" void AnnotateIgnoreWritesBegin(const char *f, int l);<br>
+<br>
+int main() {<br>
+  AnnotateIgnoreWritesBegin("", 0);<br>
+}<br>
+<br>
+// CHECK: ThreadSanitizer: thread T0 finished with ignores enabled<br>
+<br>
<br>
Modified: compiler-rt/trunk/lib/tsan/rtl/tsan_rtl.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_rtl.cc?rev=182354&r1=182353&r2=182354&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_rtl.cc?rev=182354&r1=182353&r2=182354&view=diff</a><br>

==============================================================================<br>
--- compiler-rt/trunk/lib/tsan/rtl/tsan_rtl.cc (original)<br>
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_rtl.cc Tue May 21 03:12:35 2013<br>
@@ -84,8 +84,7 @@ ThreadState::ThreadState(Context *ctx, i<br>
   : fast_state(tid, epoch)<br>
   // Do not touch these, rely on zero initialization,<br>
   // they may be accessed before the ctor.<br>
-  // , fast_ignore_reads()<br>
-  // , fast_ignore_writes()<br>
+  // , ignore_reads_and_writes()<br>
   // , in_rtl()<br>
   , shadow_stack_pos(&shadow_stack[0])<br>
 #ifndef TSAN_GO<br>
<br>
Modified: compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_thread.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_thread.cc?rev=182354&r1=182353&r2=182354&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_thread.cc?rev=182354&r1=182353&r2=182354&view=diff</a><br>

==============================================================================<br>
--- compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_thread.cc (original)<br>
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_thread.cc Tue May 21 03:12:35 2013<br>
@@ -165,8 +165,16 @@ static void MaybeReportThreadLeak(Thread<br>
 }<br>
 #endif<br>
<br>
+static void ThreadCheckIgnore(ThreadState *thr) {<br>
+  if (thr->ignore_reads_and_writes) {<br>
+    Printf("ThreadSanitizer: thread T%d finished with ignores enabled.\n",<br>
+           thr->tid);<br></blockquote><div><br></div><div style>Maybe it should be a fatal error? Or somehow else more visible? </div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">

+  }<br>
+}<br>
+<br>
 void ThreadFinalize(ThreadState *thr) {<br>
   CHECK_GT(thr->in_rtl, 0);<br>
+  ThreadCheckIgnore(thr);<br>
 #ifndef TSAN_GO<br>
   if (!flags()->report_thread_leaks)<br>
     return;<br>
@@ -235,6 +243,7 @@ void ThreadStart(ThreadState *thr, int t<br>
<br>
 void ThreadFinish(ThreadState *thr) {<br>
   CHECK_GT(thr->in_rtl, 0);<br>
+  ThreadCheckIgnore(thr);<br>
   StatInc(thr, StatThreadFinish);<br>
   if (thr->stk_addr && thr->stk_size)<br>
     DontNeedShadowFor(thr->stk_addr, thr->stk_size);<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>