Skip to content

cli: add --trace-atomics-wait flag #33292

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

Closed
addaleax wants to merge 6 commits into from
Closed

cli: add --trace-atomics-wait flag #33292

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6386c1a
cli: add `--trace-atomics-wait` flag
addaleax Dec 5, 2019
1ee0a80
fixup! cli: add `--trace-atomics-wait` flag
addaleax May 8, 2020
f982160
fixup! cli: add `--trace-atomics-wait` flag
addaleax May 8, 2020
4fb193d
fixup! cli: add `--trace-atomics-wait` flag
addaleax May 8, 2020
d412f82
fixup! fixup! cli: add `--trace-atomics-wait` flag
addaleax May 8, 2020
a32ae40
fixup! fixup! fixup! cli: add `--trace-atomics-wait` flag
addaleax May 10, 2020
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
Prev Previous commit
Next Next commit
fixup! cli: add --trace-atomics-wait flag
  • Loading branch information
@addaleax
addaleax committed May 8, 2020
commit 4fb193df914159393f1cb3eea04cf38a1d84f0bd
8 changes: 4 additions & 4 deletions doc/api/cli.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -837,11 +837,11 @@ The output could look like this:

The fields here correspond to:

- The thread id as given by [`worker_threads.threadId`][]
- The base address of the `SharedArrayBuffer` in question, as well as the
* The thread id as given by [`worker_threads.threadId`][]
* The base address of the `SharedArrayBuffer` in question, as well as the
byte offset corresponding to the index passed to `Atomics.wait()`
- The expected value that was passed to `Atomics.wait()`
- The timeout passed to `Atomics.wait`
* The expected value that was passed to `Atomics.wait()`
* The timeout passed to `Atomics.wait`

### `--trace-deprecation`
<!-- YAML
Expand Down
80 changes: 42 additions & 38 deletions test/parallel/test-trace-atomics-wait.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,44 +31,48 @@ const proc = child_process.spawnSync(
if (proc.status !== 0) console.log(proc);
assert.strictEqual(proc.status, 0);

const expectedLines = [
{ threadId: 0, offset: 0, value: 1, timeout: 'inf',
message: 'started' },
{ threadId: 0, offset: 0, value: 1, timeout: 'inf',
message: 'did not wait because the values mismatched' },
{ threadId: 0, offset: 0, value: 0, timeout: '10',
message: 'started' },
{ threadId: 0, offset: 0, value: 0, timeout: '10',
message: 'timed out' },
{ threadId: 0, offset: 4, value: 0, timeout: 'inf',
message: 'started' },
{ threadId: 1, offset: 4, value: -1, timeout: 'inf',
message: 'started' },
{ threadId: 0, offset: 4, value: 0, timeout: 'inf',
message: 'was woken up by another thread' },
{ threadId: 1, offset: 4, value: -1, timeout: 'inf',
message: 'was woken up by another thread' }
];
const SABAddress = proc.stderr.match(/Atomics\.wait\((?<SAB>.+) \+/).groups.SAB;
const actualTimeline = proc.stderr
.replace(new RegExp(SABAddress, 'g'), '<address>')
.replace(/infinity/g, 'inf')
.replace(/\r/g, '')
.trim();
console.log('+++ normalized stdout +++');
console.log(actualTimeline);
console.log('--- normalized stdout ---');

let SABAddress;
const re = /^\[Thread (?<threadId>\d+)\] Atomics\.wait\((?<SAB>(?:0x)?[0-9a-f]+) \+ (?<offset>\d+), (?<value>-?\d+), (?<timeout>inf|infinity|[0-9.]+)\) (?<message>.+)$/;
for (const line of proc.stderr.split('\n').map((line) => line.trim())) {
if (!line) continue;
console.log('Matching', { line });
const actual = line.match(re).groups;
const expected = expectedLines.shift();
const begin =
`[Thread 0] Atomics.wait(<address> + 0, 1, inf) started
[Thread 0] Atomics.wait(<address> + 0, 1, inf) did not wait because the \
values mismatched
[Thread 0] Atomics.wait(<address> + 0, 0, 10) started
[Thread 0] Atomics.wait(<address> + 0, 0, 10) timed out`;

if (SABAddress === undefined)
SABAddress = actual.SAB;
else
assert.strictEqual(actual.SAB, SABAddress);
const expectedTimelines = [
`${begin}
[Thread 0] Atomics.wait(<address> + 4, 0, inf) started
[Thread 1] Atomics.wait(<address> + 4, -1, inf) started
[Thread 0] Atomics.wait(<address> + 4, 0, inf) was woken up by another thread
[Thread 1] Atomics.wait(<address> + 4, -1, inf) was woken up by another thread`,
`${begin}
[Thread 0] Atomics.wait(<address> + 4, 0, inf) started
[Thread 0] Atomics.wait(<address> + 4, 0, inf) was woken up by another thread
[Thread 1] Atomics.wait(<address> + 4, -1, inf) started
[Thread 1] Atomics.wait(<address> + 4, -1, inf) did not wait because the \
values mismatched`,
`${begin}
[Thread 0] Atomics.wait(<address> + 4, 0, inf) started
[Thread 1] Atomics.wait(<address> + 4, -1, inf) started
[Thread 0] Atomics.wait(<address> + 4, 0, inf) was woken up by another thread
[Thread 1] Atomics.wait(<address> + 4, -1, inf) did not wait because the \
values mismatched`,
`${begin}
[Thread 0] Atomics.wait(<address> + 4, 0, inf) started
[Thread 0] Atomics.wait(<address> + 4, 0, inf) did not wait because the \
values mismatched
[Thread 1] Atomics.wait(<address> + 4, -1, inf) started
[Thread 1] Atomics.wait(<address> + 4, -1, inf) did not wait because the \
values mismatched`
];

assert.strictEqual(+actual.threadId, expected.threadId);
assert.strictEqual(+actual.offset, expected.offset);
assert.strictEqual(+actual.value, expected.value);
assert.strictEqual(actual.message, expected.message);
if (expected.timeout === 'inf')
assert.match(actual.timeout, /inf(inity)?/);
else
assert.strictEqual(actual.timeout, expected.timeout);
}
assert(expectedTimelines.includes(actualTimeline));