Merge branch 'main' into typo

Author: aheejin

site/source/docs/porting/connecting_cpp_and_javascript/WebIDL-Binder.rst

@@ -318,7 +318,7 @@ You can bind to C++ operators using ``[Operator=]``:
 .. note::
 
   - The operator name can be anything (``add`` is just an example).
-  - Support is currently limited to operators that contain ``=``: ``+=``, ``*=``, ``-=`` etc., and to the array indexing operator ``[]``.
+  - Support is currently limited to the following binary operators: ``+``, ``-``, ``*``, ``/``, ``%``, ``^``, ``&``, ``|``, ``=``, ``<``, ``>``, ``+=``, ``-=``, ``*=``, ``/=``, ``%=``, ``^=``, ``&=``, ``|=``, ``<<``, ``>>``, ``>>=``, ``<<=``, ``==``, ``!=``, ``<=``, ``>=``, ``<=>``, ``&&``, ``||``, and to the array indexing operator ``[]``.
 
 
 enums

site/source/docs/tools_reference/settings_reference.rst

@@ -1166,8 +1166,6 @@ Emit instructions for the new Wasm exception handling proposal with exnref,
 which was adopted on Oct 2023. The implementation of the new proposal is
 still in progress and this feature is currently experimental.
 
-.. note:: Applicable during both linking and compilation
-
 Default value: false
 
 .. _nodejs_catch_exit:

src/library.js

@@ -2136,10 +2136,24 @@ addToLibrary({
   $runtimeKeepaliveCounter__internal: true,
   $runtimeKeepaliveCounter: 0,
 
-  $keepRuntimeAlive__deps: ['$runtimeKeepaliveCounter'],
 #if isSymbolNeeded('$noExitRuntime')
+  // If the `noExitRuntime` symbol is included in the build then
+  // keepRuntimeAlive is always conditional since its state can change
+  // at runtime.
+  $keepRuntimeAlive__deps: ['$runtimeKeepaliveCounter'],
   $keepRuntimeAlive: () => noExitRuntime || runtimeKeepaliveCounter > 0,
+#elif !EXIT_RUNTIME
+  // When `noExitRuntime` is not include and EXIT_RUNTIME=0 then we know the
+  // runtime can never exit (i.e. should always be kept alive).
+  // However for pthreads we always default to allowing the runtime to exit
+  // otherwise threads never exit and are not joinable.
+#if PTHREADS
+  $keepRuntimeAlive: () => !ENVIRONMENT_IS_PTHREAD,
 #else
+  $keepRuntimeAlive: () => true,
+#endif
+#else
+  $keepRuntimeAlive__deps: ['$runtimeKeepaliveCounter'],
   $keepRuntimeAlive: () => runtimeKeepaliveCounter > 0,
 #endif
 

src/library_wasm_worker.js

@@ -55,18 +55,13 @@ addToLibrary({
   },
 
   // Executes a wasm function call received via a postMessage.
+  $_wasmWorkerRunPostMessage__deps: ['$callUserCallback'],
   $_wasmWorkerRunPostMessage: (e) => {
     // '_wsc' is short for 'wasm call', trying to use an identifier name that
     // will never conflict with user code
-#if ENVIRONMENT_MAY_BE_NODE
-    // In Node.js environment, message event 'e' containing the actual data sent,
-    // while in the browser environment it's contained by 'e.data'.
-    let data = ENVIRONMENT_IS_NODE ? e : e.data;
-#else
     let data = e.data;
-#endif
     let wasmCall = data['_wsc'];
-    wasmCall && getWasmTableEntry(wasmCall)(...data['x']);
+    wasmCall && callUserCallback(() => getWasmTableEntry(wasmCall)(...data['x']));
   },
 
   // src/postamble_minimal.js brings this symbol in to the build, and calls this
@@ -87,6 +82,11 @@ addToLibrary({
     assert(m['sz'] % 16 == 0);
 #endif
 
+#if !MINIMAL_RUNTIME && isSymbolNeeded('$noExitRuntime')
+    // Wasm workers basically never exit their runtime
+    noExitRuntime = 1;
+#endif
+
 #if STACK_OVERFLOW_CHECK >= 2
     // _emscripten_wasm_worker_initialize() initializes the stack for this
     // Worker, but it cannot call to extern __set_stack_limits() function, or
@@ -209,6 +209,12 @@ if (ENVIRONMENT_IS_WASM_WORKER
 #endif
     });
     worker.onmessage = _wasmWorkerRunPostMessage;
+#if ENVIRONMENT_MAY_BE_NODE
+    if (ENVIRONMENT_IS_NODE) {
+      /** @suppress {checkTypes} */
+      worker.on('message', (msg) => worker.onmessage({ data: msg }));
+    }
+#endif
     return _wasmWorkersID++;
   },
 
@@ -226,9 +232,7 @@ if (ENVIRONMENT_IS_WASM_WORKER
 #if ASSERTIONS
     assert(!ENVIRONMENT_IS_WASM_WORKER, 'emscripten_terminate_all_wasm_workers() cannot be called from a Wasm Worker: only the main browser thread has visibility to terminate all Workers!');
 #endif
-    Object.values(_wasmWorkers).forEach((worker) => {
-      worker.terminate();
-    });
+    Object.values(_wasmWorkers).forEach((worker) => worker.terminate());
     _wasmWorkers = {};
   },
 

src/runtime_pthread.js

@@ -27,7 +27,7 @@ if (ENVIRONMENT_IS_PTHREAD) {
     // Create as web-worker-like an environment as we can.
 
     var parentPort = worker_threads['parentPort'];
-    parentPort.on('message', (data) => onmessage({ data: data }));
+    parentPort.on('message', (msg) => onmessage({ data: msg }));
 
     Object.assign(globalThis, {
       self: global,

src/settings.js

@@ -781,7 +781,7 @@ var EXCEPTION_STACK_TRACES = false;
 // Emit instructions for the new Wasm exception handling proposal with exnref,
 // which was adopted on Oct 2023. The implementation of the new proposal is
 // still in progress and this feature is currently experimental.
-// [compile+link]
+// [link]
 var WASM_EXNREF = false;
 
 // Emscripten throws an ExitStatus exception to unwind when exit() is called.

src/wasm_worker.js

@@ -14,7 +14,19 @@ if (ENVIRONMENT_IS_NODE) {
 
   var parentPort = nodeWorkerThreads.parentPort;
 
-  parentPort.on('message', (data) => typeof onmessage === "function" && onmessage({ data: data }));
+  parentPort.on('message', (msg) => global.onmessage?.({ data: msg }));
+
+  // Weak map of handle functions to their wrapper. Used to implement
+  // addEventListener/removeEventListener.
+  var wrappedHandlers = new WeakMap();
+  function wrapMsgHandler(h) {
+    var f = wrappedHandlers.get(h)
+    if (!f) {
+      f = (msg) => h({data: msg});
+      wrappedHandlers.set(h, f);
+    }
+    return f;
+  }
 
   var fs = require('fs');
   var vm = require('vm');
@@ -28,8 +40,8 @@ if (ENVIRONMENT_IS_NODE) {
     importScripts: (f) => vm.runInThisContext(fs.readFileSync(f, 'utf8'), {filename: f}),
     postMessage: (msg) => parentPort.postMessage(msg),
     performance: global.performance || { now: Date.now },
-    addEventListener: (name, handler) => parentPort.on(name, handler),
-    removeEventListener: (name, handler) => parentPort.off(name, handler),
+    addEventListener: (name, handler) => parentPort.on(name, wrapMsgHandler(handler)),
+    removeEventListener: (name, handler) => parentPort.off(name, wrapMsgHandler(handler)),
   });
 }
 #endif // ENVIRONMENT_MAY_BE_NODE

test/other/test_no_exit_runtime_strict.c

@@ -0,0 +1,24 @@
+#include <assert.h>
+#include <emscripten/emscripten.h>
+#include <emscripten/em_js.h>
+#include <stdio.h>
+
+// Verify that `keepRuntimeAlive()` always returns true by default (i.e. when
+// EXIT_RUNTIME=0).
+
+EM_JS_DEPS(deps, "$keepRuntimeAlive");
+
+EM_JS(void, timeout_func, (), {
+  console.log("timeout_func: keepRuntimeAlive() ->", keepRuntimeAlive());
+  // once this timeout is done the node process should exit with 0
+});
+
+int main() {
+  int keep_alive = EM_ASM_INT({
+    setTimeout(timeout_func);
+    return keepRuntimeAlive();
+  });
+  printf("main done: %d\n", keep_alive);
+  assert(keep_alive == 1);
+  return 0;
+}

test/other/test_no_exit_runtime_strict.out

@@ -0,0 +1,2 @@
+main done: 1
+timeout_func: keepRuntimeAlive() -> true

test/other/test_unoptimized_code_size_strict.js.size

@@ -1 +1 @@
-53834
+53730