[llvm-commits] [compiler-rt] r169592 - in /compiler-rt/trunk/lib/tsan/lit_tests: free_race.c ignore_race.cc memcpy_race.cc mop_with_offset.cc mop_with_offset2.cc mutex_destroy_locked.cc mutexset1.cc mutexset2.cc mutexset3.cc mutexset4.cc mutexset5.cc mutexset6.cc mutexset7.cc race_on_barrier.c race_on_mutex.c race_with_finished_thread.cc simple_stack.c simple_stack2.cc sleep_sync.cc sleep_sync2.cc thread_name.cc write_in_reader_lock.cc

Dmitry Vyukov dvyukov at google.com
Fri Dec 7 01:24:58 PST 2012


Author: dvyukov
Date: Fri Dec  7 03:24:57 2012
New Revision: 169592

URL: http://llvm.org/viewvc/llvm-project?rev=169592&view=rev
Log:
tsan: deflake output tests (by increasing sleeps)

Modified:
    compiler-rt/trunk/lib/tsan/lit_tests/free_race.c
    compiler-rt/trunk/lib/tsan/lit_tests/ignore_race.cc
    compiler-rt/trunk/lib/tsan/lit_tests/memcpy_race.cc
    compiler-rt/trunk/lib/tsan/lit_tests/mop_with_offset.cc
    compiler-rt/trunk/lib/tsan/lit_tests/mop_with_offset2.cc
    compiler-rt/trunk/lib/tsan/lit_tests/mutex_destroy_locked.cc
    compiler-rt/trunk/lib/tsan/lit_tests/mutexset1.cc
    compiler-rt/trunk/lib/tsan/lit_tests/mutexset2.cc
    compiler-rt/trunk/lib/tsan/lit_tests/mutexset3.cc
    compiler-rt/trunk/lib/tsan/lit_tests/mutexset4.cc
    compiler-rt/trunk/lib/tsan/lit_tests/mutexset5.cc
    compiler-rt/trunk/lib/tsan/lit_tests/mutexset6.cc
    compiler-rt/trunk/lib/tsan/lit_tests/mutexset7.cc
    compiler-rt/trunk/lib/tsan/lit_tests/race_on_barrier.c
    compiler-rt/trunk/lib/tsan/lit_tests/race_on_mutex.c
    compiler-rt/trunk/lib/tsan/lit_tests/race_with_finished_thread.cc
    compiler-rt/trunk/lib/tsan/lit_tests/simple_stack.c
    compiler-rt/trunk/lib/tsan/lit_tests/simple_stack2.cc
    compiler-rt/trunk/lib/tsan/lit_tests/sleep_sync.cc
    compiler-rt/trunk/lib/tsan/lit_tests/sleep_sync2.cc
    compiler-rt/trunk/lib/tsan/lit_tests/thread_name.cc
    compiler-rt/trunk/lib/tsan/lit_tests/write_in_reader_lock.cc

Modified: compiler-rt/trunk/lib/tsan/lit_tests/free_race.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/free_race.c?rev=169592&r1=169591&r2=169592&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/lit_tests/free_race.c (original)
+++ compiler-rt/trunk/lib/tsan/lit_tests/free_race.c Fri Dec  7 03:24:57 2012
@@ -16,7 +16,7 @@
 }
 
 void *Thread2(void *x) {
-  usleep(1000000);
+  sleep(1);
   pthread_mutex_lock(&mtx);
   mem[0] = 42;
   pthread_mutex_unlock(&mtx);

Modified: compiler-rt/trunk/lib/tsan/lit_tests/ignore_race.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/ignore_race.cc?rev=169592&r1=169591&r2=169592&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/lit_tests/ignore_race.cc (original)
+++ compiler-rt/trunk/lib/tsan/lit_tests/ignore_race.cc Fri Dec  7 03:24:57 2012
@@ -22,7 +22,7 @@
 int main() {
   pthread_t t;
   pthread_create(&t, 0, Thread, 0);
-  usleep(100000);
+  sleep(1);
   Global = 43;
   pthread_join(t, 0);
   return 0;

Modified: compiler-rt/trunk/lib/tsan/lit_tests/memcpy_race.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/memcpy_race.cc?rev=169592&r1=169591&r2=169592&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/lit_tests/memcpy_race.cc (original)
+++ compiler-rt/trunk/lib/tsan/lit_tests/memcpy_race.cc Fri Dec  7 03:24:57 2012
@@ -15,7 +15,7 @@
 }
 
 void *Thread2(void *x) {
-  usleep(500*1000);
+  sleep(1);
   memcpy(data+3, data2, 4);
   return NULL;
 }

Modified: compiler-rt/trunk/lib/tsan/lit_tests/mop_with_offset.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/mop_with_offset.cc?rev=169592&r1=169591&r2=169592&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/lit_tests/mop_with_offset.cc (original)
+++ compiler-rt/trunk/lib/tsan/lit_tests/mop_with_offset.cc Fri Dec  7 03:24:57 2012
@@ -11,7 +11,7 @@
 }
 
 void *Thread2(void *x) {
-  usleep(500*1000);
+  sleep(1);
   char *p = (char*)x;
   p[2] = 1;
   return NULL;

Modified: compiler-rt/trunk/lib/tsan/lit_tests/mop_with_offset2.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/mop_with_offset2.cc?rev=169592&r1=169591&r2=169592&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/lit_tests/mop_with_offset2.cc (original)
+++ compiler-rt/trunk/lib/tsan/lit_tests/mop_with_offset2.cc Fri Dec  7 03:24:57 2012
@@ -5,7 +5,7 @@
 #include <unistd.h>
 
 void *Thread1(void *x) {
-  usleep(500*1000);
+  sleep(1);
   int *p = (int*)x;
   p[0] = 1;
   return NULL;

Modified: compiler-rt/trunk/lib/tsan/lit_tests/mutex_destroy_locked.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/mutex_destroy_locked.cc?rev=169592&r1=169591&r2=169592&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/lit_tests/mutex_destroy_locked.cc (original)
+++ compiler-rt/trunk/lib/tsan/lit_tests/mutex_destroy_locked.cc Fri Dec  7 03:24:57 2012
@@ -12,7 +12,7 @@
   pthread_mutex_init(&m, 0);
   pthread_t t;
   pthread_create(&t, 0, Thread, &m);
-  usleep(1000*1000);
+  sleep(1);
   pthread_mutex_destroy(&m);
   pthread_join(t, 0);
   return 0;

Modified: compiler-rt/trunk/lib/tsan/lit_tests/mutexset1.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/mutexset1.cc?rev=169592&r1=169591&r2=169592&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/lit_tests/mutexset1.cc (original)
+++ compiler-rt/trunk/lib/tsan/lit_tests/mutexset1.cc Fri Dec  7 03:24:57 2012
@@ -7,7 +7,7 @@
 pthread_mutex_t mtx;
 
 void *Thread1(void *x) {
-  usleep(100*1000);
+  sleep(1);
   pthread_mutex_lock(&mtx);
   Global++;
   pthread_mutex_unlock(&mtx);

Modified: compiler-rt/trunk/lib/tsan/lit_tests/mutexset2.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/mutexset2.cc?rev=169592&r1=169591&r2=169592&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/lit_tests/mutexset2.cc (original)
+++ compiler-rt/trunk/lib/tsan/lit_tests/mutexset2.cc Fri Dec  7 03:24:57 2012
@@ -14,7 +14,7 @@
 }
 
 void *Thread2(void *x) {
-  usleep(100*1000);
+  sleep(1);
   Global--;
   return NULL;
 }

Modified: compiler-rt/trunk/lib/tsan/lit_tests/mutexset3.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/mutexset3.cc?rev=169592&r1=169591&r2=169592&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/lit_tests/mutexset3.cc (original)
+++ compiler-rt/trunk/lib/tsan/lit_tests/mutexset3.cc Fri Dec  7 03:24:57 2012
@@ -8,7 +8,7 @@
 pthread_mutex_t mtx2;
 
 void *Thread1(void *x) {
-  usleep(100*1000);
+  sleep(1);
   pthread_mutex_lock(&mtx1);
   pthread_mutex_lock(&mtx2);
   Global++;

Modified: compiler-rt/trunk/lib/tsan/lit_tests/mutexset4.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/mutexset4.cc?rev=169592&r1=169591&r2=169592&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/lit_tests/mutexset4.cc (original)
+++ compiler-rt/trunk/lib/tsan/lit_tests/mutexset4.cc Fri Dec  7 03:24:57 2012
@@ -17,7 +17,7 @@
 }
 
 void *Thread2(void *x) {
-  usleep(100*1000);
+  sleep(1);
   Global--;
   return NULL;
 }

Modified: compiler-rt/trunk/lib/tsan/lit_tests/mutexset5.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/mutexset5.cc?rev=169592&r1=169591&r2=169592&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/lit_tests/mutexset5.cc (original)
+++ compiler-rt/trunk/lib/tsan/lit_tests/mutexset5.cc Fri Dec  7 03:24:57 2012
@@ -8,7 +8,7 @@
 pthread_mutex_t mtx2;
 
 void *Thread1(void *x) {
-  usleep(100*1000);
+  sleep(1);
   pthread_mutex_lock(&mtx1);
   Global++;
   pthread_mutex_unlock(&mtx1);

Modified: compiler-rt/trunk/lib/tsan/lit_tests/mutexset6.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/mutexset6.cc?rev=169592&r1=169591&r2=169592&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/lit_tests/mutexset6.cc (original)
+++ compiler-rt/trunk/lib/tsan/lit_tests/mutexset6.cc Fri Dec  7 03:24:57 2012
@@ -9,7 +9,7 @@
 pthread_rwlock_t mtx3;
 
 void *Thread1(void *x) {
-  usleep(100*1000);
+  sleep(1);
   pthread_mutex_lock(&mtx1);
   Global++;
   pthread_mutex_unlock(&mtx1);

Modified: compiler-rt/trunk/lib/tsan/lit_tests/mutexset7.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/mutexset7.cc?rev=169592&r1=169591&r2=169592&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/lit_tests/mutexset7.cc (original)
+++ compiler-rt/trunk/lib/tsan/lit_tests/mutexset7.cc Fri Dec  7 03:24:57 2012
@@ -6,7 +6,7 @@
 int Global;
 
 void *Thread1(void *x) {
-  usleep(100*1000);
+  sleep(1);
   Global++;
   return NULL;
 }

Modified: compiler-rt/trunk/lib/tsan/lit_tests/race_on_barrier.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/race_on_barrier.c?rev=169592&r1=169591&r2=169592&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/lit_tests/race_on_barrier.c (original)
+++ compiler-rt/trunk/lib/tsan/lit_tests/race_on_barrier.c Fri Dec  7 03:24:57 2012
@@ -14,7 +14,7 @@
 }
 
 void *Thread2(void *x) {
-  usleep(1000000);
+  sleep(1);
   pthread_barrier_wait(&B);
   return NULL;
 }

Modified: compiler-rt/trunk/lib/tsan/lit_tests/race_on_mutex.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/race_on_mutex.c?rev=169592&r1=169591&r2=169592&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/lit_tests/race_on_mutex.c (original)
+++ compiler-rt/trunk/lib/tsan/lit_tests/race_on_mutex.c Fri Dec  7 03:24:57 2012
@@ -16,7 +16,7 @@
 }
 
 void *Thread2(void *x) {
-  usleep(1000000);
+  sleep(1);
   pthread_mutex_lock(&Mtx);
   Global = 43;
   pthread_mutex_unlock(&Mtx);

Modified: compiler-rt/trunk/lib/tsan/lit_tests/race_with_finished_thread.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/race_with_finished_thread.cc?rev=169592&r1=169591&r2=169592&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/lit_tests/race_with_finished_thread.cc (original)
+++ compiler-rt/trunk/lib/tsan/lit_tests/race_with_finished_thread.cc Fri Dec  7 03:24:57 2012
@@ -19,7 +19,7 @@
 }
 
 void *Thread2(void *x) {
-  usleep(1000*1000);
+  sleep(1);
   g_data = 43;
   return NULL;
 }

Modified: compiler-rt/trunk/lib/tsan/lit_tests/simple_stack.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/simple_stack.c?rev=169592&r1=169591&r2=169592&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/lit_tests/simple_stack.c (original)
+++ compiler-rt/trunk/lib/tsan/lit_tests/simple_stack.c Fri Dec  7 03:24:57 2012
@@ -24,7 +24,7 @@
 }
 
 void *Thread1(void *x) {
-  usleep(1000000);
+  sleep(1);
   bar1();
   return NULL;
 }

Modified: compiler-rt/trunk/lib/tsan/lit_tests/simple_stack2.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/simple_stack2.cc?rev=169592&r1=169591&r2=169592&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/lit_tests/simple_stack2.cc (original)
+++ compiler-rt/trunk/lib/tsan/lit_tests/simple_stack2.cc Fri Dec  7 03:24:57 2012
@@ -30,7 +30,7 @@
 }
 
 void *Thread1(void *x) {
-  usleep(1000000);
+  sleep(1);
   bar1();
   return NULL;
 }

Modified: compiler-rt/trunk/lib/tsan/lit_tests/sleep_sync.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/sleep_sync.cc?rev=169592&r1=169591&r2=169592&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/lit_tests/sleep_sync.cc (original)
+++ compiler-rt/trunk/lib/tsan/lit_tests/sleep_sync.cc Fri Dec  7 03:24:57 2012
@@ -5,7 +5,7 @@
 int X = 0;
 
 void MySleep() {
-  usleep(50*1000);
+  sleep(1);
 }
 
 void *Thread(void *p) {
@@ -25,6 +25,6 @@
 // CHECK: WARNING: ThreadSanitizer: data race
 // ...
 // CHECK:   As if synchronized via sleep:
-// CHECK-NEXT:     #0 usleep
+// CHECK-NEXT:     #0 sleep
 // CHECK-NEXT:     #1 MySleep
 // CHECK-NEXT:     #2 Thread

Modified: compiler-rt/trunk/lib/tsan/lit_tests/sleep_sync2.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/sleep_sync2.cc?rev=169592&r1=169591&r2=169592&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/lit_tests/sleep_sync2.cc (original)
+++ compiler-rt/trunk/lib/tsan/lit_tests/sleep_sync2.cc Fri Dec  7 03:24:57 2012
@@ -11,7 +11,7 @@
 
 int main() {
   pthread_t t;
-  usleep(100*1000);
+  sleep(1);
   pthread_create(&t, 0, Thread, 0);
   X = 43;
   pthread_join(t, 0);

Modified: compiler-rt/trunk/lib/tsan/lit_tests/thread_name.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/thread_name.cc?rev=169592&r1=169591&r2=169592&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/lit_tests/thread_name.cc (original)
+++ compiler-rt/trunk/lib/tsan/lit_tests/thread_name.cc Fri Dec  7 03:24:57 2012
@@ -8,7 +8,7 @@
 int Global;
 
 void *Thread1(void *x) {
-  usleep(100*1000);
+  sleep(1);
   AnnotateThreadName(__FILE__, __LINE__, "Thread1");
   Global++;
   return NULL;

Modified: compiler-rt/trunk/lib/tsan/lit_tests/write_in_reader_lock.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/write_in_reader_lock.cc?rev=169592&r1=169591&r2=169592&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/lit_tests/write_in_reader_lock.cc (original)
+++ compiler-rt/trunk/lib/tsan/lit_tests/write_in_reader_lock.cc Fri Dec  7 03:24:57 2012
@@ -9,7 +9,7 @@
   (void)p;
   pthread_rwlock_rdlock(&rwlock);
   // Write under reader lock.
-  usleep(100);
+  sleep(1);
   GLOB++;
   pthread_rwlock_unlock(&rwlock);
   return 0;





More information about the llvm-commits mailing list