[PATCH] D21044: [tsan]: rename RunningOnValgrind to __tsan_RunningOnValgrind

[Igor Sugak via llvm-commits]

sugak created this revision.
sugak added reviewers: kcc, kubabrecka.
sugak added a subscriber: llvm-commits.
Herald added a subscriber: kubabrecka.

`RunningOnValgrind` is a common name, used in several projects ([[ https://github.com/gperftools/gperftoole | gperftools ]] for instance).
Add the namespace `__tsan_` prefix to avoid errors when linking with
other libraries that define a symbol with this name.

The change is mechanical, induced by with the following command:
```
git grep -lw RunningOnValgrind | \
xargs perl -pi -e 's/\b(RunningOnValgrind)\b/__tsan_$1/g'
```

http://reviews.llvm.org/D21044

Files:
  lib/tsan/rtl/tsan.syms.extra
  lib/tsan/rtl/tsan_flags.inc
  lib/tsan/rtl/tsan_interface_ann.cc

Index: lib/tsan/rtl/tsan_interface_ann.cc
===================================================================
--- lib/tsan/rtl/tsan_interface_ann.cc
+++ lib/tsan/rtl/tsan_interface_ann.cc
@@ -439,7 +439,7 @@
   BenignRaceImpl(f, l, mem, sz, desc);
 }
 
-int INTERFACE_ATTRIBUTE RunningOnValgrind() {
+int INTERFACE_ATTRIBUTE __tsan_RunningOnValgrind() {
   return flags()->running_on_valgrind;
 }
 
Index: lib/tsan/rtl/tsan_flags.inc
===================================================================
--- lib/tsan/rtl/tsan_flags.inc
+++ lib/tsan/rtl/tsan_flags.inc
@@ -60,7 +60,7 @@
 TSAN_FLAG(bool, stop_on_start, false,
           "Stops on start until __tsan_resume() is called (for debugging).")
 TSAN_FLAG(bool, running_on_valgrind, false,
-          "Controls whether RunningOnValgrind() returns true or false.")
+          "Controls whether __tsan_RunningOnValgrind() returns true or false.")
 TSAN_FLAG(
     int, history_size, kGoMode ? 1 : 3, // There are a lot of goroutines in Go.
     "Per-thread history size, controls how many previous memory accesses "
Index: lib/tsan/rtl/tsan.syms.extra
===================================================================
--- lib/tsan/rtl/tsan.syms.extra
+++ lib/tsan/rtl/tsan.syms.extra
@@ -8,8 +8,8 @@
 __tsan_unaligned*
 __tsan_release
 __tsan_acquire
+__tsan_RunningOnValgrind
 __ubsan_*
 Annotate*
 WTFAnnotate*
-RunningOnValgrind
 ValgrindSlowdown


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D21044.59793.patch
Type: text/x-patch
Size: 1406 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160606/c4456ae6/attachment.bin>