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

Fix failure to display Cake Tins in web UI

Browse Source 
Cake Diff functions now use "checked_sub" to ensure that an overflow
doesn't mess up data.

Web UI includes checks that Cake data is available on each history
tick.
This commit is contained in:
Herbert Wolverson 2023-01-16 14:30:48 +00:00
parent 5be5111954
commit 05bb1ee959
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/rust/lqos_node_manager/static/circuit_queue.html
View File

@ -262,8 +262,16 @@
if (tin == 0) { if (tin == 0) {
qlenX1.push(counter); qlenX1.push(counter);
qlenX2.push(counter); qlenX2.push(counter);
qlenY1.push(data.history[i][0].Cake.qlen); if (data.history[i][0].Cake) {
qlenY2.push(0.0 - data.history[i][1].Cake.qlen); qlenY1.push(data.history[i][0].Cake.qlen);
} else {
qlenY1.push(0);
}
if (data.history[i][1].Cake) {
qlenY2.push(0.0 - data.history[i][1].Cake.qlen);
} else {
qlenY2.push(0.0);
}
} }
counter++; counter++;
} }
@ -273,8 +281,16 @@
if (tin == 0) { if (tin == 0) {
qlenX1.push(counter); qlenX1.push(counter);
qlenX2.push(counter); qlenX2.push(counter);
qlenY1.push(data.history[i][0].Cake.qlen); if (data.history[i][0].Cake) {
qlenY2.push(0.0 - data.history[i][1].Cake.qlen); qlenY1.push(data.history[i][0].Cake.qlen);
} else {
qlenY1.push(0.0);
}
if (data.history[i][1].Cake) {
qlenY2.push(0.0 - data.history[i][1].Cake.qlen);
} else {
qlenY2.push(0.0);
}
} }
counter++; counter++;
} }

5
src/rust/lqosd/src/queue_tracker/queue_reader/queue_diff/mod.rs
View File

@ -48,12 +48,11 @@ fn cake_diff(previous: &QueueType, current: &QueueType) -> Result<QueueDiff> {
.iter() .iter()
.zip(prev.tins.iter()) .zip(prev.tins.iter())
.map(|(new, prev)| { .map(|(new, prev)| {
//println!("{} - {} = {}", new.sent_bytes, prev.sent_bytes, new.sent_bytes -prev.sent_bytes);
CakeDiffTin { CakeDiffTin {
sent_bytes: new.sent_bytes - prev.sent_bytes, sent_bytes: new.sent_bytes.checked_sub(prev.sent_bytes).unwrap_or(0),
backlog_bytes: new.backlog_bytes, backlog_bytes: new.backlog_bytes,
drops: new.drops - prev.drops, drops: new.drops - prev.drops,
marks: new.ecn_marks - prev.ecn_marks, marks: new.ecn_marks.checked_sub(prev.ecn_marks).unwrap_or(0),
avg_delay_us: new.avg_delay_us, avg_delay_us: new.avg_delay_us,
} }
}) })