src: use thread_local to declare modpending #28456
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nodejs-github-bot
added
the
c++
addaleax
approved these changes
Jun 27, 2019
bnoordhuis
approved these changes
Jun 28, 2019
src/node_binding.cc
Outdated
| @@ -243,8 +243,7 @@ using v8::Value; | |||
| // Globals per process | |||
| static node_module* modlist_internal; | |||
| static node_module* modlist_linked; | |||
| static uv_once_t init_modpending_once = UV_ONCE_INIT; | |||
| static uv_key_t thread_local_modpending; | |||
| static thread_local struct node_module* thread_local_modpending = nullptr; | |||
There was a problem hiding this comment.
Just node_module*, no struct (see lines above), and the = nullptr isn't strictly necessary.
There was a problem hiding this comment.
👍 on the node_module*, but I'd like to keep the initialization because we do a
CHECK_NULL(thread_local_modpending);later on, and I'm not 100% sure that these variables get initialized on every platform.
There was a problem hiding this comment.
OK, looks like the variable oughta get zeroed out: https://en.cppreference.com/w/cpp/language/initialization#Static_initialization
gabrielschulhof
force-pushed
the
thread-local-modpending
branch
from
b2ad535 to
72fb292
Compare
The pointer used to hold an incoming dynamically loaded module's `node::node_module` structure needs to be thread-local. So far this was done with `uv_key_set()` and `uv_key_get()`. The language now supports the `thread_local` keyword which makes implementing this a lot cleaner.
gabrielschulhof
force-pushed
the
thread-local-modpending
branch
from
72fb292 to
e7b6417
Compare
|
Let's see if rebasing makes a difference for the CI. |
|
CI: https://ci.nodejs.org/job/node-test-pull-request/24227/ |
|
Landed in d3b10f6. |
gabrielschulhof
pushed a commit
to gabrielschulhof/node
that referenced
this pull request
Jul 2, 2019
The pointer used to hold an incoming dynamically loaded module's `node::node_module` structure needs to be thread-local. So far this was done with `uv_key_set()` and `uv_key_get()`. The language now supports the `thread_local` keyword which makes implementing this a lot cleaner. PR-URL: nodejs#28456 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Anna Henningsen <anna@addaleax.net>
targos
pushed a commit
that referenced
this pull request
Jul 20, 2019
The pointer used to hold an incoming dynamically loaded module's `node::node_module` structure needs to be thread-local. So far this was done with `uv_key_set()` and `uv_key_get()`. The language now supports the `thread_local` keyword which makes implementing this a lot cleaner. PR-URL: #28456 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Anna Henningsen <anna@addaleax.net>
This was referenced Jul 23, 2019
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The pointer used to hold an incoming dynamically loaded module's
node::node_modulestructure needs to be thread-local. So far this wasdone with
uv_key_set()anduv_key_get(). The language now supportsthe
thread_localkeyword which makes implementing this a lot cleaner.Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passes