Fix keepRuntimeAlive in the case where EXIT_RUNTIME=0 and noExitRuntime is not referenced #22542
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
reviewed
Sep 9, 2024
sbc100
force-pushed
the
noExitRuntime
branch
4 times, most recently
from
47833bf
to
0fed818
Compare
sbc100
commented
Sep 9, 2024
sbc100
force-pushed
the
noExitRuntime
branch
from
0fed818
to
d88a5a2
Compare
kleisauke
reviewed
Sep 10, 2024
src/library_pthread.js
Outdated
| @@ -188,7 +188,7 @@ var LibraryPThread = { | |||
| // worker pool as an unused worker. | |||
| worker.pthread_ptr = 0; | |||
|
|
|||
| #if ENVIRONMENT_MAY_BE_NODE && PROXY_TO_PTHREAD | |||
There was a problem hiding this comment.
Could you clarify why this change is necessary? AFAIK, all threads should already be weakly referenced by this point, this should only be required for the "main" thread in PROXY_TO_PTHREAD mode, see:
#19073 (comment)
kripken
reviewed
Sep 10, 2024
sbc100
force-pushed
the
noExitRuntime
branch
2 times, most recently
from
63d5d7a
to
5f573a9
Compare
…me is not referenced Essentially the `keepRuntimeAlive` was relying on the `noExitRuntime` variable being set based on `EXIT_RUNTIME` but when `noExitRuntime` was absent the `EXIT_RUNTIME` settings was being ignored and the runtime was exiting even though `EXIT_RUNTIME=0` was set (the default). Fixes: emscripten-core#20636
sbc100
force-pushed
the
noExitRuntime
branch
from
5f573a9
to
6df94dd
Compare
kripken
reviewed
Sep 11, 2024
| int keep_alive = EM_ASM_INT({ | ||
| setTimeout(timeout_func); | ||
| return keepRuntimeAlive(); | ||
| }, emscripten_force_exit); |
There was a problem hiding this comment.
Why is a parameter passed in here?
| // EXIT_RUNTIME=0). | ||
|
|
||
| EM_JS(void, timeout_func, (), { | ||
| console.log("timeout_func: keepRuntimeAlive() ->", keepRuntimeAlive()); |
There was a problem hiding this comment.
Do you not need to ensure that keepRuntimeAlive is available in JS?
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.
Essentially the
keepRuntimeAlivewas relying on thenoExitRuntimevariable being set based onEXIT_RUNTIMEbut whennoExitRuntimewas absent theEXIT_RUNTIMEsettings was being ignored and the runtime was exiting even thoughEXIT_RUNTIME=0was set (the default).Fixes: #20636