1
0
Fork 0

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
Jan Steemann 2016-01-25 15:59:32 +01:00
commit d4c0974ee8
1 changed files with 7 additions and 7 deletions

View File

@ -54,8 +54,8 @@ const optsDefault = {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
function gnuplot() { function gnuplot() {
executeExternalAndWait("/bin/bash", "gnuplot out/documents.plot"); executeExternalAndWait("gnuplot", "out/documents.plot");
executeExternalAndWait("/bin/bash", "gnuplot out/datafiles.plot"); executeExternalAndWait("gnuplot", "out/datafiles.plot");
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -408,17 +408,17 @@ plot \
statistics(opts); statistics(opts);
// wait for a while // wait for a while
let n = 60; let cc = 60;
if (opts.duration < 5) { if (opts.duration < 5) {
n = 6; cc = 6;
} else if (opts.duration < 10) { } else if (opts.duration < 10) {
n = 12; cc = 12;
} else if (opts.duration < 60) { } else if (opts.duration < 60) {
n = 24; cc = 24;
} }
for (let i = 0; i < n; ++i) { for (let i = 0; i < cc; ++i) {
statistics(opts); statistics(opts);
if (opts.gnuplot) { if (opts.gnuplot) {