nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 12:23:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tor-github/pr/331' into maint-0.2.9

Browse Source
This commit is contained in:
teor 2019-03-14 06:35:05 +10:00
commit 9daae1b302
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug27073 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (testing):
- Revise the "conditionvar_timeout" test so that it succeeds even
on heavily loaded systems where the test threads are not scheduled
within 200 msec. Fixes bug 27073; bugfix on 0.2.6.3-alpha.

30
src/test/test_threads.c
View File

@ -234,25 +234,33 @@ test_threads_conditionvar(void *arg)
if (timeout) { if (timeout) {
ti->tv = &msec100; ti->tv = &msec100;
} }
#define SPIN_UNTIL(condition,sleep_msec) \
while (1) { \
tor_mutex_acquire(ti->mutex); \
if (condition) { \
break; \
} \
tor_mutex_release(ti->mutex); \
tor_sleep_msec(sleep_msec); \
}
spawn_func(cv_test_thr_fn_, ti); spawn_func(cv_test_thr_fn_, ti);
spawn_func(cv_test_thr_fn_, ti); spawn_func(cv_test_thr_fn_, ti);
spawn_func(cv_test_thr_fn_, ti); spawn_func(cv_test_thr_fn_, ti);
spawn_func(cv_test_thr_fn_, ti); spawn_func(cv_test_thr_fn_, ti);
tor_mutex_acquire(ti->mutex); SPIN_UNTIL(ti->n_threads == 4, 10);
time_t started_at = time(NULL);
ti->addend = 7; ti->addend = 7;
ti->shutdown = 1; ti->shutdown = 1;
tor_cond_signal_one(ti->cond); tor_cond_signal_one(ti->cond);
tor_mutex_release(ti->mutex); tor_mutex_release(ti->mutex);
#define SPIN() \ #define SPIN() \
while (1) { \ SPIN_UNTIL(ti->addend == 0, 0)
tor_mutex_acquire(ti->mutex); \
if (ti->addend == 0) { \
break; \
} \
tor_mutex_release(ti->mutex); \
}
SPIN(); SPIN();
@ -279,8 +287,9 @@ test_threads_conditionvar(void *arg)
if (!timeout) { if (!timeout) {
tt_int_op(ti->n_shutdown, ==, 4); tt_int_op(ti->n_shutdown, ==, 4);
} else { } else {
tor_sleep_msec(200); const int GIVE_UP_AFTER_SEC = 30;
tor_mutex_acquire(ti->mutex); SPIN_UNTIL((ti->n_timeouts == 2 ||
time(NULL) >= started_at + GIVE_UP_AFTER_SEC), 10);
tt_int_op(ti->n_shutdown, ==, 2); tt_int_op(ti->n_shutdown, ==, 2);
tt_int_op(ti->n_timeouts, ==, 2); tt_int_op(ti->n_timeouts, ==, 2);
tor_mutex_release(ti->mutex); tor_mutex_release(ti->mutex);
@ -301,4 +310,3 @@ struct testcase_t thread_tests[] = {
&passthrough_setup, (void*)"tv" }, &passthrough_setup, (void*)"tv" },
END_OF_TESTCASES END_OF_TESTCASES
}; };