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

hs: Handle multiple rend request per mainloop run

Browse Source 
Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
David Goulet 2022-06-30 09:53:41 -04:00 committed by Micah Elizabeth Scott
parent c2f6b057b8
commit bc9fe5a6f8
1 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -617,32 +617,47 @@ compare_rend_request_by_effort_(const void *_a, const void *_b)
} }
} }
/** How many rendezvous request we handle per mainloop event. Per prop327,
* handling an INTRODUCE2 cell takes on average 5.56msec on an average CPU and
* so it means that launching this max amount of circuits is well below 0.08
* seconds which we believe is negligable on the whole mainloop. */
#define MAX_REND_REQUEST_PER_MAINLOOP 16
static void static void
handle_rend_pqueue_cb(mainloop_event_t *ev, void *arg) handle_rend_pqueue_cb(mainloop_event_t *ev, void *arg)
{ {
(void) ev; /* Not using the returned event, make compiler happy. */ int count = 0;
hs_service_t *service = arg; hs_service_t *service = arg;
hs_pow_service_state_t *pow_state = service->state.pow_state; hs_pow_service_state_t *pow_state = service->state.pow_state;
/* Pop next request by effort. */ (void) ev; /* Not using the returned event, make compiler happy. */
pending_rend_t *req =
smartlist_pqueue_pop(pow_state->rend_request_pqueue,
compare_rend_request_by_effort_,
offsetof(pending_rend_t, idx));
log_info(LD_REND, "Dequeued pending rendezvous request with effort: %u. " /* Process rendezvous request until the maximum per mainloop run. */
"Remaining requests: %u", while (smartlist_len(pow_state->rend_request_pqueue) > 0) {
req->rdv_data.pow_effort, if (++count == MAX_REND_REQUEST_PER_MAINLOOP) {
smartlist_len(pow_state->rend_request_pqueue)); break;
}
/* Launch the rendezvous circuit. */ /* Pop next request by effort. */
launch_rendezvous_point_circuit(service, &req->ip_auth_pubkey, pending_rend_t *req =
&req->ip_enc_key_kp, &req->rdv_data); smartlist_pqueue_pop(pow_state->rend_request_pqueue,
compare_rend_request_by_effort_,
offsetof(pending_rend_t, idx));
/* Clean memory. */ log_info(LD_REND, "Dequeued pending rendezvous request with effort: %u. "
link_specifier_smartlist_free(req->rdv_data.link_specifiers); "Remaining requests: %u",
memwipe(req, 0, sizeof(pending_rend_t)); req->rdv_data.pow_effort,
tor_free(req); smartlist_len(pow_state->rend_request_pqueue));
/* Launch the rendezvous circuit. */
launch_rendezvous_point_circuit(service, &req->ip_auth_pubkey,
&req->ip_enc_key_kp, &req->rdv_data);
/* Clean memory. */
link_specifier_smartlist_free(req->rdv_data.link_specifiers);
memwipe(req, 0, sizeof(pending_rend_t));
tor_free(req);
}
/* If there are still some pending rendezvous circuits in the pqueue then /* If there are still some pending rendezvous circuits in the pqueue then
* reschedule the event in order to continue handling them. */ * reschedule the event in order to continue handling them. */