gre-ilya/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "test: make barrier test more rigorous"

Browse Source 
This reverts commit 6c6c922167.

It introduced a race condition which made tests fail on Linux and SunOS.

Closes #1340
This commit is contained in:
Saúl Ibarra Corretgé 2014-07-02 00:13:29 +02:00
parent 4bace4d67c
commit 1830a3cd91
1 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
test/test-barrier.c
View File

@ -41,10 +41,6 @@ static void worker(void* arg) {
uv_sleep(c->delay); uv_sleep(c->delay);
c->worker_barrier_wait_rval = uv_barrier_wait(&c->barrier); c->worker_barrier_wait_rval = uv_barrier_wait(&c->barrier);
if (c->worker_barrier_wait_rval == 1) {
uv_barrier_destroy(&c->barrier);
ASSERT(c->main_barrier_wait_rval == 0);
}
} }
@ -53,21 +49,16 @@ TEST_IMPL(barrier_1) {
worker_config wc; worker_config wc;
memset(&wc, 0, sizeof(wc)); memset(&wc, 0, sizeof(wc));
wc.main_barrier_wait_rval = -1;
wc.worker_barrier_wait_rval = -1;
ASSERT(0 == uv_barrier_init(&wc.barrier, 2)); ASSERT(0 == uv_barrier_init(&wc.barrier, 2));
ASSERT(0 == uv_thread_create(&thread, worker, &wc)); ASSERT(0 == uv_thread_create(&thread, worker, &wc));
uv_sleep(100); uv_sleep(100);
wc.main_barrier_wait_rval = uv_barrier_wait(&wc.barrier); wc.main_barrier_wait_rval = uv_barrier_wait(&wc.barrier);
if (wc.main_barrier_wait_rval == 1) {
uv_barrier_destroy(&wc.barrier);
ASSERT(wc.worker_barrier_wait_rval == 0);
}
ASSERT(0 == uv_thread_join(&thread)); ASSERT(0 == uv_thread_join(&thread));
uv_barrier_destroy(&wc.barrier);
ASSERT(1 == (wc.main_barrier_wait_rval ^ wc.worker_barrier_wait_rval)); ASSERT(1 == (wc.main_barrier_wait_rval ^ wc.worker_barrier_wait_rval));
return 0; return 0;
@ -80,19 +71,15 @@ TEST_IMPL(barrier_2) {
memset(&wc, 0, sizeof(wc)); memset(&wc, 0, sizeof(wc));
wc.delay = 100; wc.delay = 100;
wc.main_barrier_wait_rval = -1;
wc.worker_barrier_wait_rval = -1;
ASSERT(0 == uv_barrier_init(&wc.barrier, 2)); ASSERT(0 == uv_barrier_init(&wc.barrier, 2));
ASSERT(0 == uv_thread_create(&thread, worker, &wc)); ASSERT(0 == uv_thread_create(&thread, worker, &wc));
wc.main_barrier_wait_rval = uv_barrier_wait(&wc.barrier); wc.main_barrier_wait_rval = uv_barrier_wait(&wc.barrier);
if (wc.main_barrier_wait_rval == 1) {
uv_barrier_destroy(&wc.barrier);
ASSERT(wc.worker_barrier_wait_rval == 0);
}
ASSERT(0 == uv_thread_join(&thread)); ASSERT(0 == uv_thread_join(&thread));
uv_barrier_destroy(&wc.barrier);
ASSERT(1 == (wc.main_barrier_wait_rval ^ wc.worker_barrier_wait_rval)); ASSERT(1 == (wc.main_barrier_wait_rval ^ wc.worker_barrier_wait_rval));
return 0; return 0;
@ -104,19 +91,15 @@ TEST_IMPL(barrier_3) {
worker_config wc; worker_config wc;
memset(&wc, 0, sizeof(wc)); memset(&wc, 0, sizeof(wc));
wc.main_barrier_wait_rval = -1;
wc.worker_barrier_wait_rval = -1;
ASSERT(0 == uv_barrier_init(&wc.barrier, 2)); ASSERT(0 == uv_barrier_init(&wc.barrier, 2));
ASSERT(0 == uv_thread_create(&thread, worker, &wc)); ASSERT(0 == uv_thread_create(&thread, worker, &wc));
wc.main_barrier_wait_rval = uv_barrier_wait(&wc.barrier); wc.main_barrier_wait_rval = uv_barrier_wait(&wc.barrier);
if (wc.main_barrier_wait_rval == 1) {
uv_barrier_destroy(&wc.barrier);
ASSERT(wc.worker_barrier_wait_rval == 0);
}
ASSERT(0 == uv_thread_join(&thread)); ASSERT(0 == uv_thread_join(&thread));
uv_barrier_destroy(&wc.barrier);
ASSERT(1 == (wc.main_barrier_wait_rval ^ wc.worker_barrier_wait_rval)); ASSERT(1 == (wc.main_barrier_wait_rval ^ wc.worker_barrier_wait_rval));
return 0; return 0;