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
This commit is contained in:
Herbert Wolverson 2023-03-31 16:20:56 +00:00
parent 4ed077c634
commit 2c63393356

View File

@ -95,7 +95,8 @@
</div> </div>
<div class="col-sm-2"> <div class="col-sm-2">
<a href="#" class="btn btn-small btn-info" id="btnPause"><i class="fa fa-pause"></i> Pause</a> <a href="#" class="btn btn-small btn-info" id="btnPause"><i class="fa fa-pause"></i> Pause</a>
<a href="#" class="btn btn-small btn-info" id="btnSlow"><i class="fa fa-hourglass"></i> Slow Mode</a> <a href="#" class="btn btn-small btn-info" id="btnSlow"><i class="fa fa-hourglass"></i> Slow
Mode</a>
</div> </div>
</div> </div>
</div> </div>
@ -394,7 +395,8 @@
{ {
margin: { l: 0, r: 0, b: 0, t: 0, pad: 4 }, margin: { l: 0, r: 0, b: 0, t: 0, pad: 4 },
yaxis: { automargin: true, title: "Bytes" }, yaxis: { automargin: true, title: "Bytes" },
xaxis: { automargin: true, title: "Time since now" } }); xaxis: { automargin: true, title: "Time since now" }
});
} else { } else {
Plotly.redraw(graph, graphData); Plotly.redraw(graph, graphData);
} }
@ -413,9 +415,11 @@
Plotly.newPlot( Plotly.newPlot(
graph, graph,
graphData, graphData,
{ margin: { l: 8, r: 0, b: 0, t: 0, pad: 4 }, {
yaxis: { automargin: true, title: "log10(ms)", range: [-1.0, 1.0] }, margin: { l: 8, r: 0, b: 0, t: 0, pad: 4 },
xaxis: { automargin: true, title: "Time since now" } }); yaxis: { automargin: true, title: "log10(ms)", range: [-1.0, 1.0] },
xaxis: { automargin: true, title: "Time since now" }
});
this.delaysPlotted = true; this.delaysPlotted = true;
} else { } else {
Plotly.redraw(graph, graphData); Plotly.redraw(graph, graphData);
@ -849,14 +853,14 @@
var slowMode = false; var slowMode = false;
function showFps() { function showFps() {
if(!lastCalledTime) { if (!lastCalledTime) {
lastCalledTime = Date.now(); lastCalledTime = Date.now();
fps = 0; fps = 0;
return; return;
} }
delta = (Date.now() - lastCalledTime)/1000; delta = (Date.now() - lastCalledTime) / 1000;
lastCalledTime = Date.now(); lastCalledTime = Date.now();
fps = 1/delta; fps = 1 / delta;
//$("#fps").text(fps.toFixed(0)); //$("#fps").text(fps.toFixed(0));
worstDelta = Math.max(delta, worstDelta); worstDelta = Math.max(delta, worstDelta);
} }
@ -867,6 +871,7 @@
switch (activeTab) { switch (activeTab) {
case "pills-funnel-tab": { case "pills-funnel-tab": {
getFunnel(); getFunnel();
getThroughput();
} break; } break;
case "pills-flows-tab": { case "pills-flows-tab": {
getFlows(); getFlows();