summaryrefslogtreecommitdiffstats
path: root/compiler-rt/lib/tsan
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2012-12-07 09:24:57 +0000
committerDmitry Vyukov <dvyukov@google.com>2012-12-07 09:24:57 +0000
commit5e700abc1c3ba70892d34aeae8bf22c0f4a08fe9 (patch)
treede64dade80b2508b27eff70a6574b322cd912ccb /compiler-rt/lib/tsan
parent383b61e791db4ed6440174601283de3c08a5469f (diff)
downloadbcm5719-llvm-5e700abc1c3ba70892d34aeae8bf22c0f4a08fe9.tar.gz
bcm5719-llvm-5e700abc1c3ba70892d34aeae8bf22c0f4a08fe9.zip
tsan: deflake output tests (by increasing sleeps)
llvm-svn: 169592
Diffstat (limited to 'compiler-rt/lib/tsan')
-rw-r--r--compiler-rt/lib/tsan/lit_tests/free_race.c2
-rw-r--r--compiler-rt/lib/tsan/lit_tests/ignore_race.cc2
-rw-r--r--compiler-rt/lib/tsan/lit_tests/memcpy_race.cc2
-rw-r--r--compiler-rt/lib/tsan/lit_tests/mop_with_offset.cc2
-rw-r--r--compiler-rt/lib/tsan/lit_tests/mop_with_offset2.cc2
-rw-r--r--compiler-rt/lib/tsan/lit_tests/mutex_destroy_locked.cc2
-rw-r--r--compiler-rt/lib/tsan/lit_tests/mutexset1.cc2
-rw-r--r--compiler-rt/lib/tsan/lit_tests/mutexset2.cc2
-rw-r--r--compiler-rt/lib/tsan/lit_tests/mutexset3.cc2
-rw-r--r--compiler-rt/lib/tsan/lit_tests/mutexset4.cc2
-rw-r--r--compiler-rt/lib/tsan/lit_tests/mutexset5.cc2
-rw-r--r--compiler-rt/lib/tsan/lit_tests/mutexset6.cc2
-rw-r--r--compiler-rt/lib/tsan/lit_tests/mutexset7.cc2
-rw-r--r--compiler-rt/lib/tsan/lit_tests/race_on_barrier.c2
-rw-r--r--compiler-rt/lib/tsan/lit_tests/race_on_mutex.c2
-rw-r--r--compiler-rt/lib/tsan/lit_tests/race_with_finished_thread.cc2
-rw-r--r--compiler-rt/lib/tsan/lit_tests/simple_stack.c2
-rw-r--r--compiler-rt/lib/tsan/lit_tests/simple_stack2.cc2
-rw-r--r--compiler-rt/lib/tsan/lit_tests/sleep_sync.cc4
-rw-r--r--compiler-rt/lib/tsan/lit_tests/sleep_sync2.cc2
-rw-r--r--compiler-rt/lib/tsan/lit_tests/thread_name.cc2
-rw-r--r--compiler-rt/lib/tsan/lit_tests/write_in_reader_lock.cc2
22 files changed, 23 insertions, 23 deletions
diff --git a/compiler-rt/lib/tsan/lit_tests/free_race.c b/compiler-rt/lib/tsan/lit_tests/free_race.c
index 12524711ab6..7a2ec0cdbed 100644
--- a/compiler-rt/lib/tsan/lit_tests/free_race.c
+++ b/compiler-rt/lib/tsan/lit_tests/free_race.c
@@ -16,7 +16,7 @@ void *Thread1(void *x) {
}
void *Thread2(void *x) {
- usleep(1000000);
+ sleep(1);
pthread_mutex_lock(&mtx);
mem[0] = 42;
pthread_mutex_unlock(&mtx);
diff --git a/compiler-rt/lib/tsan/lit_tests/ignore_race.cc b/compiler-rt/lib/tsan/lit_tests/ignore_race.cc
index d8f26ff46ca..7a60ca10c26 100644
--- a/compiler-rt/lib/tsan/lit_tests/ignore_race.cc
+++ b/compiler-rt/lib/tsan/lit_tests/ignore_race.cc
@@ -22,7 +22,7 @@ void *Thread(void *x) {
int main() {
pthread_t t;
pthread_create(&t, 0, Thread, 0);
- usleep(100000);
+ sleep(1);
Global = 43;
pthread_join(t, 0);
return 0;
diff --git a/compiler-rt/lib/tsan/lit_tests/memcpy_race.cc b/compiler-rt/lib/tsan/lit_tests/memcpy_race.cc
index a091df56301..806740dda24 100644
--- a/compiler-rt/lib/tsan/lit_tests/memcpy_race.cc
+++ b/compiler-rt/lib/tsan/lit_tests/memcpy_race.cc
@@ -15,7 +15,7 @@ void *Thread1(void *x) {
}
void *Thread2(void *x) {
- usleep(500*1000);
+ sleep(1);
memcpy(data+3, data2, 4);
return NULL;
}
diff --git a/compiler-rt/lib/tsan/lit_tests/mop_with_offset.cc b/compiler-rt/lib/tsan/lit_tests/mop_with_offset.cc
index 198afc68547..0c11ef6b918 100644
--- a/compiler-rt/lib/tsan/lit_tests/mop_with_offset.cc
+++ b/compiler-rt/lib/tsan/lit_tests/mop_with_offset.cc
@@ -11,7 +11,7 @@ void *Thread1(void *x) {
}
void *Thread2(void *x) {
- usleep(500*1000);
+ sleep(1);
char *p = (char*)x;
p[2] = 1;
return NULL;
diff --git a/compiler-rt/lib/tsan/lit_tests/mop_with_offset2.cc b/compiler-rt/lib/tsan/lit_tests/mop_with_offset2.cc
index 3cb3424555c..ee0d64a0afb 100644
--- a/compiler-rt/lib/tsan/lit_tests/mop_with_offset2.cc
+++ b/compiler-rt/lib/tsan/lit_tests/mop_with_offset2.cc
@@ -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;
diff --git a/compiler-rt/lib/tsan/lit_tests/mutex_destroy_locked.cc b/compiler-rt/lib/tsan/lit_tests/mutex_destroy_locked.cc
index 427c64345b6..8523f557857 100644
--- a/compiler-rt/lib/tsan/lit_tests/mutex_destroy_locked.cc
+++ b/compiler-rt/lib/tsan/lit_tests/mutex_destroy_locked.cc
@@ -12,7 +12,7 @@ int main() {
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;
diff --git a/compiler-rt/lib/tsan/lit_tests/mutexset1.cc b/compiler-rt/lib/tsan/lit_tests/mutexset1.cc
index 53486ed79cb..e27e0566a37 100644
--- a/compiler-rt/lib/tsan/lit_tests/mutexset1.cc
+++ b/compiler-rt/lib/tsan/lit_tests/mutexset1.cc
@@ -7,7 +7,7 @@ int Global;
pthread_mutex_t mtx;
void *Thread1(void *x) {
- usleep(100*1000);
+ sleep(1);
pthread_mutex_lock(&mtx);
Global++;
pthread_mutex_unlock(&mtx);
diff --git a/compiler-rt/lib/tsan/lit_tests/mutexset2.cc b/compiler-rt/lib/tsan/lit_tests/mutexset2.cc
index 7338ca12688..8c850438349 100644
--- a/compiler-rt/lib/tsan/lit_tests/mutexset2.cc
+++ b/compiler-rt/lib/tsan/lit_tests/mutexset2.cc
@@ -14,7 +14,7 @@ void *Thread1(void *x) {
}
void *Thread2(void *x) {
- usleep(100*1000);
+ sleep(1);
Global--;
return NULL;
}
diff --git a/compiler-rt/lib/tsan/lit_tests/mutexset3.cc b/compiler-rt/lib/tsan/lit_tests/mutexset3.cc
index 9a38bf39b5c..63123f844cb 100644
--- a/compiler-rt/lib/tsan/lit_tests/mutexset3.cc
+++ b/compiler-rt/lib/tsan/lit_tests/mutexset3.cc
@@ -8,7 +8,7 @@ pthread_mutex_t mtx1;
pthread_mutex_t mtx2;
void *Thread1(void *x) {
- usleep(100*1000);
+ sleep(1);
pthread_mutex_lock(&mtx1);
pthread_mutex_lock(&mtx2);
Global++;
diff --git a/compiler-rt/lib/tsan/lit_tests/mutexset4.cc b/compiler-rt/lib/tsan/lit_tests/mutexset4.cc
index 2a710129eda..68ed4756b9d 100644
--- a/compiler-rt/lib/tsan/lit_tests/mutexset4.cc
+++ b/compiler-rt/lib/tsan/lit_tests/mutexset4.cc
@@ -17,7 +17,7 @@ void *Thread1(void *x) {
}
void *Thread2(void *x) {
- usleep(100*1000);
+ sleep(1);
Global--;
return NULL;
}
diff --git a/compiler-rt/lib/tsan/lit_tests/mutexset5.cc b/compiler-rt/lib/tsan/lit_tests/mutexset5.cc
index 7b3140a3967..85fdadd81b7 100644
--- a/compiler-rt/lib/tsan/lit_tests/mutexset5.cc
+++ b/compiler-rt/lib/tsan/lit_tests/mutexset5.cc
@@ -8,7 +8,7 @@ pthread_mutex_t mtx1;
pthread_mutex_t mtx2;
void *Thread1(void *x) {
- usleep(100*1000);
+ sleep(1);
pthread_mutex_lock(&mtx1);
Global++;
pthread_mutex_unlock(&mtx1);
diff --git a/compiler-rt/lib/tsan/lit_tests/mutexset6.cc b/compiler-rt/lib/tsan/lit_tests/mutexset6.cc
index 38490365487..b28c21c5813 100644
--- a/compiler-rt/lib/tsan/lit_tests/mutexset6.cc
+++ b/compiler-rt/lib/tsan/lit_tests/mutexset6.cc
@@ -9,7 +9,7 @@ pthread_spinlock_t mtx2;
pthread_rwlock_t mtx3;
void *Thread1(void *x) {
- usleep(100*1000);
+ sleep(1);
pthread_mutex_lock(&mtx1);
Global++;
pthread_mutex_unlock(&mtx1);
diff --git a/compiler-rt/lib/tsan/lit_tests/mutexset7.cc b/compiler-rt/lib/tsan/lit_tests/mutexset7.cc
index 03ca9ae0394..141bde2b501 100644
--- a/compiler-rt/lib/tsan/lit_tests/mutexset7.cc
+++ b/compiler-rt/lib/tsan/lit_tests/mutexset7.cc
@@ -6,7 +6,7 @@
int Global;
void *Thread1(void *x) {
- usleep(100*1000);
+ sleep(1);
Global++;
return NULL;
}
diff --git a/compiler-rt/lib/tsan/lit_tests/race_on_barrier.c b/compiler-rt/lib/tsan/lit_tests/race_on_barrier.c
index 491201f13ba..3e76f8bf5e2 100644
--- a/compiler-rt/lib/tsan/lit_tests/race_on_barrier.c
+++ b/compiler-rt/lib/tsan/lit_tests/race_on_barrier.c
@@ -14,7 +14,7 @@ void *Thread1(void *x) {
}
void *Thread2(void *x) {
- usleep(1000000);
+ sleep(1);
pthread_barrier_wait(&B);
return NULL;
}
diff --git a/compiler-rt/lib/tsan/lit_tests/race_on_mutex.c b/compiler-rt/lib/tsan/lit_tests/race_on_mutex.c
index 95b4604abc0..de1c2d4160a 100644
--- a/compiler-rt/lib/tsan/lit_tests/race_on_mutex.c
+++ b/compiler-rt/lib/tsan/lit_tests/race_on_mutex.c
@@ -16,7 +16,7 @@ void *Thread1(void *x) {
}
void *Thread2(void *x) {
- usleep(1000000);
+ sleep(1);
pthread_mutex_lock(&Mtx);
Global = 43;
pthread_mutex_unlock(&Mtx);
diff --git a/compiler-rt/lib/tsan/lit_tests/race_with_finished_thread.cc b/compiler-rt/lib/tsan/lit_tests/race_with_finished_thread.cc
index 1d37b934948..cc7834af16a 100644
--- a/compiler-rt/lib/tsan/lit_tests/race_with_finished_thread.cc
+++ b/compiler-rt/lib/tsan/lit_tests/race_with_finished_thread.cc
@@ -19,7 +19,7 @@ void *Thread1(void *x) {
}
void *Thread2(void *x) {
- usleep(1000*1000);
+ sleep(1);
g_data = 43;
return NULL;
}
diff --git a/compiler-rt/lib/tsan/lit_tests/simple_stack.c b/compiler-rt/lib/tsan/lit_tests/simple_stack.c
index 322e15e4089..6de20cb63a8 100644
--- a/compiler-rt/lib/tsan/lit_tests/simple_stack.c
+++ b/compiler-rt/lib/tsan/lit_tests/simple_stack.c
@@ -24,7 +24,7 @@ void __attribute__((noinline)) bar2() {
}
void *Thread1(void *x) {
- usleep(1000000);
+ sleep(1);
bar1();
return NULL;
}
diff --git a/compiler-rt/lib/tsan/lit_tests/simple_stack2.cc b/compiler-rt/lib/tsan/lit_tests/simple_stack2.cc
index c1a82a3d254..bf27a15ffad 100644
--- a/compiler-rt/lib/tsan/lit_tests/simple_stack2.cc
+++ b/compiler-rt/lib/tsan/lit_tests/simple_stack2.cc
@@ -30,7 +30,7 @@ void __attribute__((noinline)) bar2() {
}
void *Thread1(void *x) {
- usleep(1000000);
+ sleep(1);
bar1();
return NULL;
}
diff --git a/compiler-rt/lib/tsan/lit_tests/sleep_sync.cc b/compiler-rt/lib/tsan/lit_tests/sleep_sync.cc
index ed563c096a5..c3d47d31174 100644
--- a/compiler-rt/lib/tsan/lit_tests/sleep_sync.cc
+++ b/compiler-rt/lib/tsan/lit_tests/sleep_sync.cc
@@ -5,7 +5,7 @@
int X = 0;
void MySleep() {
- usleep(50*1000);
+ sleep(1);
}
void *Thread(void *p) {
@@ -25,6 +25,6 @@ int main() {
// 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
diff --git a/compiler-rt/lib/tsan/lit_tests/sleep_sync2.cc b/compiler-rt/lib/tsan/lit_tests/sleep_sync2.cc
index 9a5182681e6..d9961bccc80 100644
--- a/compiler-rt/lib/tsan/lit_tests/sleep_sync2.cc
+++ b/compiler-rt/lib/tsan/lit_tests/sleep_sync2.cc
@@ -11,7 +11,7 @@ void *Thread(void *p) {
int main() {
pthread_t t;
- usleep(100*1000);
+ sleep(1);
pthread_create(&t, 0, Thread, 0);
X = 43;
pthread_join(t, 0);
diff --git a/compiler-rt/lib/tsan/lit_tests/thread_name.cc b/compiler-rt/lib/tsan/lit_tests/thread_name.cc
index dcb1d639487..04081c14d0c 100644
--- a/compiler-rt/lib/tsan/lit_tests/thread_name.cc
+++ b/compiler-rt/lib/tsan/lit_tests/thread_name.cc
@@ -8,7 +8,7 @@ extern "C" void AnnotateThreadName(const char *f, int l, const char *name);
int Global;
void *Thread1(void *x) {
- usleep(100*1000);
+ sleep(1);
AnnotateThreadName(__FILE__, __LINE__, "Thread1");
Global++;
return NULL;
diff --git a/compiler-rt/lib/tsan/lit_tests/write_in_reader_lock.cc b/compiler-rt/lib/tsan/lit_tests/write_in_reader_lock.cc
index f22c8d7233d..db8bac32b6e 100644
--- a/compiler-rt/lib/tsan/lit_tests/write_in_reader_lock.cc
+++ b/compiler-rt/lib/tsan/lit_tests/write_in_reader_lock.cc
@@ -9,7 +9,7 @@ void *Thread1(void *p) {
(void)p;
pthread_rwlock_rdlock(&rwlock);
// Write under reader lock.
- usleep(100);
+ sleep(1);
GLOB++;
pthread_rwlock_unlock(&rwlock);
return 0;
OpenPOWER on IntegriCloud