[llvm-commits] [compiler-rt] r157383 - in /compiler-rt/trunk/lib/tsan/rtl: tsan_flags.cc tsan_flags.h tsan_interface_ann.cc

[Dmitry Vyukov]

Author: dvyukov
Date: Thu May 24 04:24:45 2012
New Revision: 157383

URL: http://llvm.org/viewvc/llvm-project?rev=157383&view=rev
Log:
tsan: add a flag to control RunningOnValgrind() return value

Modified:
    compiler-rt/trunk/lib/tsan/rtl/tsan_flags.cc
    compiler-rt/trunk/lib/tsan/rtl/tsan_flags.h
    compiler-rt/trunk/lib/tsan/rtl/tsan_interface_ann.cc

Modified: compiler-rt/trunk/lib/tsan/rtl/tsan_flags.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_flags.cc?rev=157383&r1=157382&r2=157383&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/rtl/tsan_flags.cc (original)
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_flags.cc Thu May 24 04:24:45 2012
@@ -49,6 +49,8 @@
   f->profile_memory = "";
   f->flush_memory_ms = 0;
   f->stop_on_start = false;
+  f->running_on_valgrind = false;
+
 
   // Let a frontend override.
   OverrideFlags(f);

Modified: compiler-rt/trunk/lib/tsan/rtl/tsan_flags.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_flags.h?rev=157383&r1=157382&r2=157383&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/rtl/tsan_flags.h (original)
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_flags.h Thu May 24 04:24:45 2012
@@ -52,6 +52,8 @@
   int flush_memory_ms;
   // Stops on start until __tsan_resume() is called (for debugging).
   bool stop_on_start;
+  // Controls whether RunningOnValgrind() returns true or false.
+  bool running_on_valgrind;
 };
 
 Flags *flags();

Modified: compiler-rt/trunk/lib/tsan/rtl/tsan_interface_ann.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_interface_ann.cc?rev=157383&r1=157382&r2=157383&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/rtl/tsan_interface_ann.cc (original)
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_interface_ann.cc Thu May 24 04:24:45 2012
@@ -332,7 +332,7 @@
 }
 
 int RunningOnValgrind() {
-  return 0;
+  return flags()->running_on_valgrind;
 }
 
 double __attribute__((weak)) ValgrindSlowdown(void) {