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

sort pqueue ties by time-added

Browse Source 
our pqueue implementation does bizarre unspecified things with
ordering of elements that are equal. it certainly doesn't do any
sort of "first in first out" property that i was expecting.

now make it explicit by saying that "equal-effort, added-earlier" is
higher priority.
This commit is contained in:
Roger Dingledine 2022-07-01 16:29:46 -04:00 committed by Micah Elizabeth Scott
parent 13f6258245
commit a575e35c17
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/feature/hs/hs_circuit.c
View File

@ -624,6 +624,11 @@ compare_rend_request_by_effort_(const void *_a, const void *_b)
if (a->rdv_data.pow_effort > b->rdv_data.pow_effort) { if (a->rdv_data.pow_effort > b->rdv_data.pow_effort) {
return -1; return -1;
} else if (a->rdv_data.pow_effort == b->rdv_data.pow_effort) { } else if (a->rdv_data.pow_effort == b->rdv_data.pow_effort) {
/* tie-breaker! use the time it was added to the queue. older better. */
if (a->enqueued_ts < b->enqueued_ts)
return -1;
if (a->enqueued_ts > b->enqueued_ts)
return 1;
return 0; return 0;
} else { } else {
return 1; return 1;
@ -780,8 +785,10 @@ handle_rend_pqueue_cb(mainloop_event_t *ev, void *arg)
offsetof(pending_rend_t, idx)); offsetof(pending_rend_t, idx));
log_notice(LD_REND, "Dequeued pending rendezvous request with effort: %u. " log_notice(LD_REND, "Dequeued pending rendezvous request with effort: %u. "
"Waited %d. "
"Remaining requests: %u", "Remaining requests: %u",
req->rdv_data.pow_effort, req->rdv_data.pow_effort,
(int)(now - req->enqueued_ts),
smartlist_len(pow_state->rend_request_pqueue)); smartlist_len(pow_state->rend_request_pqueue));
if (queued_rend_request_is_too_old(req, now)) { if (queued_rend_request_is_too_old(req, now)) {