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

Merge branch 'maint-0.4.7'

Browse Source
This commit is contained in:
David Goulet 2022-11-08 12:47:17 -05:00
commit 56ee2131f1
3 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,8 +52,12 @@
/** Moving average of the cc->cwnd from each circuit exiting slowstart. */
double cc_stats_vegas_exit_ss_cwnd_ma = 0;
double cc_stats_vegas_gamma_drop_ma = 0;
double cc_stats_vegas_delta_drop_ma = 0;
/* Running count of this moving average. Needed so we can update it. */
static double stats_cwnd_exit_ss_ma_count = 0;
static double stats_cwnd_gamma_drop_ma_count = 0;
static double stats_cwnd_delta_drop_ma_count = 0;
/** Stats on how many times we reached "delta" param. */
uint64_t cc_stats_vegas_above_delta = 0;
@ -331,8 +335,19 @@ congestion_control_vegas_process_sendme(congestion_control_t *cc,
cc->next_cc_event = 1; // Technically irellevant, but for consistency
}
} else {
uint64_t old_cwnd = cc->cwnd;
uint64_t cwnd_diff;
/* Congestion signal: Set cwnd to gamma threshhold */
cc->cwnd = vegas_bdp(cc) + cc->vegas_params.gamma;
/* Account the amount we reduced the cwnd by for the gamma cutoff */
cwnd_diff = (old_cwnd > cc->cwnd ? old_cwnd - cc->cwnd : 0);
stats_cwnd_gamma_drop_ma_count++;
cc_stats_vegas_gamma_drop_ma =
stats_update_running_avg(cc_stats_vegas_gamma_drop_ma,
cwnd_diff, stats_cwnd_gamma_drop_ma_count);
congestion_control_vegas_exit_slow_start(circ, cc);
}
@ -344,7 +359,20 @@ congestion_control_vegas_process_sendme(congestion_control_t *cc,
/* After slow start, We only update once per window */
} else if (cc->next_cc_event == 0) {
if (queue_use > cc->vegas_params.delta) {
uint64_t old_cwnd = cc->cwnd;
uint64_t cwnd_diff;
/* If we are above the delta threshhold, drop cwnd down to the
* delta threshhold. */
cc->cwnd = vegas_bdp(cc) + cc->vegas_params.delta - CWND_INC(cc);
/* Account the amount we reduced the cwnd by for the gamma cutoff */
cwnd_diff = (old_cwnd > cc->cwnd ? old_cwnd - cc->cwnd : 0);
stats_cwnd_delta_drop_ma_count++;
cc_stats_vegas_delta_drop_ma =
stats_update_running_avg(cc_stats_vegas_delta_drop_ma,
cwnd_diff, stats_cwnd_delta_drop_ma_count);
cc_stats_vegas_above_delta++;
} else if (queue_use > cc->vegas_params.beta || cc->blocked_chan) {
cc->cwnd -= CWND_INC(cc);

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

@ -13,6 +13,8 @@
#include "core/or/circuit_st.h"
extern double cc_stats_vegas_exit_ss_cwnd_ma;
extern double cc_stats_vegas_gamma_drop_ma;
extern double cc_stats_vegas_delta_drop_ma;
extern uint64_t cc_stats_vegas_above_delta;
extern uint64_t cc_stats_vegas_above_ss_cwnd_max;

18
src/feature/relay/relay_metrics.c
View File

@ -392,6 +392,15 @@ fill_cc_values(void)
metrics_store_entry_update(sentry,
tor_llround(cc_stats_vegas_exit_ss_cwnd_ma));
sentry = metrics_store_add(the_store, rentry->type, rentry->name,
rentry->help);
metrics_store_entry_add_label(sentry,
metrics_format_label("state", "slow_start_exit"));
metrics_store_entry_add_label(sentry,
metrics_format_label("action", "gamma_drop"));
metrics_store_entry_update(sentry,
tor_llround(cc_stats_vegas_gamma_drop_ma));
sentry = metrics_store_add(the_store, rentry->type, rentry->name,
rentry->help);
metrics_store_entry_add_label(sentry,
@ -461,6 +470,15 @@ fill_cc_values(void)
metrics_store_entry_add_label(sentry,
metrics_format_label("action", "above_ss_cwnd_max"));
metrics_store_entry_update(sentry, cc_stats_vegas_above_ss_cwnd_max);
sentry = metrics_store_add(the_store, rentry->type, rentry->name,
rentry->help);
metrics_store_entry_add_label(sentry,
metrics_format_label("state", "process_sendme"));
metrics_store_entry_add_label(sentry,
metrics_format_label("action", "delta_drop"));
metrics_store_entry_update(sentry,
tor_llround(cc_stats_vegas_delta_drop_ma));
}
/** Helper: Fill in single stream metrics output. */