torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

metrics: Reorganize state labels so rate() can be applied

Browse Source 
Part of #40708.
This commit is contained in:
Mike Perry
2022-11-08 20:59:36 +00:00
committed by David Goulet
parent 09d32ac667
commit 04fafeb2dd
1 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/feature/relay/relay_metrics.c
+46 -46
View File
@@ -392,24 +392,6 @@ 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,
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,
rentry->help);
metrics_store_entry_add_label(sentry,
@@ -431,43 +413,43 @@ fill_cc_values(void)
sentry = metrics_store_add(the_store, rentry->type, rentry->name,
rentry->help);
metrics_store_entry_add_label(sentry,
metrics_format_label("state", "xoff"));
metrics_format_label("state", "flow_control"));
metrics_store_entry_add_label(sentry,
metrics_format_label("action", "outbuf"));
metrics_store_entry_update(sentry,
tor_llround(cc_stats_flow_xoff_outbuf_ma));
sentry = metrics_store_add(the_store, rentry->type, rentry->name,
rentry->help);
metrics_store_entry_add_label(sentry,
metrics_format_label("state", "xoff"));
metrics_store_entry_add_label(sentry,
metrics_format_label("action", "num_sent"));
metrics_format_label("action", "xoff_num_sent"));
metrics_store_entry_update(sentry,
cc_stats_flow_num_xoff_sent);
sentry = metrics_store_add(the_store, rentry->type, rentry->name,
rentry->help);
metrics_store_entry_add_label(sentry,
metrics_format_label("state", "xon"));
metrics_format_label("state", "flow_control"));
metrics_store_entry_add_label(sentry,
metrics_format_label("action", "outbuf"));
metrics_store_entry_update(sentry,
tor_llround(cc_stats_flow_xon_outbuf_ma));
sentry = metrics_store_add(the_store, rentry->type, rentry->name,
rentry->help);
metrics_store_entry_add_label(sentry,
metrics_format_label("state", "xon"));
metrics_store_entry_add_label(sentry,
metrics_format_label("action", "num_sent"));
metrics_format_label("action", "xon_num_sent"));
metrics_store_entry_update(sentry,
cc_stats_flow_num_xon_sent);
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_format_label("state", "buffers"));
metrics_store_entry_add_label(sentry,
metrics_format_label("action", "xon_outbuf"));
metrics_store_entry_update(sentry,
tor_llround(cc_stats_flow_xon_outbuf_ma));
sentry = metrics_store_add(the_store, rentry->type, rentry->name,
rentry->help);
metrics_store_entry_add_label(sentry,
metrics_format_label("state", "buffers"));
metrics_store_entry_add_label(sentry,
metrics_format_label("action", "xoff_outbuf"));
metrics_store_entry_update(sentry,
tor_llround(cc_stats_flow_xoff_outbuf_ma));
sentry = metrics_store_add(the_store, rentry->type, rentry->name,
rentry->help);
metrics_store_entry_add_label(sentry,
metrics_format_label("state", "cc_limits"));
metrics_store_entry_add_label(sentry,
metrics_format_label("action", "above_delta"));
metrics_store_entry_update(sentry, cc_stats_vegas_above_delta);
@@ -475,7 +457,7 @@ fill_cc_values(void)
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_format_label("state", "cc_limits"));
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);
@@ -483,7 +465,25 @@ fill_cc_values(void)
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_format_label("state", "cc_backoff"));
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));
sentry = metrics_store_add(the_store, rentry->type, rentry->name,
rentry->help);
metrics_store_entry_add_label(sentry,
metrics_format_label("state", "cc_backoff"));
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,
metrics_format_label("state", "cc_backoff"));
metrics_store_entry_add_label(sentry,
metrics_format_label("action", "delta_drop"));
metrics_store_entry_update(sentry,
@@ -492,11 +492,11 @@ fill_cc_values(void)
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_format_label("state", "cc_backoff"));
metrics_store_entry_add_label(sentry,
metrics_format_label("action", "chan_blocked_pct"));
metrics_format_label("action", "ss_chan_blocked_pct"));
metrics_store_entry_update(sentry,
tor_llround(cc_stats_vegas_csig_blocked_ma));
tor_llround(cc_stats_vegas_ss_csig_blocked_ma));
}
/** Helper: Fill in single stream metrics output. */