Fix pthread + modularize + running in node worker #21832
Merged
Conversation
This file contains 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
kripken
approved these changes
Apr 25, 2024
The issue here was the special case for the setting of `scriptDirectory` under nodejs when `ENVIRONMENT_IS_WORKER`. Previously this path was not being hit when the main thread was running in a worker because we were not setting `ENVIRONMENT_IS_WORKER` in this case. This was fixed in emscripten-core#21701 and `ENVIRONMENT_IS_WORKER` was correctly set, but that meant that `scriptDirectory` then started being set incorrectly. Fixes: emscripten-core#21827
sbc100
force-pushed
the
fix_pthread_node_worker
branch
from
54f83f9
to
bd19c93
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in 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 issue here was the special case for the setting of
scriptDirectoryundernodejs when
ENVIRONMENT_IS_WORKER.Previously this path was not being hit when the main thread was running in
a worker because we were not setting
ENVIRONMENT_IS_WORKERinthis case. This was fixed in #21701 and
ENVIRONMENT_IS_WORKERwas correctly set, but that meant that
scriptDirectorythen started beingset incorrectly.
Fixes: #21827