fix bug in iperf update and improve logging
diff --git a/web/ons-demo/js/flows.js b/web/ons-demo/js/flows.js
index e21af0d..f4506e2 100644
--- a/web/ons-demo/js/flows.js
+++ b/web/ons-demo/js/flows.js
@@ -200,141 +200,6 @@
flows.exit().remove();
}
-function startIPerfForFlow(flow) {
- var duration = 10000; // seconds
- var interval = 100; // ms. this is defined by the server
- var updateRate = 2000; // ms
- var pointsToDisplay = 1000;
-
- function makeGraph(iperfData) {
- var d = 'M0,0';
-
- var now = flow.iperfData.startTime + (Date.now() - flow.iperfData.localNow)/1000;
-
- if (iperfData.samples && iperfData.samples.length) {
-
- var lastX;
- var i = iperfData.samples.length - 1;
- while (i) {
- var sample = iperfData.samples[i];
-
- var x = (1000 - (now - sample.time)*10);
- // workaround for discontinuity in iperf data
- if (x < 0) {
- i -= 1;
- continue;
- }
-
- var y = 28 * sample.value/1000000;
- if (y > 28) {
- y = 28;
- }
- if (i == iperfData.samples.length - 1) {
- d = 'M' + x + ',30';
- }
-
- // handle gaps
- // 1.5 for rounding error
- if (lastX && lastX - x > 1.5) {
- d += 'L' + lastX + ',30';
- d += 'M' + x + ',30'
- }
- lastX = x;
-
- d += 'L' + x + ',' + (30-y);
-
- i -= 1;
- }
- d += 'L' + lastX + ',30';
- }
- return d;
- }
-
- if (flow.flowId) {
- console.log('starting iperf for: ' + flow.flowId);
- startIPerf(flow, duration, updateRate/interval);
- flow.iperfDisplayInterval = setInterval(function () {
- if (flow.iperfData) {
- var iperfPath = d3.select(document.getElementById(makeSelectedFlowKey(flow))).select('path');
- iperfPath.attr('d', makeGraph(flow.iperfData));
- }
-
-
- }, interval);
-
- var animationTimeout;
- flow.iperfData = {
- samples: []
- }
-
- var lastTime;
- flow.iperfFetchInterval = setInterval(function () {
- console.log('Requesting iperf data');
- getIPerfData(flow, function (data) {
- try {
- var iperfData = JSON.parse(data);
-
-// console.log(iperfData.timestamp);
-
- // if the data is fresh
- if (flow.iperfData.timestamp && iperfData.timestamp != flow.iperfData.timestamp) {
-
- var flowSelection = d3.select(document.getElementById(makeFlowKey(flow)));
- startFlowAnimation(flowSelection);
- clearTimeout(animationTimeout);
- // kill the animation if iperfdata stops flowing
- animationTimeout = setTimeout(function () {
- stopFlowAnimation(flowSelection);
- }, updateRate*1.5);
-
- var endTime = Math.floor(iperfData['end-time']*10)/10;
-
- var startTime = endTime - (iperfData.samples.length * interval/1000);
- // set now on the first buffer
- if (!flow.iperfData.startTime) {
- flow.iperfData.startTime = startTime;
- flow.iperfData.localNow = Date.now();
- }
-
- console.log('iperf buffer start time: ' + startTime);
- if (lastTime && (startTime - lastTime) > updateRate/1000) {
- console.log('iperf buffer gap: ' + startTime + ',' + lastTime);
- }
- lastTime = startTime;
-
- // clear out the old data
- while (flow.iperfData.samples.length > pointsToDisplay + iperfData.samples.length) {
- flow.iperfData.samples.shift();
- }
-
- // if the client gets too out of sync, resynchronize
- var clientNow = flow.iperfData.startTime + (Date.now() - flow.iperfData.localNow)/1000;
- if (Math.abs(clientNow - startTime) > (updateRate/1000) * 2) {
- console.log('resynchronizing now: ' + clientNow + ' => ' + startTime);
- flow.iperfData.startTime = startTime;
- flow.iperfData.localNow = Date.now();
- }
-
- var time = startTime;
- iperfData.samples.forEach(function (s) {
- var sample = {
- time: time,
- value: s
- };
- flow.iperfData.samples.push(sample);
- time += interval/1000;
- });
- }
- flow.iperfData.timestamp = iperfData.timestamp;
- } catch (e) {
- console.log('bad iperf data: ' + data);
- }
-// console.log(data);
- });
- }, updateRate*.5); // over sample to avoid gaps
- }
-}
-
function updateSelectedFlows() {
// make sure that all of the selected flows are either
// 1) valid (meaning they are in the latest list of flows)
@@ -350,10 +215,8 @@
if (flow) {
var liveFlow = flowMap[makeFlowKey(flow)];
if (liveFlow) {
- newSelectedFlows.push(liveFlow);
- liveFlow.deletePending = flow.deletePending;
- liveFlow.iperfFetchInterval = flow.iperfFetchInterval;
- liveFlow.iperfDisplayInterval = flow.iperfDisplayInterval;
+ flow.dataPath = liveFlow.dataPath;
+ newSelectedFlows.push(flow);
} else if (flow.createPending) {
newSelectedFlows.push(flow);
} else if (hasIPerf(flow)) {
@@ -395,19 +258,6 @@
}
}
-function hasIPerf(flow) {
- return flow && flow.iperfFetchInterval;
-}
-
-function clearIPerf(flow) {
- console.log('clearing iperf interval for: ' + flow.flowId);
- clearInterval(flow.iperfFetchInterval);
- delete flow.iperfFetchInterval;
- clearInterval(flow.iperfDisplayInterval);
- delete flow.iperfDisplayInterval;
- delete flow.iperfData;
-}
-
function deselectFlow(flow, ifCreatePending) {
if (!flow) {
return;