generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix pthread_test according to tsan report.

Browse Source 
1. Fix leak threads and data races related to spin_flag.
2. Increase stack size to run under tsan.

This doesn't pass all pthread tests, as some tests are used
to run intentionally in race situations.

Bug: 25392375
Change-Id: Icfba3e141e7170abd890809586e89b99adc8bd02
This commit is contained in:
Yabin Cui 2015-11-16 21:06:16 -08:00
parent b804b9d67b
commit a36158a77d
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/pthread_test.cpp
View File

@ -164,7 +164,7 @@ TEST(pthread, pthread_key_dirty) {
pthread_key_t key; pthread_key_t key;
ASSERT_EQ(0, pthread_key_create(&key, NULL)); ASSERT_EQ(0, pthread_key_create(&key, NULL));
size_t stack_size = 128 * 1024; size_t stack_size = 640 * 1024;
void* stack = mmap(NULL, stack_size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0); void* stack = mmap(NULL, stack_size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
ASSERT_NE(MAP_FAILED, stack); ASSERT_NE(MAP_FAILED, stack);
memset(stack, 0xff, stack_size); memset(stack, 0xff, stack_size);
@ -222,13 +222,13 @@ class SpinFunctionHelper {
while (spin_flag_) {} while (spin_flag_) {}
return NULL; return NULL;
} }
static volatile bool spin_flag_; static std::atomic<bool> spin_flag_;
}; };
// It doesn't matter if spin_flag_ is used in several tests, // It doesn't matter if spin_flag_ is used in several tests,
// because it is always set to false after each test. Each thread // because it is always set to false after each test. Each thread
// loops on spin_flag_ can find it becomes false at some time. // loops on spin_flag_ can find it becomes false at some time.
volatile bool SpinFunctionHelper::spin_flag_ = false; std::atomic<bool> SpinFunctionHelper::spin_flag_;
static void* JoinFn(void* arg) { static void* JoinFn(void* arg) {
return reinterpret_cast<void*>(pthread_join(reinterpret_cast<pthread_t>(arg), NULL)); return reinterpret_cast<void*>(pthread_join(reinterpret_cast<pthread_t>(arg), NULL));
@ -421,6 +421,8 @@ TEST(pthread, pthread_setname_np__other) {
pthread_t t1; pthread_t t1;
ASSERT_EQ(0, pthread_create(&t1, NULL, spinhelper.GetFunction(), NULL)); ASSERT_EQ(0, pthread_create(&t1, NULL, spinhelper.GetFunction(), NULL));
ASSERT_EQ(0, pthread_setname_np(t1, "short 2")); ASSERT_EQ(0, pthread_setname_np(t1, "short 2"));
spinhelper.UnSpin();
ASSERT_EQ(0, pthread_join(t1, nullptr));
} }
TEST(pthread, pthread_setname_np__no_such_thread) { TEST(pthread, pthread_setname_np__no_such_thread) {
@ -471,6 +473,8 @@ TEST(pthread, pthread_getcpuclockid__clock_gettime) {
ASSERT_EQ(0, pthread_getcpuclockid(t, &c)); ASSERT_EQ(0, pthread_getcpuclockid(t, &c));
timespec ts; timespec ts;
ASSERT_EQ(0, clock_gettime(c, &ts)); ASSERT_EQ(0, clock_gettime(c, &ts));
spinhelper.UnSpin();
ASSERT_EQ(0, pthread_join(t, nullptr));
} }
TEST(pthread, pthread_getcpuclockid__no_such_thread) { TEST(pthread, pthread_getcpuclockid__no_such_thread) {
@ -539,7 +543,7 @@ TEST(pthread, pthread_join__race) {
// http://b/11693195 --- pthread_join could return before the thread had actually exited. // http://b/11693195 --- pthread_join could return before the thread had actually exited.
// If the joiner unmapped the thread's stack, that could lead to SIGSEGV in the thread. // If the joiner unmapped the thread's stack, that could lead to SIGSEGV in the thread.
for (size_t i = 0; i < 1024; ++i) { for (size_t i = 0; i < 1024; ++i) {
size_t stack_size = 64*1024; size_t stack_size = 640*1024;
void* stack = mmap(NULL, stack_size, PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE, -1, 0); void* stack = mmap(NULL, stack_size, PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE, -1, 0);
pthread_attr_t a; pthread_attr_t a;