diff options
author | Anna Henningsen <anna@addaleax.net> | 2020-04-03 00:40:25 +0300 |
---|---|---|
committer | Anna Henningsen <anna@addaleax.net> | 2020-04-03 05:32:52 +0300 |
commit | f621536d8160d3305e8b384e779ed91716c77921 (patch) | |
tree | 5bc9a4e6d062a90454d329bc0addcc1411953d34 /src/node.cc | |
parent | 79478113d4b405051a14678fdf2d5fd4b88b90f8 (diff) |
Revert "embedding: make Stop() stop Workers"
This reverts commit 037ac99ed5aa763b7a3567da2cc81f9d7b97bdf9.
As flaky CI failures have revealed, this feature was implemented
incorrectly. `stop_sub_worker_contexts()` needs to be called on the
thread on which the `Environment` is currently running, it’s not
thread-safe. The current API requires `Stop()` to be thread-safe,
though.
We could add a new API for this, but unless there’s demand, that’s
probably not necessary as `FreeEnvironment()` will also stop Workers,
which is commonly the next action on an `Environment` instance after
having `Stop()` called on it.
Refs: https://github.com/nodejs/node/pull/32531
PR-URL: https://github.com/nodejs/node/pull/32623
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Diffstat (limited to 'src/node.cc')
-rw-r--r-- | src/node.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/node.cc b/src/node.cc index 302b277493c..9e0e2464a02 100644 --- a/src/node.cc +++ b/src/node.cc @@ -1059,7 +1059,7 @@ int Start(int argc, char** argv) { } int Stop(Environment* env) { - env->Stop(); + env->ExitEnv(); return 0; } |