diff options
author | Gireesh Punathil <gpunathi@in.ibm.com> | 2019-03-12 08:26:57 -0400 |
---|---|---|
committer | Gireesh Punathil <gpunathi@in.ibm.com> | 2019-03-24 07:06:59 +0530 |
commit | ed849f812d7b779e80955876716c64bcd4498c21 (patch) | |
tree | b40f0dcdc791df6606a5d43e3d346537995ec0f2 | |
parent | c0f031c5bd6dafa2e7a3163d796b566472efc50a (diff) | |
download | android-node-v8-ed849f812d7b779e80955876716c64bcd4498c21.tar.gz android-node-v8-ed849f812d7b779e80955876716c64bcd4498c21.tar.bz2 android-node-v8-ed849f812d7b779e80955876716c64bcd4498c21.zip |
test: strengthen test-worker-prof
Force main and worker to stay for some deterministic time
Add some more validation check around profile file generation
Fixes: https://github.com/nodejs/node/issues/26401
PR-URL: https://github.com/nodejs/node/pull/26608
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
-rw-r--r-- | test/parallel/test-worker-prof.js | 86 |
1 files changed, 62 insertions, 24 deletions
diff --git a/test/parallel/test-worker-prof.js b/test/parallel/test-worker-prof.js index 141b101a72..07d62f1cc0 100644 --- a/test/parallel/test-worker-prof.js +++ b/test/parallel/test-worker-prof.js @@ -1,40 +1,78 @@ 'use strict'; -require('../common'); +const common = require('../common'); const tmpdir = require('../common/tmpdir'); const fs = require('fs'); const assert = require('assert'); +const util = require('util'); const { join } = require('path'); const { spawnSync } = require('child_process'); -const { Worker } = require('worker_threads'); // Test that --prof also tracks Worker threads. // Refs: https://github.com/nodejs/node/issues/24016 if (process.argv[2] === 'child') { - const spin = ` - const start = Date.now(); - while (Date.now() - start < 1000); + let files = fs.readdirSync(tmpdir.path); + const plog = files.filter((name) => /\.log$/.test(name))[0]; + if (plog === undefined) { + console.error('`--prof` did not produce a profile log for parent thread!'); + process.exit(1); + } + const pingpong = ` + let counter = 0; + const { Worker, parentPort } = require('worker_threads'); + parentPort.on('message', (m) => { + if (counter++ === 1024) + process.exit(0); + parentPort.postMessage( + m.toString().split('').reverse().toString().replace(/,/g, '')); + }); `; - new Worker(spin, { eval: true }); - eval(spin); - return; -} -tmpdir.refresh(); -spawnSync(process.execPath, ['--prof', __filename, 'child'], - { cwd: tmpdir.path }); -const files = fs.readdirSync(tmpdir.path); -const logfiles = files.filter((name) => /\.log$/.test(name)); -assert.strictEqual(logfiles.length, 2); // Parent thread + child thread. + const { Worker } = require('worker_threads'); + const data = 'x'.repeat(1024); + const w = new Worker(pingpong, { eval: true }); + w.on('message', (m) => { + w.postMessage(m.toString().split('').reverse().toString().replace(/,/g, '')); + }); + + w.on('exit', common.mustCall(() => { + files = fs.readdirSync(tmpdir.path); + const wlog = files.filter((name) => /\.log$/.test(name) && name !== plog)[0]; + if (wlog === undefined) { + console.error('`--prof` did not produce a profile log' + + ' for worker thread!'); + process.exit(1); + } + process.exit(0); + })); + w.postMessage(data); +} else { + tmpdir.refresh(); + const spawnResult = spawnSync( + process.execPath, ['--prof', __filename, 'child'], + { cwd: tmpdir.path, encoding: 'utf8' }); + assert.strictEqual(spawnResult.stderr.toString(), '', + `child exited with an error: \ + ${util.inspect(spawnResult)}`); + assert.strictEqual(spawnResult.signal, null, + `child exited with signal: ${util.inspect(spawnResult)}`); + assert.strictEqual(spawnResult.status, 0, + `child exited with non-zero status: \ + ${util.inspect(spawnResult)}`); + const files = fs.readdirSync(tmpdir.path); + const logfiles = files.filter((name) => /\.log$/.test(name)); + assert.strictEqual(logfiles.length, 2); // Parent thread + child thread. -for (const logfile of logfiles) { - const lines = fs.readFileSync(join(tmpdir.path, logfile), 'utf8').split('\n'); - const ticks = lines.filter((line) => /^tick,/.test(line)).length; + for (const logfile of logfiles) { + const lines = fs.readFileSync( + join(tmpdir.path, logfile), 'utf8').split('\n'); + const ticks = lines.filter((line) => /^tick,/.test(line)).length; - // Test that at least 15 ticks have been recorded for both parent and child - // threads. When not tracking Worker threads, only 1 or 2 ticks would - // have been recorded. - // When running locally on x64 Linux, this number is usually at least 700 - // for both threads, so 15 seems like a very safe threshold. - assert(ticks >= 15, `${ticks} >= 15`); + // Test that at least 15 ticks have been recorded for both parent and child + // threads. When not tracking Worker threads, only 1 or 2 ticks would + // have been recorded. + // When running locally on x64 Linux, this number is usually at least 200 + // for both threads, so 15 seems like a very safe threshold. + assert(ticks >= 15, `${ticks} >= 15`); + } } |