diff options
author | Dmitry Vyukov <dvyukov@google.com> | 2013-10-15 14:12:26 +0000 |
---|---|---|
committer | Dmitry Vyukov <dvyukov@google.com> | 2013-10-15 14:12:26 +0000 |
commit | 06cbed8b8ae64b7ace50c1b4e4eed97a2a8b9965 (patch) | |
tree | 434d63328e2e01a12deca90e555b05759180a207 | |
parent | 2e7999e485a67ef33c5ab4d9bce0f7b9fc9ddce1 (diff) | |
download | compiler-rt-06cbed8b8ae64b7ace50c1b4e4eed97a2a8b9965.tar.gz compiler-rt-06cbed8b8ae64b7ace50c1b4e4eed97a2a8b9965.tar.bz2 compiler-rt-06cbed8b8ae64b7ace50c1b4e4eed97a2a8b9965.tar.xz |
tsan: use verbosity flag in sanitizer_common code directly
now it's available from common_flags()
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@192705 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/lsan/lsan_interceptors.cc | 2 | ||||
-rw-r--r-- | lib/msan/msan_interceptors.cc | 2 | ||||
-rw-r--r-- | lib/sanitizer_common/sanitizer_linux.h | 2 | ||||
-rw-r--r-- | lib/sanitizer_common/sanitizer_linux_libcdep.cc | 5 | ||||
-rw-r--r-- | lib/tsan/rtl/tsan_interceptors.cc | 8 |
5 files changed, 7 insertions, 12 deletions
diff --git a/lib/lsan/lsan_interceptors.cc b/lib/lsan/lsan_interceptors.cc index 1605c0f0..faf2a204 100644 --- a/lib/lsan/lsan_interceptors.cc +++ b/lib/lsan/lsan_interceptors.cc @@ -221,7 +221,7 @@ INTERCEPTOR(int, pthread_create, void *th, void *attr, pthread_attr_init(&myattr); attr = &myattr; } - AdjustStackSizeLinux(attr, 0); + AdjustStackSizeLinux(attr); int detached = 0; pthread_attr_getdetachstate(attr, &detached); ThreadParam p; diff --git a/lib/msan/msan_interceptors.cc b/lib/msan/msan_interceptors.cc index 30861543..700d7cfe 100644 --- a/lib/msan/msan_interceptors.cc +++ b/lib/msan/msan_interceptors.cc @@ -1082,7 +1082,7 @@ INTERCEPTOR(int, pthread_create, void *th, void *attr, void *(*callback)(void*), attr = &myattr; } - AdjustStackSizeLinux(attr, common_flags()->verbosity); + AdjustStackSizeLinux(attr); int res = REAL(pthread_create)(th, attr, callback, param); if (attr == &myattr) diff --git a/lib/sanitizer_common/sanitizer_linux.h b/lib/sanitizer_common/sanitizer_linux.h index fae2a337..a32e9bf0 100644 --- a/lib/sanitizer_common/sanitizer_linux.h +++ b/lib/sanitizer_common/sanitizer_linux.h @@ -66,7 +66,7 @@ class ThreadLister { int bytes_read_; }; -void AdjustStackSizeLinux(void *attr, int verbosity); +void AdjustStackSizeLinux(void *attr); // Exposed for testing. uptr ThreadDescriptorSize(); diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc index 7b8d4e1d..0bc38880 100644 --- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc +++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc @@ -16,6 +16,7 @@ #if SANITIZER_LINUX #include "sanitizer_common.h" +#include "sanitizer_flags.h" #include "sanitizer_linux.h" #include "sanitizer_placement_new.h" #include "sanitizer_procmaps.h" @@ -272,7 +273,7 @@ void GetThreadStackAndTls(bool main, uptr *stk_addr, uptr *stk_size, #endif // SANITIZER_GO } -void AdjustStackSizeLinux(void *attr_, int verbosity) { +void AdjustStackSizeLinux(void *attr_) { pthread_attr_t *attr = (pthread_attr_t *)attr_; uptr stackaddr = 0; size_t stacksize = 0; @@ -284,7 +285,7 @@ void AdjustStackSizeLinux(void *attr_, int verbosity) { const uptr minstacksize = GetTlsSize() + 128*1024; if (stacksize < minstacksize) { if (!stack_set) { - if (verbosity && stacksize != 0) + if (common_flags()->verbosity && stacksize != 0) Printf("Sanitizer: increasing stacksize %zu->%zu\n", stacksize, minstacksize); pthread_attr_setstacksize(attr, minstacksize); diff --git a/lib/tsan/rtl/tsan_interceptors.cc b/lib/tsan/rtl/tsan_interceptors.cc index e28b9d25..ecb4bbb8 100644 --- a/lib/tsan/rtl/tsan_interceptors.cc +++ b/lib/tsan/rtl/tsan_interceptors.cc @@ -882,13 +882,7 @@ TSAN_INTERCEPTOR(int, pthread_create, } int detached = 0; pthread_attr_getdetachstate(attr, &detached); - -#if defined(TSAN_DEBUG_OUTPUT) - int verbosity = (TSAN_DEBUG_OUTPUT); -#else - int verbosity = 0; -#endif - AdjustStackSizeLinux(attr, verbosity); + AdjustStackSizeLinux(attr); ThreadParam p; p.callback = callback; |