From c75cb5aa8b279859d92db39506ec3da224e48dba Mon Sep 17 00:00:00 2001 From: Leko Date: Mon, 11 Dec 2017 13:05:54 +0900 Subject: [PATCH] src: allow --perf-(basic-)?prof in NODE_OPTIONS PR-URL: https://github.com/nodejs/node/pull/17600 Reviewed-By: Richard Lau Reviewed-By: Colin Ihrig Reviewed-By: Ruben Bridgewater Reviewed-By: James M Snell Reviewed-By: Luigi Pinca Reviewed-By: Benjamin Gruenbaum Reviewed-By: Joyee Cheung Reviewed-By: Michael Dawson --- doc/api/cli.md | 2 ++ src/node.cc | 2 ++ test/parallel/test-cli-node-options.js | 9 +++++++++ 3 files changed, 13 insertions(+) diff --git a/doc/api/cli.md b/doc/api/cli.md index b8ea4826dec2fe..6bae0a67c3d101 100644 --- a/doc/api/cli.md +++ b/doc/api/cli.md @@ -475,6 +475,8 @@ Node options that are allowed are: V8 options that are allowed are: - `--abort-on-uncaught-exception` - `--max-old-space-size` +- `--perf-basic-prof` +- `--perf-prof` - `--stack-trace-limit` ### `NODE_PENDING_DEPRECATION=1` diff --git a/src/node.cc b/src/node.cc index e86e48060c3ce8..50bba93f1778c7 100644 --- a/src/node.cc +++ b/src/node.cc @@ -3530,6 +3530,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", diff --git a/test/parallel/test-cli-node-options.js b/test/parallel/test-cli-node-options.js index 29358134c22c99..c9f2d5eace022d 100644 --- a/test/parallel/test-cli-node-options.js +++ b/test/parallel/test-cli-node-options.js @@ -26,6 +26,15 @@ expect('--zero-fill-buffers', 'B\n'); expect('--v8-pool-size=10', 'B\n'); expect('--trace-event-categories node', 'B\n'); +if (!common.isWindows) { + expect('--perf-basic-prof', 'B\n'); +} + +if (common.isLinux && ['arm', 'x64', 'mips'].includes(process.arch)) { + // PerfJitLogger is only implemented in Linux. + expect('--perf-prof', 'B\n'); +} + if (common.hasCrypto) { expect('--use-openssl-ca', 'B\n'); expect('--use-bundled-ca', 'B\n');