From 91e22b0dd3c083ad67fc88a043019f988670c192 Mon Sep 17 00:00:00 2001 From: NAKAMURA Takumi Date: Thu, 24 Jan 2013 14:44:02 +0000 Subject: unittests/SupportTests/Initialize.MultipleThreads: Appease --vg-leak to allocate stack explicitly for glibc. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@173350 91177308-0d34-0410-b5e6-96231b3b80d8 --- unittests/Support/ManagedStatic.cpp | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'unittests/Support/ManagedStatic.cpp') diff --git a/unittests/Support/ManagedStatic.cpp b/unittests/Support/ManagedStatic.cpp index 79eb098e56..b1df2bd6d2 100644 --- a/unittests/Support/ManagedStatic.cpp +++ b/unittests/Support/ManagedStatic.cpp @@ -26,17 +26,32 @@ namespace test1 { *ms; return NULL; } + + // Valgrind's leak checker complains glibc's stack allocation. + // To appease valgrind, we provide our own stack for each thread. + void *allocate_stack(pthread_attr_t &a, size_t n = 65536) { + void *stack = malloc(n); + pthread_attr_init(&a); + pthread_attr_setstack(&a, stack, n); + return stack; + } } TEST(Initialize, MultipleThreads) { // Run this test under tsan: http://code.google.com/p/data-race-test/ + pthread_attr_t a1, a2; + void *p1 = test1::allocate_stack(a1); + void *p2 = test1::allocate_stack(a2); + llvm_start_multithreaded(); pthread_t t1, t2; - pthread_create(&t1, NULL, test1::helper, NULL); - pthread_create(&t2, NULL, test1::helper, NULL); + pthread_create(&t1, &a1, test1::helper, NULL); + pthread_create(&t2, &a2, test1::helper, NULL); pthread_join(t1, NULL); pthread_join(t2, NULL); + free(p1); + free(p2); llvm_stop_multithreaded(); } #endif -- cgit v1.2.3-18-g5258 From 41d35a335efb30710c0ad806833379fe0373c7a0 Mon Sep 17 00:00:00 2001 From: NAKAMURA Takumi Date: Thu, 24 Jan 2013 15:29:27 +0000 Subject: unittests/SupportTests/Initialize.MultipleThreads: Enable pthread_attr_setstack(3) only on Linux. I got blamed on darwin11; unittests/Support/ManagedStatic.cpp:35: error: 'pthread_attr_setstack' was not declared in this scope git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@173355 91177308-0d34-0410-b5e6-96231b3b80d8 --- unittests/Support/ManagedStatic.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'unittests/Support/ManagedStatic.cpp') diff --git a/unittests/Support/ManagedStatic.cpp b/unittests/Support/ManagedStatic.cpp index b1df2bd6d2..a4137619f4 100644 --- a/unittests/Support/ManagedStatic.cpp +++ b/unittests/Support/ManagedStatic.cpp @@ -32,7 +32,9 @@ namespace test1 { void *allocate_stack(pthread_attr_t &a, size_t n = 65536) { void *stack = malloc(n); pthread_attr_init(&a); +#if defined(__linux__) pthread_attr_setstack(&a, stack, n); +#endif return stack; } } -- cgit v1.2.3-18-g5258