summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Xie <dxie@google.com>2015-11-11 18:53:16 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-11-11 18:53:16 +0000
commit2010fb6722ea2bd9d07c9f0a3e69eafa3d6114e9 (patch)
treed1c073a2a0207b48af767f78592155ffe9768692
parent93a91f0cf4f015762ac1ed57395c4c0de8ba7db3 (diff)
parent4f8010293506d4e08d184e66bf4af44ef3483611 (diff)
downloadbionic-2010fb6722ea2bd9d07c9f0a3e69eafa3d6114e9.zip
bionic-2010fb6722ea2bd9d07c9f0a3e69eafa3d6114e9.tar.gz
bionic-2010fb6722ea2bd9d07c9f0a3e69eafa3d6114e9.tar.bz2
Merge "Fix potential race condition on CTS TC pthread_gettid_np" into marshmallow-cts-dev
-rwxr-xr-x[-rw-r--r--]tests/pthread_test.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/pthread_test.cpp b/tests/pthread_test.cpp
index 8ae28d8..f15cdab 100644..100755
--- a/tests/pthread_test.cpp
+++ b/tests/pthread_test.cpp
@@ -1244,8 +1244,11 @@ TEST(pthread, pthread_attr_getstack_18908062) {
}
#if defined(__BIONIC__)
+static pthread_mutex_t gettid_mutex;
static void* pthread_gettid_np_helper(void* arg) {
+ pthread_mutex_lock(&gettid_mutex);
*reinterpret_cast<pid_t*>(arg) = gettid();
+ pthread_mutex_unlock(&gettid_mutex);
return NULL;
}
#endif
@@ -1256,11 +1259,15 @@ TEST(pthread, pthread_gettid_np) {
pid_t t_gettid_result;
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);
pid_t t_pthread_gettid_np_result = pthread_gettid_np(t);
+ pthread_mutex_unlock(&gettid_mutex);
pthread_join(t, NULL);
+ pthread_mutex_destroy(&gettid_mutex);
ASSERT_EQ(t_gettid_result, t_pthread_gettid_np_result);
#else