Skip to content

[release/7.0-rc1] [WASM] Fix deadlock when instantiating pthread worker pool #74243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carlossanlop merged 1 commit into from
Aug 20, 2022
Merged

[release/7.0-rc1] [WASM] Fix deadlock when instantiating pthread worker pool #74243

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prevent awaiting promise that never resolves
  • Loading branch information
@simonrozsival
simonrozsival authored and github-actions committed Aug 19, 2022
commit 1a7030a5003f4f67cc90e21e36847c77bddcbf39
16 changes: 9 additions & 7 deletions src/mono/wasm/runtime/pthreads/browser/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,12 +135,14 @@ export function preAllocatePThreadWorkerPool(defaultPthreadPoolSize: number, con
export async function instantiateWasmPThreadWorkerPool(): Promise<void> {
// this is largely copied from emscripten's "receiveInstance" in "createWasm" in "src/preamble.js"
const workers = Internals.getUnusedWorkerPool();
const allLoaded = createPromiseController<void>();
let leftToLoad = workers.length;
workers.forEach((w) => {
Internals.loadWasmModuleToWorker(w, function () {
if (!--leftToLoad) allLoaded.promise_control.resolve();
if (workers.length > 0) {
const allLoaded = createPromiseController<void>();
let leftToLoad = workers.length;
workers.forEach((w) => {
Internals.loadWasmModuleToWorker(w, function () {
if (!--leftToLoad) allLoaded.promise_control.resolve();
});
});
});
await allLoaded.promise;
await allLoaded.promise;
}
}