nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 05:26:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

metrics: Record percentage of blocked channels

Browse Source 
Part of #40708.
This commit is contained in:
Mike Perry 2022-11-08 18:25:07 +00:00
parent 00633bc619
commit 59bef48490
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

@ -54,10 +54,14 @@
double cc_stats_vegas_exit_ss_cwnd_ma = 0; double cc_stats_vegas_exit_ss_cwnd_ma = 0;
double cc_stats_vegas_gamma_drop_ma = 0; double cc_stats_vegas_gamma_drop_ma = 0;
double cc_stats_vegas_delta_drop_ma = 0; double cc_stats_vegas_delta_drop_ma = 0;
double cc_stats_vegas_ss_csig_blocked_ma = 0;
double cc_stats_vegas_csig_blocked_ma = 0;
/* Running count of this moving average. Needed so we can update it. */ /* 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_exit_ss_ma_count = 0;
static double stats_cwnd_gamma_drop_ma_count = 0; static double stats_cwnd_gamma_drop_ma_count = 0;
static double stats_cwnd_delta_drop_ma_count = 0; static double stats_cwnd_delta_drop_ma_count = 0;
static double stats_ss_csig_blocked_ma_count = 0;
static double stats_csig_blocked_ma_count = 0;
/** Stats on how many times we reached "delta" param. */ /** Stats on how many times we reached "delta" param. */
uint64_t cc_stats_vegas_above_delta = 0; uint64_t cc_stats_vegas_above_delta = 0;
@ -348,6 +352,18 @@ congestion_control_vegas_process_sendme(congestion_control_t *cc,
stats_update_running_avg(cc_stats_vegas_gamma_drop_ma, stats_update_running_avg(cc_stats_vegas_gamma_drop_ma,
cwnd_diff, stats_cwnd_gamma_drop_ma_count); cwnd_diff, stats_cwnd_gamma_drop_ma_count);
stats_ss_csig_blocked_ma_count++;
/* Compute the percentage we experience a blocked csig vs RTT sig */
if (cc->blocked_chan) {
cc_stats_vegas_ss_csig_blocked_ma =
stats_update_running_avg(cc_stats_vegas_ss_csig_blocked_ma,
100, stats_ss_csig_blocked_ma_count);
} else {
cc_stats_vegas_ss_csig_blocked_ma =
stats_update_running_avg(cc_stats_vegas_ss_csig_blocked_ma,
0, stats_ss_csig_blocked_ma_count);
}
congestion_control_vegas_exit_slow_start(circ, cc); congestion_control_vegas_exit_slow_start(circ, cc);
} }
@ -375,6 +391,18 @@ congestion_control_vegas_process_sendme(congestion_control_t *cc,
cc_stats_vegas_above_delta++; cc_stats_vegas_above_delta++;
} else if (queue_use > cc->vegas_params.beta || cc->blocked_chan) { } else if (queue_use > cc->vegas_params.beta || cc->blocked_chan) {
stats_csig_blocked_ma_count++;
/* Compute the percentage we experience a blocked csig vs RTT sig */
if (cc->blocked_chan) {
cc_stats_vegas_csig_blocked_ma =
stats_update_running_avg(cc_stats_vegas_csig_blocked_ma,
100, stats_csig_blocked_ma_count);
} else {
cc_stats_vegas_csig_blocked_ma =
stats_update_running_avg(cc_stats_vegas_csig_blocked_ma,
0, stats_csig_blocked_ma_count);
}
cc->cwnd -= CWND_INC(cc); cc->cwnd -= CWND_INC(cc);
} else if (queue_use < cc->vegas_params.alpha) { } else if (queue_use < cc->vegas_params.alpha) {
cc->cwnd += CWND_INC(cc); cc->cwnd += CWND_INC(cc);

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

@ -15,6 +15,8 @@
extern double cc_stats_vegas_exit_ss_cwnd_ma; extern double cc_stats_vegas_exit_ss_cwnd_ma;
extern double cc_stats_vegas_gamma_drop_ma; extern double cc_stats_vegas_gamma_drop_ma;
extern double cc_stats_vegas_delta_drop_ma; extern double cc_stats_vegas_delta_drop_ma;
extern double cc_stats_vegas_ss_csig_blocked_ma;
extern double cc_stats_vegas_csig_blocked_ma;
extern uint64_t cc_stats_vegas_above_delta; extern uint64_t cc_stats_vegas_above_delta;
extern uint64_t cc_stats_vegas_above_ss_cwnd_max; extern uint64_t cc_stats_vegas_above_ss_cwnd_max;

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

@ -401,6 +401,15 @@ fill_cc_values(void)
metrics_store_entry_update(sentry, metrics_store_entry_update(sentry,
tor_llround(cc_stats_vegas_gamma_drop_ma)); 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,
metrics_format_label("state", "slow_start_exit"));
metrics_store_entry_add_label(sentry,
metrics_format_label("action", "chan_blocked_pct"));
metrics_store_entry_update(sentry,
tor_llround(cc_stats_vegas_ss_csig_blocked_ma));
sentry = metrics_store_add(the_store, rentry->type, rentry->name, sentry = metrics_store_add(the_store, rentry->type, rentry->name,
rentry->help); rentry->help);
metrics_store_entry_add_label(sentry, metrics_store_entry_add_label(sentry,
@ -479,6 +488,15 @@ fill_cc_values(void)
metrics_format_label("action", "delta_drop")); metrics_format_label("action", "delta_drop"));
metrics_store_entry_update(sentry, metrics_store_entry_update(sentry,
tor_llround(cc_stats_vegas_delta_drop_ma)); tor_llround(cc_stats_vegas_delta_drop_ma));
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", "chan_blocked_pct"));
metrics_store_entry_update(sentry,
tor_llround(cc_stats_vegas_csig_blocked_ma));
} }
/** Helper: Fill in single stream metrics output. */ /** Helper: Fill in single stream metrics output. */