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

Fix the selection of events to cancel in test_workqueue.c

Browse Source 
Our previous algorithm had a nonzero probability of picking no
events to cancel, which is of course incorrect.  The new code uses
Vitter's good old reservoir sampling "algorithm R" from 1985.

Fixes bug 26008; bugfix on 0.2.6.3-alpha.
This commit is contained in:
Nick Mathewson 2018-05-06 21:03:26 -04:00
parent f36656cada
commit 6e3e96d2ff
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
changes/ticket26008 Normal file
View File

@ -0,0 +1,7 @@
o Minor bugfixes (test):
- When testing workqueue event-cancellation, make sure that we actually
cancel an event, and that cancel each event with equal probability.
(It was previously possible, though extremely unlikely, for our
event-canceling test not to cancel any events.) Fixes bug 26008;
bugfix on 0.2.6.3-alpha.

12
src/test/test_workqueue.c
View File

@ -224,7 +224,8 @@ add_n_work_items(threadpool_t *tp, int n)
workqueue_entry_t **to_cancel; workqueue_entry_t **to_cancel;
workqueue_entry_t *ent; workqueue_entry_t *ent;
to_cancel = tor_malloc(sizeof(workqueue_entry_t*) * opt_n_cancel); // We'll choose randomly which entries to cancel.
to_cancel = tor_calloc(opt_n_cancel, sizeof(workqueue_entry_t*));
while (n_queued++ < n) { while (n_queued++ < n) {
ent = add_work(tp); ent = add_work(tp);
@ -233,9 +234,14 @@ add_n_work_items(threadpool_t *tp, int n)
tor_libevent_exit_loop_after_delay(tor_libevent_get_base(), NULL); tor_libevent_exit_loop_after_delay(tor_libevent_get_base(), NULL);
return -1; return -1;
} }
if (n_try_cancel < opt_n_cancel &&
tor_weak_random_range(&weak_rng, n) < opt_n_cancel) { if (n_try_cancel < opt_n_cancel) {
to_cancel[n_try_cancel++] = ent; to_cancel[n_try_cancel++] = ent;
} else {
int p = tor_weak_random_range(&weak_rng, n_queued);
if (p < n_try_cancel) {
to_cancel[p] = ent;
}
} }
} }