tsan: use verbosity flag in sanitizer_common code directly

now it's available from common_flags()

llvm-svn: 192705
This commit is contained in:
Dmitry Vyukov 2013-10-15 14:12:26 +00:00
parent 45baa00dcb
commit 7502a3a90c
5 changed files with 7 additions and 12 deletions

View File

@ -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;

View File

@ -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)

View File

@ -66,7 +66,7 @@ class ThreadLister {
int bytes_read_;
};
void AdjustStackSizeLinux(void *attr, int verbosity);
void AdjustStackSizeLinux(void *attr);
// Exposed for testing.
uptr ThreadDescriptorSize();

View File

@ -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);

View File

@ -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;