Lochnair-Labs/sqm-autorate-rust
2
0 Fork 0
Code Issues 5 Pull Requests Actions 14 Packages Projects Releases Wiki Activity

refactor(ratecontroller): Simplify delta_stat logic

Browse Source
This commit is contained in:
Nils Andreas Svee committed 2026-02-21 22:42:20 +07:00
1 parent 67bb185e28
commit 2aec477b89
1 file changed
+38 -43
Download Patch File Download Diff File Expand all files Collapse all files
src/ratecontroller.rs
+38 -43
View File
@@ -151,53 +151,48 @@ impl Ratecontroller {
if !state.deltas.is_empty() { if !state.deltas.is_empty() {
state.next_rate = state.current_rate; state.next_rate = state.current_rate;
if state.deltas.len() < 3 { state.delta_stat = if state.deltas.len() >= 3 {
state.next_rate = min_rate; state.deltas[2]
} else { } else {
state.delta_stat = if state.deltas[2] > 0.0 { state.deltas[0]
state.deltas[2] };
} else {
state.deltas[0]
};
if state.delta_stat > 0.0 { if state.delta_stat > 0.0 {
/* /*
* TODO - find where the (8 / 1000) comes from and * TODO - find where the (8 / 1000) comes from and
* i. convert to a pre-computed factor * i. convert to a pre-computed factor
* ii. ideally, see if it can be defined in terms of constants, eg ticks per second and number of active reflectors * ii. ideally, see if it can be defined in terms of constants, eg ticks per second and number of active reflectors
*/ */
state.utilisation = (8.0 / 1000.0) state.utilisation = (8.0 / 1000.0)
* (state.current_bytes as f64 - state.previous_bytes as f64) * (state.current_bytes as f64 - state.previous_bytes as f64)
/ dur.as_secs_f64(); / dur.as_secs_f64();
state.load = state.utilisation / state.current_rate; state.load = state.utilisation / state.current_rate;
if state.delta_stat > 0.0 if state.delta_stat < delay_ms
&& state.delta_stat < delay_ms && state.load > self.config.high_load_level
&& state.load > self.config.high_load_level {
{ state.safe_rates[state.nrate] = (state.current_rate * state.load).round();
state.safe_rates[state.nrate] = (state.current_rate * state.load).round(); let max_rate = state
let max_rate = state .safe_rates
.safe_rates .iter()
.iter() .max_by(|a, b| a.total_cmp(b))
.max_by(|a, b| a.total_cmp(b)) .unwrap();
.unwrap(); state.next_rate = state.current_rate
state.next_rate = state.current_rate * (1.0 + 0.1 * (1.0_f64 - state.current_rate / max_rate).max(0.0))
* (1.0 + 0.1 * (1.0_f64 - state.current_rate / max_rate).max(0.0)) + (base_rate * 0.03);
+ (base_rate * 0.03); state.nrate += 1;
state.nrate += 1; state.nrate %= self.config.speed_hist_size as usize;
state.nrate %= self.config.speed_hist_size as usize; }
}
if state.delta_stat > delay_ms { if state.delta_stat > delay_ms {
let mut rng = rng(); let mut rng = rng();
match state.safe_rates.choose(&mut rng) { match state.safe_rates.choose(&mut rng) {
Some(rnd_rate) => { Some(rnd_rate) => {
state.next_rate = state.next_rate =
rnd_rate.min(0.9 * state.current_rate * state.load); rnd_rate.min(0.9 * state.current_rate * state.load);
} }
None => { None => {
state.next_rate = 0.9 * state.current_rate * state.load; state.next_rate = 0.9 * state.current_rate * state.load;
}
} }
} }
} }