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

Allow --perf-prof and --perf-basic-prof in NODE_OPTIONS #17600

Closed
wants to merge 11 commits into from
Closed

Allow --perf-prof and --perf-basic-prof in NODE_OPTIONS #17600

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b778ba1
src: allow --perf-prof and --perf-basic-prof in NODE_OPTIONS
Leko Dec 11, 2017
b35f846
test: add test about perf-prof and perf-basic-prof are allowed in NOD…
Leko Dec 11, 2017
1b7a8d1
src: redefine perf_prof and perf_basic_prof as option for v8
Leko Dec 11, 2017
702bd35
test: test --perf-prof only in Linux
Leko Dec 11, 2017
0899557
test: remove Github link
Leko Dec 11, 2017
81a0684
doc: add --perf-prof and --perf-basic-prof to V8 options
Leko Dec 12, 2017
b97987a
doc: sort V8 options in alphabetical order
Leko Dec 13, 2017
e32f7a4
test: add whitelist to restrict test target
Leko Dec 27, 2017
d9e8573
test: Not run test in Windows or 32bit
Leko Dec 28, 2017
c436f72
test: remove redundant condition
Leko Jan 12, 2018
8b7d8be
test: Run test --perf-basic-prof except for windows
Leko Jan 18, 2018
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
2 changes: 2 additions & 0 deletions src/node.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3597,6 +3597,8 @@ static void CheckIfAllowedInEnv(const char* exe, bool is_env,
"--icu-data-dir",

// V8 options (define with '_', which allows '-' or '_')
"--perf_prof",
"--perf_basic_prof",
"--abort_on_uncaught_exception",
"--max_old_space_size",
"--stack_trace_limit",
Expand Down
7 changes: 7 additions & 0 deletions test/parallel/test-cli-node-options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@ expect('--throw-deprecation', 'B\n');
expect('--zero-fill-buffers', 'B\n');
expect('--v8-pool-size=10', 'B\n');
expect('--trace-event-categories node', 'B\n');
expect('--perf-basic-prof', 'B\n');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be wrapped in if (!common.isWindows)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I fixed it. Please re-run CI.


if (common.isLinux) {
// PerfJitLogger is only implemented in Linux.
// https://github.com/nodejs/node/pull/17600#issuecomment-350664113
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's safe to drop the GitHub link.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cjihrig Thank you for review.
I got it. I removed Github link.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Leko FWIW this is written in the comments in deps/v8/src/perf-jit.h

expect('--perf-prof', 'B\n');
}

if (common.hasCrypto) {
expect('--use-openssl-ca', 'B\n');
Expand Down