src: move per-process global variables into node::per_process #25302

joyeecheung · 2019-01-01T06:19:59Z

So that it's easier to tell whether we are manipulating per-process
global states that may need to be treated with care to avoid races.

Also added comments about these variables and moved some of them
to a more suitable compilation unit:

Move v8_initialized to util.h since it's only used in
util.cc and node.cc
Rename process_mutex to tty_mutex and move it into
node_errors.cc since that's the only place it's used
to guard the tty.
Move per_process_opts_mutex and per_process_opts
into node_options.h and rename them to
per_process::cli_options[_mutex]
Rename node_isolate[_mutex] to per_process::main_isolate[_mutex]

Checklist

make -j4 test (UNIX), or vcbuild test (Windows) passes
commit message follows commit guidelines

nodejs-github-bot · 2019-01-01T06:20:01Z

@joyeecheung build started: https://ci.nodejs.org/blue/organizations/jenkins/node-test-pull-request-lite-pipeline/detail/node-test-pull-request-lite-pipeline/2120/pipeline

addaleax · 2019-01-01T19:33:00Z

src/node.cc

-unsigned int reverted = 0;
+// Isolate on the main thread
+static Mutex main_isolate_mutex;
+static Isolate* main_isolate;


Are these actually consumed anywhere? It looks like we should remove this entirely…

I think they are used to check that someone don't call Start multiple times and accidentally dispose the isolate being used in another thread..though I am having a hard time imaging how that would be possible with the current code...

node_isolate is kind of vestigial at this point, see commit 75adde0 from 2014. We couldn't remove it outright back then but we can now.

The mutex was introduced to fix a SIGUSR1 race, see commit 844f0a9. It too can be removed.

joyeecheung · 2019-01-02T13:46:00Z

CI: https://ci.nodejs.org/job/node-test-pull-request/19914/

bnoordhuis · 2019-01-03T07:18:53Z

src/node.cc

@@ -139,21 +139,28 @@ using v8::Undefined;
 using v8::V8;
 using v8::Value;

+namespace per_process {
+// Tells whether --prof is passed.
+// TODO(joyeecheung): replace this with env->options()->prof_process


I don't know if that would do any good. --prof is a global flag.

@bnoordhuis Good catch...we should probably move that to per_process::cli_options.prof_process

bnoordhuis · 2019-01-03T07:26:47Z

src/node.cc

-unsigned int reverted = 0;
+// Isolate on the main thread
+static Mutex main_isolate_mutex;
+static Isolate* main_isolate;


node_isolate is kind of vestigial at this point, see commit 75adde0 from 2014. We couldn't remove it outright back then but we can now.

The mutex was introduced to fix a SIGUSR1 race, see commit 844f0a9. It too can be removed.

So that it's easier to tell whether we are manipulating per-process global states that may need to be treated with care to avoid races. Also added comments about these variables and moved some of them to a more suitable compilation unit: - Move `v8_initialized` to `util.h` since it's only used in `util.cc` and `node.cc` - Rename `process_mutex` to `tty_mutex` and move it into `node_errors.cc` since that's the only place it's used to guard the tty. - Move `per_process_opts_mutex` and `per_process_opts` into `node_options.h` and rename them to `per_process::cli_options[_mutex]` - Rename `node_isolate[_mutex]` to `per_process::main_isolate[_mutex]`

joyeecheung · 2019-01-04T16:43:11Z

@bnoordhuis Thanks for the reviews, I've modified the TODOs. This is more of a stylish change, so I will address those in subsequence PRs...just in case there is anything we overlook.

joyeecheung · 2019-01-04T17:54:23Z

CI: https://ci.nodejs.org/job/node-test-pull-request/19934/

joyeecheung · 2019-01-06T06:04:15Z

Resume: https://ci.nodejs.org/job/node-test-pull-request/19954/

bnoordhuis

LGTM % style nit. Nice work, Joyee, I think this makes the code much more readable.

Aside: was the overhead of using std::shared_ptr discussed?

bnoordhuis · 2019-01-06T18:23:03Z

src/node_buffer.cc

-      node::UncheckedMalloc(length);
+  return per_process::cli_options->zero_fill_all_buffers
+             ? node::UncheckedCalloc(length)
+             : node::UncheckedMalloc(length);


? / : on a new line is not a style we use anywhere else, I think. It always goes on the same line as the clause preceding it.

addaleax · 2019-01-07T23:33:28Z

Landed in 9db9e7e (with @bnoordhuis’s nit addressed) 🙂

So that it's easier to tell whether we are manipulating per-process global states that may need to be treated with care to avoid races. Also added comments about these variables and moved some of them to a more suitable compilation unit: - Move `v8_initialized` to `util.h` since it's only used in `util.cc` and `node.cc` - Rename `process_mutex` to `tty_mutex` and move it into `node_errors.cc` since that's the only place it's used to guard the tty. - Move `per_process_opts_mutex` and `per_process_opts` into `node_options.h` and rename them to `per_process::cli_options[_mutex]` - Rename `node_isolate[_mutex]` to `per_process::main_isolate[_mutex]` PR-URL: #25302 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>

addaleax · 2019-01-09T00:04:25Z

This needs to be backported to v11.x.

So that it's easier to tell whether we are manipulating per-process global states that may need to be treated with care to avoid races. Also added comments about these variables and moved some of them to a more suitable compilation unit: - Move `v8_initialized` to `util.h` since it's only used in `util.cc` and `node.cc` - Rename `process_mutex` to `tty_mutex` and move it into `node_errors.cc` since that's the only place it's used to guard the tty. - Move `per_process_opts_mutex` and `per_process_opts` into `node_options.h` and rename them to `per_process::cli_options[_mutex]` - Rename `node_isolate[_mutex]` to `per_process::main_isolate[_mutex]` PR-URL: nodejs#25302 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>

So that it's easier to tell whether we are manipulating per-process global states that may need to be treated with care to avoid races. Also added comments about these variables and moved some of them to a more suitable compilation unit: - Move `v8_initialized` to `util.h` since it's only used in `util.cc` and `node.cc` - Rename `process_mutex` to `tty_mutex` and move it into `node_errors.cc` since that's the only place it's used to guard the tty. - Move `per_process_opts_mutex` and `per_process_opts` into `node_options.h` and rename them to `per_process::cli_options[_mutex]` - Rename `node_isolate[_mutex]` to `per_process::main_isolate[_mutex]` PR-URL: #25302 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>

So that it's easier to tell whether we are manipulating per-process global states that may need to be treated with care to avoid races. Also added comments about these variables and moved some of them to a more suitable compilation unit: - Move `v8_initialized` to `util.h` since it's only used in `util.cc` and `node.cc` - Rename `process_mutex` to `tty_mutex` and move it into `node_errors.cc` since that's the only place it's used to guard the tty. - Move `per_process_opts_mutex` and `per_process_opts` into `node_options.h` and rename them to `per_process::cli_options[_mutex]` - Rename `node_isolate[_mutex]` to `per_process::main_isolate[_mutex]` PR-URL: nodejs#25302 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>

joyeecheung requested a review from addaleax January 1, 2019 06:19

nodejs-github-bot added c++ Issues and PRs that require attention from people who are familiar with C++. lib / src Issues and PRs related to general changes in the lib or src directory. labels Jan 1, 2019

addaleax approved these changes Jan 1, 2019

View reviewed changes

jasnell approved these changes Jan 1, 2019

View reviewed changes

bnoordhuis reviewed Jan 3, 2019

View reviewed changes

joyeecheung added 2 commits January 5, 2019 00:35

fixup! src: move per-process global variables into node::per_process

3a58828

joyeecheung force-pushed the per-process branch from c8829cf to 3a58828 Compare January 4, 2019 16:40

joyeecheung added the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Jan 4, 2019

fhinkel approved these changes Jan 5, 2019

View reviewed changes

bnoordhuis approved these changes Jan 6, 2019

View reviewed changes

addaleax closed this Jan 7, 2019

addaleax added the backport-requested-v11.x label Jan 9, 2019

addaleax removed the backport-requested-v11.x label Jan 15, 2019

BridgeAR mentioned this pull request Jan 16, 2019

v11.7.0 proposal #25537

Merged

MylesBorins mentioned this pull request Jan 24, 2019

v11.8.0 proposal #25687

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

src: move per-process global variables into node::per_process #25302

src: move per-process global variables into node::per_process #25302

joyeecheung commented Jan 1, 2019

nodejs-github-bot commented Jan 1, 2019

addaleax Jan 1, 2019

joyeecheung Jan 1, 2019

bnoordhuis Jan 3, 2019

joyeecheung commented Jan 2, 2019

bnoordhuis Jan 3, 2019

joyeecheung Jan 4, 2019

bnoordhuis Jan 3, 2019

joyeecheung commented Jan 4, 2019

joyeecheung commented Jan 4, 2019

joyeecheung commented Jan 6, 2019

bnoordhuis left a comment

bnoordhuis Jan 6, 2019 •

edited

Loading

addaleax commented Jan 7, 2019

addaleax commented Jan 9, 2019

src: move per-process global variables into node::per_process #25302

src: move per-process global variables into node::per_process #25302

Conversation

joyeecheung commented Jan 1, 2019

Checklist

nodejs-github-bot commented Jan 1, 2019

addaleax Jan 1, 2019

Choose a reason for hiding this comment

joyeecheung Jan 1, 2019

Choose a reason for hiding this comment

bnoordhuis Jan 3, 2019

Choose a reason for hiding this comment

joyeecheung commented Jan 2, 2019

bnoordhuis Jan 3, 2019

Choose a reason for hiding this comment

joyeecheung Jan 4, 2019

Choose a reason for hiding this comment

bnoordhuis Jan 3, 2019

Choose a reason for hiding this comment

joyeecheung commented Jan 4, 2019

joyeecheung commented Jan 4, 2019

joyeecheung commented Jan 6, 2019

bnoordhuis left a comment

Choose a reason for hiding this comment

bnoordhuis Jan 6, 2019 • edited Loading

Choose a reason for hiding this comment

addaleax commented Jan 7, 2019

addaleax commented Jan 9, 2019

bnoordhuis Jan 6, 2019 •

edited

Loading