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

Clean up next_cc_event handling.

Browse Source
This commit is contained in:
Mike Perry 2022-12-21 01:18:28 +00:00 committed by David Goulet
parent 48de1a392e
commit f4499bb5e2
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/or/congestion_control_st.h
View File

@ -231,7 +231,7 @@ static inline uint64_t CWND_UPDATE_RATE(const struct congestion_control_t *cc)
* of acks */ * of acks */
if (cc->in_slow_start) { if (cc->in_slow_start) {
return ((cc->cwnd + cc->sendme_inc/2)/cc->sendme_inc); return 1;
} else { } else {
return ((cc->cwnd + cc->cwnd_inc_rate*cc->sendme_inc/2) return ((cc->cwnd + cc->cwnd_inc_rate*cc->sendme_inc/2)
/ (cc->cwnd_inc_rate*cc->sendme_inc)); / (cc->cwnd_inc_rate*cc->sendme_inc));

14
src/core/or/congestion_control_vegas.c
View File

@ -301,7 +301,6 @@ congestion_control_vegas_exit_slow_start(const circuit_t *circ,
{ {
congestion_control_vegas_log(circ, cc); congestion_control_vegas_log(circ, cc);
cc->in_slow_start = 0; cc->in_slow_start = 0;
cc->next_cc_event = CWND_UPDATE_RATE(cc);
congestion_control_vegas_log(circ, cc); congestion_control_vegas_log(circ, cc);
/* Update metricsport metrics */ /* Update metricsport metrics */
@ -445,11 +444,11 @@ congestion_control_vegas_process_sendme(congestion_control_t *cc,
if (cc->cwnd_full) { if (cc->cwnd_full) {
/* Get the "Limited Slow Start" increment */ /* Get the "Limited Slow Start" increment */
uint64_t inc = rfc3742_ss_inc(cc); uint64_t inc = rfc3742_ss_inc(cc);
cc->cwnd += inc;
// Check if inc is less than what we would do in steady-state // Check if inc is less than what we would do in steady-state
// avoidance // avoidance
if (inc*SENDME_PER_CWND(cc) <= CWND_INC(cc)) { if (inc*SENDME_PER_CWND(cc) <= CWND_INC(cc)) {
cc->cwnd += inc;
congestion_control_vegas_exit_slow_start(circ, cc); congestion_control_vegas_exit_slow_start(circ, cc);
cc_stats_vegas_below_ss_inc_floor++; cc_stats_vegas_below_ss_inc_floor++;
@ -458,9 +457,6 @@ congestion_control_vegas_process_sendme(congestion_control_t *cc,
cc_stats_vegas_ss_csig_blocked_ma = cc_stats_vegas_ss_csig_blocked_ma =
stats_update_running_avg(cc_stats_vegas_ss_csig_blocked_ma, stats_update_running_avg(cc_stats_vegas_ss_csig_blocked_ma,
0); 0);
} else {
cc->cwnd += inc;
cc->next_cc_event = 1; // Technically irellevant, but for consistency
} }
} }
} else { } else {
@ -581,9 +577,6 @@ congestion_control_vegas_process_sendme(congestion_control_t *cc,
/* cwnd can never fall below 1 increment */ /* cwnd can never fall below 1 increment */
cc->cwnd = MAX(cc->cwnd, cc->cwnd_min); cc->cwnd = MAX(cc->cwnd, cc->cwnd_min);
/* Schedule next update */
cc->next_cc_event = CWND_UPDATE_RATE(cc);
congestion_control_vegas_log(circ, cc); congestion_control_vegas_log(circ, cc);
/* Update metrics */ /* Update metrics */
@ -602,10 +595,13 @@ congestion_control_vegas_process_sendme(congestion_control_t *cc,
} }
} }
/* Once per cwnd, reset the cwnd full state */ /* Reset event counters */
if (cc->next_cwnd_event == 0) { if (cc->next_cwnd_event == 0) {
cc->next_cwnd_event = SENDME_PER_CWND(cc); cc->next_cwnd_event = SENDME_PER_CWND(cc);
} }
if (cc->next_cc_event == 0) {
cc->next_cc_event = CWND_UPDATE_RATE(cc);
}
/* Decide if enough time has passed to reset the cwnd utilization */ /* Decide if enough time has passed to reset the cwnd utilization */
if (cwnd_full_reset(cc)) if (cwnd_full_reset(cc))