From 2c63393356aadd1668024135ff29fca7edee4c83 Mon Sep 17 00:00:00 2001 From: Herbert Wolverson Date: Fri, 31 Mar 2023 16:20:56 +0000 Subject: [PATCH] Adds "client throughput" to the queue tree tab of circuit_queue Also moves all the circuit graphs to use the same graphing system as the other graphs on the plot. FIXES #315 --- .../static/circuit_queue.html | 37 +++++++++++-------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/src/rust/lqos_node_manager/static/circuit_queue.html b/src/rust/lqos_node_manager/static/circuit_queue.html index 11c32cea..718a5327 100644 --- a/src/rust/lqos_node_manager/static/circuit_queue.html +++ b/src/rust/lqos_node_manager/static/circuit_queue.html @@ -94,8 +94,9 @@
- Pause - Slow Mode + Pause + Slow + Mode
@@ -389,12 +390,13 @@ if (this.backlogPlotted == null) { this.backlogPlotted = true; Plotly.newPlot( - graph, - graphData, - { - margin: { l: 0, r: 0, b: 0, t: 0, pad: 4 }, - yaxis: { automargin: true, title: "Bytes" }, - xaxis: { automargin: true, title: "Time since now" } }); + graph, + graphData, + { + margin: { l: 0, r: 0, b: 0, t: 0, pad: 4 }, + yaxis: { automargin: true, title: "Bytes" }, + xaxis: { automargin: true, title: "Time since now" } + }); } else { Plotly.redraw(graph, graphData); } @@ -411,11 +413,13 @@ if (this.delaysPlotted == null) { Plotly.newPlot( - graph, - graphData, - { margin: { l: 8, r: 0, b: 0, t: 0, pad: 4 }, - yaxis: { automargin: true, title: "log10(ms)", range: [-1.0, 1.0] }, - xaxis: { automargin: true, title: "Time since now" } }); + graph, + graphData, + { + margin: { l: 8, r: 0, b: 0, t: 0, pad: 4 }, + yaxis: { automargin: true, title: "log10(ms)", range: [-1.0, 1.0] }, + xaxis: { automargin: true, title: "Time since now" } + }); this.delaysPlotted = true; } else { Plotly.redraw(graph, graphData); @@ -849,14 +853,14 @@ var slowMode = false; function showFps() { - if(!lastCalledTime) { + if (!lastCalledTime) { lastCalledTime = Date.now(); fps = 0; return; } - delta = (Date.now() - lastCalledTime)/1000; + delta = (Date.now() - lastCalledTime) / 1000; lastCalledTime = Date.now(); - fps = 1/delta; + fps = 1 / delta; //$("#fps").text(fps.toFixed(0)); worstDelta = Math.max(delta, worstDelta); } @@ -867,6 +871,7 @@ switch (activeTab) { case "pills-funnel-tab": { getFunnel(); + getThroughput(); } break; case "pills-flows-tab": { getFlows();