[tor-commits] [tor] 21/77: track how many in-flight hs-side rend circs

[gitolite role via tor-commits <tor-commits@xxxxxxxxxxxxxxxxxxxx>]

This is an automated email from the git hooks/post-receive script.

dgoulet pushed a commit to branch main
in repository tor.

commit b95bd5017f09dd9385e54e9b3b6a49474b4dc9a8
Author: Roger Dingledine <arma@xxxxxxxxxxxxxx>
AuthorDate: Thu Jun 30 22:01:15 2022 -0400

    track how many in-flight hs-side rend circs
    
    not used in decision-making yet, but it's all ready to use in a
    "don't dequeue any more if we have too many in-flight" kind of way
---
 src/feature/hs/hs_circuit.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/src/feature/hs/hs_circuit.c b/src/feature/hs/hs_circuit.c
index 0c71443879..26dd600f1d 100644
--- a/src/feature/hs/hs_circuit.c
+++ b/src/feature/hs/hs_circuit.c
@@ -689,6 +689,27 @@ trim_rend_pqueue(hs_pow_service_state_t *pow_state, time_t now)
   smartlist_free(old_pqueue);
 }
 
+/** Count up how many pending outgoing (CIRCUIT_PURPOSE_S_CONNECT_REND)
+ * circuits there are for this service. Used in the PoW rate limiting
+ * world to decide whether it's time to launch any new ones.
+ */
+static int
+count_service_rp_circuits_pending(hs_service_t *service)
+{
+  origin_circuit_t *ocirc = NULL;
+  int count = 0;
+  while ((ocirc = circuit_get_next_by_purpose(ocirc,
+                            CIRCUIT_PURPOSE_S_CONNECT_REND))) {
+    /* Count up circuits that are v3 and for this service. */
+    if (ocirc->hs_ident != NULL &&
+        ed25519_pubkey_eq(&ocirc->hs_ident->identity_pk,
+                          &service->keys.identity_pk)) {
+      count++;
+    }
+  }
+  return count;
+}
+
 /** 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
@@ -705,6 +726,11 @@ handle_rend_pqueue_cb(mainloop_event_t *ev, void *arg)
 
   (void) ev; /* Not using the returned event, make compiler happy. */
 
+  log_notice(LD_REND, "Considering launching more rendezvous responses. "
+             "%d in-flight, %d pending.",
+             count_service_rp_circuits_pending(service),
+             smartlist_len(pow_state->rend_request_pqueue));
+
   /* Process rendezvous request until the maximum per mainloop run. */
   while (smartlist_len(pow_state->rend_request_pqueue) > 0) {
     /* Pop next request by effort. */

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits