Fix pthread worker options usage with Vite bundler #22834
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
jamsinclair
commented
Nov 2, 2024
| @@ -2098,6 +2098,9 @@ def phase_final_emitting(options, state, target, wasm_target): | |||
|
|
|||
| target_dir = os.path.dirname(os.path.abspath(target)) | |||
|
|
|||
| if settings.PTHREADS: | |||
| replace_worker_options_placeholders(final_js) | |||
There was a problem hiding this comment.
Based on test failures, is there an earlier location where we should be replacing these values? 🤔
There was a problem hiding this comment.
After further reflection on how these files fit together, it seems some kind of internal setting could be a more appropriate way to configure this?
Could it be as simple as adding it to settings_internal.js and configure settings.PTHREAD_WORKER_OPTIONS in link.py?
sbc100
reviewed
Nov 4, 2024
| @@ -426,14 +407,14 @@ var LibraryPThread = { | |||
| createScriptURL: (ignored) => new URL("{{{ TARGET_JS_NAME }}}", import.meta.url) | |||
| } | |||
| ); | |||
| worker = new Worker(p.createScriptURL('ignored'), workerOptions); | |||
| worker = new Worker(p.createScriptURL('ignored'), {{{ WORKER_OPTIONS }}}); | |||
There was a problem hiding this comment.
I simpler way to do this would be to define a new macro here at the top of this file. e.g.
{{{
globalThis.WORKER_OPTIONS = {
...
};
null;
}}}
There was a problem hiding this comment.
Thank you so much! I wasn't too sure how the templating works in these files 😅 . I'll update the PR with this approach when I get a chance.
7 tasks
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.
Overview
An attempt at solving #22394.
When code using threads is compiled with Emscripten and then bundled with Vite it does not bundle and throws an error.
This is due to a variable reference for worker options being used during worker construction. For vite to bundle workers it needs static references.
As discussed in the issue, the easiest solution would be to switch to using an object literal for each worker construction.