1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

benchmark: remove writing to benchmark directory

Browse Source 
A benchmark for module loading creates a temporary directory in the
benchmark directory. Re-use the test common module to put the tmp
directory in test instead. This was causing intermittent test failures
because run.js (invoked by benchmark tests, mulitple of which could be
running at once) throws if a subdirectory of benchmark disappears at
just the wrong time.

There are other possible solutions than repurposing the `test/common`
module but two arguments for doing it this way are:

* There is already another benchmark file that does this
  (`http_server_for_chunky_client.js`) so the dependency already exists
  in the benchmarks.
* This also eliminates a re-implementation of rimraf in the benchmark
  code.

PR-URL: https://github.com/nodejs/node/pull/16144
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Rich Trott 2017-10-11 06:15:14 -07:00 committed by James M Snell
parent b41d215f28
commit c2cf47a239
1 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
benchmark/module/module-loader.js
View File

@ -3,8 +3,8 @@ const fs = require('fs');
const path = require('path');
const common = require('../common.js');
const tmpDirectory = path.join(__dirname, '..', 'tmp');
const benchmarkDirectory = path.join(tmpDirectory, 'nodejs-benchmark-module');
const { refreshTmpDir, tmpDir } = require('../../test/common');
const benchmarkDirectory = path.join(tmpDir, 'nodejs-benchmark-module');
const bench = common.createBenchmark(main, {
thousands: [50],
@ -15,8 +15,7 @@ const bench = common.createBenchmark(main, {
function main(conf) {
const n = +conf.thousands * 1e3;
rmrf(tmpDirectory);
try { fs.mkdirSync(tmpDirectory); } catch (e) {}
refreshTmpDir();
try { fs.mkdirSync(benchmarkDirectory); } catch (e) {}
for (var i = 0; i <= n; i++) {
@ -36,7 +35,7 @@ function main(conf) {
else
measureDir(n, conf.useCache === 'true');
rmrf(tmpDirectory);
refreshTmpDir();
}
function measureFull(n, useCache) {
@ -66,21 +65,3 @@ function measureDir(n, useCache) {
}
bench.end(n / 1e3);
}
function rmrf(location) {
try {
const things = fs.readdirSync(location);
things.forEach(function(thing) {
var cur = path.join(location, thing),
isDirectory = fs.statSync(cur).isDirectory();
if (isDirectory) {
rmrf(cur);
return;
}
fs.unlinkSync(cur);
});
fs.rmdirSync(location);
} catch (err) {
// Ignore error
}
}