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

Merge "Fix potential race condition on CTS TC pthread_gettid_np" into marshmallow-cts-dev

Browse Source
This commit is contained in:
Daniel Xie 2015-11-11 18:53:16 +00:00 committed by Gerrit Code Review
commit 2010fb6722
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/pthread_test.cpp Normal file → Executable file
View File

@ -1244,8 +1244,11 @@ TEST(pthread, pthread_attr_getstack_18908062) {
} }
#if defined(__BIONIC__) #if defined(__BIONIC__)
static pthread_mutex_t gettid_mutex;
static void* pthread_gettid_np_helper(void* arg) { static void* pthread_gettid_np_helper(void* arg) {
pthread_mutex_lock(&gettid_mutex);
*reinterpret_cast<pid_t*>(arg) = gettid(); *reinterpret_cast<pid_t*>(arg) = gettid();
pthread_mutex_unlock(&gettid_mutex);
return NULL; return NULL;
} }
#endif #endif
@ -1256,11 +1259,15 @@ TEST(pthread, pthread_gettid_np) {
pid_t t_gettid_result; pid_t t_gettid_result;
pthread_t t; pthread_t t;
pthread_mutex_init(&gettid_mutex, NULL);
pthread_mutex_lock(&gettid_mutex);
pthread_create(&t, NULL, pthread_gettid_np_helper, &t_gettid_result); pthread_create(&t, NULL, pthread_gettid_np_helper, &t_gettid_result);
pid_t t_pthread_gettid_np_result = pthread_gettid_np(t); pid_t t_pthread_gettid_np_result = pthread_gettid_np(t);
pthread_mutex_unlock(&gettid_mutex);
pthread_join(t, NULL); pthread_join(t, NULL);
pthread_mutex_destroy(&gettid_mutex);
ASSERT_EQ(t_gettid_result, t_pthread_gettid_np_result); ASSERT_EQ(t_gettid_result, t_pthread_gettid_np_result);
#else #else