From 7ff7e3c32d35d77457a5f4039bba74eff119bdb0 Mon Sep 17 00:00:00 2001 From: Tyron Madlener Date: Fri, 1 Jul 2011 11:24:47 +0200 Subject: [PATCH] fix for linux cpu usage --- js/server_status.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/js/server_status.js b/js/server_status.js index 3a7141ef58..166a5a9990 100644 --- a/js/server_status.js +++ b/js/server_status.js @@ -703,6 +703,7 @@ $(function() { { dataType: 'cpu', name: 'none', transformFn: function(cur, prev) { + if(prev==null) return undefined; var diff_total = cur.busy + cur.idle - (prev.busy + prev.idle); var diff_idle = cur.idle - prev.idle; return 100*(diff_total - diff_idle) / diff_total; @@ -863,13 +864,18 @@ $(function() { value = value / elem.nodes[j].valueDivisor; if(elem.nodes[j].transformFn) - value = elem.nodes[j].transformFn(chartData[key][j],oldChartData[key][j],j); + value = elem.nodes[j].transformFn( + chartData[key][j], + (oldChartData == null) ? null : oldChartData[key][j], + j + ); - elem.chart.series[j].addPoint( - { x: chartData.x, y: value }, - j == elem.nodes.length - 1, - elem.numPoints >= gridMaxPoints - ); + if(value != undefined) + elem.chart.series[j].addPoint( + { x: chartData.x, y: value }, + j == elem.nodes.length - 1, + elem.numPoints >= gridMaxPoints + ); } chartGrid[key].numPoints++;