Merge branch 'master' of https://github.com/0xdata/h2o

lovearthas · Jun 28, 2014 · 8de145a · 8de145a
2 parents 27c4201 + 9b44cbb
commit 8de145a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/h2o-perf/web/prototype/js/perf.js b/h2o-perf/web/prototype/js/perf.js
@@ -339,7 +339,7 @@ function nodePerfGraph(json, svgCPU, svgRSS) {
     var ts = (ts_raw.map(function(d) { return max_time - d })).sort(function(a,b) {return a - b; });
     var sys_cpu = zip(ts, json.data.map(function(d) { return d['cum_cpu_sys'] }));
     var user_cpu = zip(ts, json.data.map(function(d) { return d['cum_cpu_proc'] }));
-    var rss = zip(ts, json.data.map(function(d) { return d['rss'] / (1.0 * 1024) }));
+    var rss = zip(ts, json.data.map(function(d) { return d['rss'] / (1.0 * 1024 * 1024) }));
 
     var cpu_min = d3.min( [d3.min(user_cpu.map(function(d) {return d[0];})),  d3.min(sys_cpu.map(function(d) { return d[0]; }))]);
     var cpu_max = d3.max( [d3.max(user_cpu.map(function(d) {return d[0]; })),  d3.max(sys_cpu.map(function(d) { return d[0]; }))])