IntenseWebs/LibreQoS
3
0
Fork 0
mirror of https://github.com/LibreQoE/LibreQoS.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Correctly gather ECN marks from the tins rather than the top-level and sum them. Remove zero entry items from the Cake stats. This should trim the size of Cake storage a bit, but isn't the full picture yet.

Browse Source
This commit is contained in:
Herbert Wolverson 2024-05-14 12:54:46 -05:00
parent 22104e25a3
commit 53e5611d50
2 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/rust/lts_client/src/collector/quick_drops/retriever.rs
View File

@ -93,8 +93,15 @@ impl AsyncQueueReader {
if let Some(serde_json::Value::Number(drops)) = map.get("drops") { if let Some(serde_json::Value::Number(drops)) = map.get("drops") {
stats.drops = drops.as_u64().unwrap_or(0); stats.drops = drops.as_u64().unwrap_or(0);
} }
if let Some(serde_json::Value::Number(marks)) = map.get("ecn_mark") { if let Some(serde_json::Value::Array(tins)) = map.get("tins") {
stats.marks = marks.as_u64().unwrap_or(0); stats.marks = 0;
for tin in tins.iter() {
if let Some(tin) = tin.as_object() {
if let Some(serde_json::Value::Number(marks)) = tin.get("ecn_mark") {
stats.marks += marks.as_u64().unwrap_or(0);
}
}
}
} }
result.push(stats); result.push(stats);
} }

41
src/rust/lts_client/src/collector/quick_drops/stats_diff.rs
View File

@ -1,7 +1,7 @@
use lqos_config::load_config;
use tokio::sync::Mutex;
use once_cell::sync::Lazy;
use super::CakeStats; use super::CakeStats;
use lqos_config::load_config;
use once_cell::sync::Lazy;
use tokio::sync::Mutex;
static CAKE_TRACKER: Lazy<Mutex<CakeTracker>> = Lazy::new(|| Mutex::new(CakeTracker::new())); static CAKE_TRACKER: Lazy<Mutex<CakeTracker>> = Lazy::new(|| Mutex::new(CakeTracker::new()));
@ -35,10 +35,7 @@ impl CakeTracker {
} else { } else {
let out_reader = super::AsyncQueueReader::new(outbound); let out_reader = super::AsyncQueueReader::new(outbound);
let in_reader = super::AsyncQueueReader::new(inbound); let in_reader = super::AsyncQueueReader::new(inbound);
let (up, down) = tokio::join!( let (up, down) = tokio::join!(out_reader.run(), in_reader.run(),);
out_reader.run(),
in_reader.run(),
);
if let (Ok(Some(up)), Ok(Some(down))) = (up, down) { if let (Ok(Some(up)), Ok(Some(down))) = (up, down) {
return self.read_up_down(up, down); return self.read_up_down(up, down);
} }
@ -47,7 +44,11 @@ impl CakeTracker {
None None
} }
fn read_up_down(&mut self, up: Vec<CakeStats>, down: Vec<CakeStats>) -> Option<(Vec<CakeStats>, Vec<CakeStats>)> { fn read_up_down(
&mut self,
mut up: Vec<CakeStats>,
mut down: Vec<CakeStats>,
) -> Option<(Vec<CakeStats>, Vec<CakeStats>)> {
if self.prev.is_none() { if self.prev.is_none() {
self.prev = Some((up, down)); self.prev = Some((up, down));
None None
@ -55,13 +56,27 @@ impl CakeTracker {
// Delta time // Delta time
if let Some((down, up)) = &mut self.current { if let Some((down, up)) = &mut self.current {
down.iter_mut().for_each(|d| { down.iter_mut().for_each(|d| {
if let Some(prev) = self.prev.as_ref().unwrap().0.iter().find(|p| p.circuit_id == d.circuit_id) { if let Some(prev) = self
.prev
.as_ref()
.unwrap()
.0
.iter()
.find(|p| p.circuit_id == d.circuit_id)
{
d.drops = d.drops.saturating_sub(prev.drops); d.drops = d.drops.saturating_sub(prev.drops);
d.marks = d.marks.saturating_sub(prev.marks); d.marks = d.marks.saturating_sub(prev.marks);
} }
}); });
up.iter_mut().for_each(|d| { up.iter_mut().for_each(|d| {
if let Some(prev) = self.prev.as_ref().unwrap().1.iter().find(|p| p.circuit_id == d.circuit_id) { if let Some(prev) = self
.prev
.as_ref()
.unwrap()
.1
.iter()
.find(|p| p.circuit_id == d.circuit_id)
{
d.drops = d.drops.saturating_sub(prev.drops); d.drops = d.drops.saturating_sub(prev.drops);
d.marks = d.marks.saturating_sub(prev.marks); d.marks = d.marks.saturating_sub(prev.marks);
} }
@ -71,7 +86,11 @@ impl CakeTracker {
// Advance the previous // Advance the previous
self.prev = self.current.take(); self.prev = self.current.take();
// Remove all zeroes
up.retain(|u| u.drops > 0 || u.marks > 0);
down.retain(|d| d.drops > 0 || d.marks > 0);
Some((up, down)) Some((up, down))
} }
} }
} }