Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

benchmark: fix race condition on fs benchs #50035

Merged
merged 5 commits into from
Oct 15, 2023
Merged

benchmark: fix race condition on fs benchs #50035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bc9e25f
benchmark: fix race condition on fs benchs
H4ad Oct 4, 2023
d900ac9
fixup! benchmark: fix race condition on fs benchs
H4ad Oct 8, 2023
625f575
fixup! benchmark: fix race condition on fs benchs
H4ad Oct 8, 2023
dad1702
fixup! benchmark: fix race condition on fs benchs
H4ad Oct 8, 2023
07d29e0
fixup! benchmark: fix race condition on fs benchs
H4ad Oct 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 25 additions & 13 deletions benchmark/fs/readfile-partitioned.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ const filename = path.resolve(__dirname,
`.removeme-benchmark-garbage-${process.pid}`);
const fs = require('fs');
const zlib = require('zlib');
const assert = require('assert');

const bench = common.createBenchmark(main, {
duration: [5],
Expand All @@ -35,41 +34,49 @@ function main({ len, duration, concurrent, encoding }) {

const zipData = Buffer.alloc(1024, 'a');

let waitConcurrent = 0;

// Plus one because of zip
const targetConcurrency = concurrent + 1;
const startedAt = Date.now();
const endAt = startedAt + (duration * 1000);

let reads = 0;
let zips = 0;
let benchEnded = false;

bench.start();
setTimeout(() => {

function stop() {
const totalOps = reads + zips;
benchEnded = true;
bench.end(totalOps);

try {
fs.unlinkSync(filename);
} catch {
// Continue regardless of error.
}
}, duration * 1000);
}

function read() {
fs.readFile(filename, encoding, afterRead);
}

function afterRead(er, data) {
if (er) {
if (er.code === 'ENOENT') {
// Only OK if unlinked by the timer from main.
assert.ok(benchEnded);
return;
}
throw er;
}

if (data.length !== len)
throw new Error('wrong number of bytes returned');

reads++;
if (!benchEnded)
const benchEnded = Date.now() >= endAt;

if (benchEnded && (++waitConcurrent) === targetConcurrency) {
stop();
} else if (!benchEnded) {
read();
}
}

function zip() {
Expand All @@ -81,12 +88,17 @@ function main({ len, duration, concurrent, encoding }) {
throw er;

zips++;
if (!benchEnded)
const benchEnded = Date.now() >= endAt;

if (benchEnded && (++waitConcurrent) === targetConcurrency) {
stop();
} else if (!benchEnded) {
zip();
}
}

// Start reads
while (concurrent-- > 0) read();
for (let i = 0; i < concurrent; i++) read();

// Start a competing zip
zip();
Expand Down
29 changes: 17 additions & 12 deletions benchmark/fs/readfile-permission-enabled.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

const common = require('../common.js');
const fs = require('fs');
const assert = require('assert');

const tmpdir = require('../../test/common/tmpdir');
tmpdir.refresh();
Expand Down Expand Up @@ -36,40 +35,46 @@ function main({ len, duration, concurrent, encoding }) {
data = null;

let reads = 0;
let benchEnded = false;
let waitConcurrent = 0;

const startedAt = Date.now();
const endAt = startedAt + (duration * 1000);

bench.start();
setTimeout(() => {
benchEnded = true;

function stop() {
bench.end(reads);

try {
fs.unlinkSync(filename);
} catch {
// Continue regardless of error.
}

process.exit(0);
}, duration * 1000);
}

function read() {
fs.readFile(filename, encoding, afterRead);
}

function afterRead(er, data) {
if (er) {
if (er.code === 'ENOENT') {
// Only OK if unlinked by the timer from main.
assert.ok(benchEnded);
return;
}
throw er;
}

if (data.length !== len)
throw new Error('wrong number of bytes returned');

reads++;
if (!benchEnded)
const benchEnded = Date.now() >= endAt;

if (benchEnded && (++waitConcurrent) === concurrent) {
stop();
} else if (!benchEnded) {
read();
}
}

while (concurrent--) read();
for (let i = 0; i < concurrent; i++) read();
}
35 changes: 20 additions & 15 deletions benchmark/fs/readfile-promises.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

const common = require('../common.js');
const fs = require('fs');
const assert = require('assert');

const tmpdir = require('../../test/common/tmpdir');
tmpdir.refresh();
Expand Down Expand Up @@ -35,19 +34,25 @@ function main({ len, duration, concurrent, encoding }) {
fs.writeFileSync(filename, data);
data = null;

let writes = 0;
let benchEnded = false;
let reads = 0;
let waitConcurrent = 0;

const startedAt = Date.now();
const endAt = startedAt + (duration * 1000);

bench.start();
setTimeout(() => {
benchEnded = true;
bench.end(writes);

function stop() {
bench.end(reads);

try {
fs.unlinkSync(filename);
} catch {
// Continue regardless of error.
}

process.exit(0);
}, duration * 1000);
}

function read() {
fs.promises.readFile(filename, encoding)
Expand All @@ -57,21 +62,21 @@ function main({ len, duration, concurrent, encoding }) {

function afterRead(er, data) {
if (er) {
if (er.code === 'ENOENT') {
// Only OK if unlinked by the timer from main.
assert.ok(benchEnded);
return;
}
throw er;
}

if (data.length !== len)
throw new Error('wrong number of bytes returned');

writes++;
if (!benchEnded)
reads++;
const benchEnded = Date.now() >= endAt;

if (benchEnded && (++waitConcurrent) === concurrent) {
stop();
} else if (!benchEnded) {
read();
}
}

while (concurrent--) read();
for (let i = 0; i < concurrent; i++) read();
}
35 changes: 20 additions & 15 deletions benchmark/fs/readfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

const common = require('../common.js');
const fs = require('fs');
const assert = require('assert');

const tmpdir = require('../../test/common/tmpdir');
tmpdir.refresh();
Expand All @@ -29,40 +28,46 @@ function main({ len, duration, concurrent, encoding }) {
data = null;

let reads = 0;
let benchEnded = false;
let waitConcurrent = 0;

const startedAt = Date.now();
const endAt = startedAt + (duration * 1000);

bench.start();
setTimeout(() => {
benchEnded = true;

function read() {
fs.readFile(filename, encoding, afterRead);
}

function stop() {
bench.end(reads);

try {
fs.unlinkSync(filename);
} catch {
// Continue regardless of error.
}
process.exit(0);
}, duration * 1000);

function read() {
fs.readFile(filename, encoding, afterRead);
process.exit(0);
}

function afterRead(er, data) {
if (er) {
if (er.code === 'ENOENT') {
// Only OK if unlinked by the timer from main.
assert.ok(benchEnded);
return;
}
throw er;
}

if (data.length !== len)
throw new Error('wrong number of bytes returned');

reads++;
if (!benchEnded)
const benchEnded = Date.now() >= endAt;

if (benchEnded && (++waitConcurrent) === concurrent) {
stop();
} else if (!benchEnded) {
read();
}
}

while (concurrent--) read();
for (let i = 0; i < concurrent; i++) read();
}
29 changes: 17 additions & 12 deletions benchmark/fs/writefile-promises.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

const common = require('../common.js');
const fs = require('fs');
const assert = require('assert');
const tmpdir = require('../../test/common/tmpdir');

tmpdir.refresh();
Expand Down Expand Up @@ -38,20 +37,26 @@ function main({ encodingType, duration, concurrent, size }) {
}

let writes = 0;
let benchEnded = false;
let waitConcurrent = 0;

const startedAt = Date.now();
const endAt = startedAt + (duration * 1000);

bench.start();
setTimeout(() => {
benchEnded = true;

function stop() {
bench.end(writes);

for (let i = 0; i < filesWritten; i++) {
try {
fs.unlinkSync(`${filename}-${i}`);
} catch {
// Continue regardless of error.
}
}

process.exit(0);
}, duration * 1000);
}

function write() {
fs.promises.writeFile(`${filename}-${filesWritten++}`, chunk, encoding)
Expand All @@ -61,18 +66,18 @@ function main({ encodingType, duration, concurrent, size }) {

function afterWrite(er) {
if (er) {
if (er.code === 'ENOENT') {
// Only OK if unlinked by the timer from main.
assert.ok(benchEnded);
return;
}
throw er;
}

writes++;
if (!benchEnded)
const benchEnded = Date.now() >= endAt;

if (benchEnded && (++waitConcurrent) === concurrent) {
stop();
} else if (!benchEnded) {
write();
}
}

while (concurrent--) write();
for (let i = 0; i < concurrent; i++) write();
}