Skip to content

Simplify pthread ref/unref handling. NFC #26939

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
sbc100 merged 1 commit into from
May 13, 2026
+14 −20
Merged

Simplify pthread ref/unref handling. NFC #26939

Show file tree
Hide file tree
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
22 changes: 8 additions & 14 deletions src/lib/libpthread.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,10 +296,8 @@ var LibraryPThread = {
markAsFinished(d.thread);
#endif
} else if (cmd === 'loaded') {
worker.loaded = true;
#if ENVIRONMENT_MAY_BE_NODE && PTHREAD_POOL_SIZE
// Check that this worker doesn't have an associated pthread.
if (ENVIRONMENT_IS_NODE && !worker.pthread_ptr) {
#if ENVIRONMENT_MAY_BE_NODE
if (ENVIRONMENT_IS_NODE && !worker.strongref) {
// Once worker is loaded & idle, mark it as weakly referenced,
// so that mere existence of a Worker in the pool does not prevent
// Node.js from exiting the app.
Expand Down Expand Up @@ -604,7 +602,12 @@ var LibraryPThread = {
// back to the main thread.
#if ENVIRONMENT_MAY_BE_NODE
if (ENVIRONMENT_IS_NODE) {
PThread.pthreads[thread].ref();
var worker = PThread.pthreads[thread];
worker.ref();
// Also, record that we called strongref, in case this function is called
// bafore the 'loaded' callback from the thread (where we would normally
// `unref` it.
worker.strongref = 1;
Comment thread
sbc100 marked this conversation as resolved.
}
#endif
},
Expand Down Expand Up @@ -702,15 +705,6 @@ var LibraryPThread = {
// in this file, and not from the external worker.js.
msg.moduleCanvasId = threadParams.moduleCanvasId;
msg.offscreenCanvases = threadParams.offscreenCanvases;
#endif
#if ENVIRONMENT_MAY_BE_NODE
if (ENVIRONMENT_IS_NODE) {
// Mark worker as weakly referenced once we start executing a pthread,
// so that its existence does not prevent Node.js from exiting. This
// has no effect if the worker is already weakly referenced (e.g. if
// this worker was previously idle/unused).
worker.unref();
}
#endif
// Ask the worker to start executing its pthread entry point function.
worker.postMessage(msg, threadParams.transferList);
Expand Down
4 changes: 2 additions & 2 deletions test/codesize/test_codesize_minimal_pthreads.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"a.out.js": 7367,
"a.out.js": 7365,
"a.out.js.gz": 3587,
"a.out.nodebug.wasm": 19037,
"a.out.nodebug.wasm.gz": 8787,
"total": 26404,
"total": 26402,
"total_gz": 12374,
"sent": [
"a (memory)",
Expand Down
8 changes: 4 additions & 4 deletions test/codesize/test_codesize_minimal_pthreads_memgrowth.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"a.out.js": 7776,
"a.out.js.gz": 3791,
"a.out.js": 7774,
"a.out.js.gz": 3793,
"a.out.nodebug.wasm": 19038,
"a.out.nodebug.wasm.gz": 8788,
"total": 26814,
"total_gz": 12579,
"total": 26812,
"total_gz": 12581,
"sent": [
"a (memory)",
"b (exit)",
Expand Down
Loading