[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor] 70/77: hs_pow: review feedback, use MAX for max_trimmed_effort
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main
in repository tor.
commit a6138486f7e21cd1c3da7527ca1e816acfa5b1a2
Author: Micah Elizabeth Scott <beth@xxxxxxxxxxxxxx>
AuthorDate: Thu Apr 6 09:29:37 2023 -0700
hs_pow: review feedback, use MAX for max_trimmed_effort
Signed-off-by: Micah Elizabeth Scott <beth@xxxxxxxxxxxxxx>
---
src/feature/hs/hs_circuit.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/feature/hs/hs_circuit.c b/src/feature/hs/hs_circuit.c
index 3978c69567..1287b2beda 100644
--- a/src/feature/hs/hs_circuit.c
+++ b/src/feature/hs/hs_circuit.c
@@ -680,8 +680,8 @@ trim_rend_pqueue(hs_pow_service_state_t *pow_state, time_t now)
log_info(LD_REND, "While trimming, rend request has been pending "
"for too long; discarding.");
- if (req->rdv_data.pow_effort > pow_state->max_trimmed_effort)
- pow_state->max_trimmed_effort = req->rdv_data.pow_effort;
+ pow_state->max_trimmed_effort = MAX(pow_state->max_trimmed_effort,
+ req->rdv_data.pow_effort);
free_pending_rend(req);
} else {
@@ -694,9 +694,8 @@ trim_rend_pqueue(hs_pow_service_state_t *pow_state, time_t now)
/* Ok, we have rescued all the entries we want to keep. The rest are
* all excess. */
SMARTLIST_FOREACH_BEGIN(old_pqueue, pending_rend_t *, req) {
- if (req->rdv_data.pow_effort > pow_state->max_trimmed_effort)
- pow_state->max_trimmed_effort = req->rdv_data.pow_effort;
-
+ pow_state->max_trimmed_effort = MAX(pow_state->max_trimmed_effort,
+ req->rdv_data.pow_effort);
free_pending_rend(req);
} SMARTLIST_FOREACH_END(req);
smartlist_free(old_pqueue);
--
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