summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortimurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-11 14:24:07 +0000
committertimurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-11 14:24:07 +0000
commit7ae23f67eeb37ef742722f609359d35832d535e0 (patch)
treeec9667700b282e28a2d79b9093d54ffc4eda7dc3
parent55c1bfd5cbb2e690b372d5c0b1e8c6a6cd58c219 (diff)
downloadchromium_src-7ae23f67eeb37ef742722f609359d35832d535e0.zip
chromium_src-7ae23f67eeb37ef742722f609359d35832d535e0.tar.gz
chromium_src-7ae23f67eeb37ef742722f609359d35832d535e0.tar.bz2
Move empty_rep-specific reports from cross-platform to Mac-specific file.
TBR=glider TEST=TSan/Linux should remain green, tested locally Review URL: http://codereview.chromium.org/2048008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46914 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--tools/valgrind/tsan/ignores.txt12
-rw-r--r--tools/valgrind/tsan/ignores_mac.txt15
2 files changed, 15 insertions, 12 deletions
diff --git a/tools/valgrind/tsan/ignores.txt b/tools/valgrind/tsan/ignores.txt
index 4add15a..02d1880 100644
--- a/tools/valgrind/tsan/ignores.txt
+++ b/tools/valgrind/tsan/ignores.txt
@@ -38,18 +38,6 @@ fun:vfprintf
fun:fwrite
fun:fflush
-# 32-bit version of std::string
-# There is something very strange inside these functions.
-# Looks like they write zero to a global variable which
-# value is already zero. I.e. the race is benign.
-# Global var is _ZNSs4_Rep20_S_empty_rep_storageE
-fun:*_M_mutateE*
-fun_r:*_M_set_length_and_sharable*
-fun:*_M_is_leaked*
-fun:*_M_is_shared*
-fun:*_M_set_leaked*
-fun:*_M_set_sharable*
-
# Don't instrument intercepts
src:*ts_valgrind_intercepts.c
diff --git a/tools/valgrind/tsan/ignores_mac.txt b/tools/valgrind/tsan/ignores_mac.txt
index e9f2661..9c491f2 100644
--- a/tools/valgrind/tsan/ignores_mac.txt
+++ b/tools/valgrind/tsan/ignores_mac.txt
@@ -10,6 +10,21 @@ fun:*base*subtle*Release_Store*
fun:*base*subtle*NoBarrier_Store*
fun:*base*subtle*NoBarrier_CompareAndSwap*
+# 32-bit version of std::string
+# There is something very strange inside these functions.
+# Looks like they write zero to a global variable which
+# value is already zero. I.e. the race is benign.
+# Global var is _ZNSs4_Rep20_S_empty_rep_storageE
+# The race can only be reported on Mac since empty_rep is ignored by name
+# inside ThreadSanitizer. Unfortunately, we don't have global variable names
+# when running on Mac.
+fun:*_M_mutateE*
+fun_r:*_M_set_length_and_sharable*
+fun:*_M_is_leaked*
+fun:*_M_is_shared*
+fun:*_M_set_leaked*
+fun:*_M_set_sharable*
+
# we ignore the Security libraries for now since
# their instrumentation is very slow.
# TODO(timurrrr): investigate whether we need to instrument them