[PATCH] D14924: [tsan] Replace pthread semaphore in signal_cond.cc with barrier_wait

[Kuba Brecka via llvm-commits]

kubabrecka created this revision.
kubabrecka added reviewers: dvyukov, kcc, glider, samsonov.
kubabrecka added subscribers: llvm-commits, zaks.anna, ismailp.

Pthread semaphores are not available on OS X.  Let's replace sem_wait/sem_post with barrier_wait, which makes the test pass on OS X.  I know that sem_wait/sem_post is intercepted by TSan, whereas barrier_wait is TSan-invisible, but the purpose of the test is not affected by this.

Also, let's properly initialize the `mutex` and `cond` variables.

http://reviews.llvm.org/D14924

Files:
  test/tsan/signal_cond.cc

Index: test/tsan/signal_cond.cc
===================================================================
--- test/tsan/signal_cond.cc
+++ test/tsan/signal_cond.cc
@@ -11,12 +11,11 @@
 int g_thread_run = 1;
 pthread_mutex_t mutex;
 pthread_cond_t cond;
-sem_t sem;
 
 void sig_handler(int sig) {
   (void)sig;
   write(1, "SIGNAL\n", sizeof("SIGNAL\n") - 1);
-  sem_post(&sem);
+  barrier_wait(&barrier);
 }
 
 void* my_thread(void* arg) {
@@ -28,16 +27,19 @@
 }
 
 int main() {
-  sem_init(&sem, 0, 0);
+  barrier_init(&barrier, 2);
+
+  pthread_mutex_init(&mutex, 0);
+  pthread_cond_init(&cond, 0);
+
   signal(SIGUSR1, &sig_handler);
   pthread_t thr;
   pthread_create(&thr, 0, &my_thread, 0);
   // wait for thread to get inside pthread_cond_wait
   // (can't use barrier_wait for that)
   sleep(1);
   pthread_kill(thr, SIGUSR1);
-  while (sem_wait(&sem) == -1 && errno == EINTR) {
-  }
+  barrier_wait(&barrier);
   pthread_mutex_lock(&mutex);
   g_thread_run = 0;
   pthread_cond_signal(&cond);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D14924.40922.patch
Type: text/x-patch
Size: 998 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20151123/7468edb0/attachment.bin>