feedback

Author: sbc100

src/library.js

@@ -2106,6 +2106,14 @@ addToLibrary({
     throw UTF8ToString(str);
   },
 
+  emscripten_has_threading_support: () => typeof SharedArrayBuffer != 'undefined',
+
+  emscripten_num_logical_cores: () =>
+#if ENVIRONMENT_MAY_BE_NODE
+    ENVIRONMENT_IS_NODE ? require('os').cpus().length :
+#endif
+    navigator['hardwareConcurrency'],
+
 #if !MINIMAL_RUNTIME
 #if STACK_OVERFLOW_CHECK
   $handleException__deps: ['emscripten_stack_get_current'],

src/library_pthread.js

@@ -647,14 +647,6 @@ var LibraryPThread = {
     return 0;
   },
 
-  emscripten_has_threading_support: () => typeof SharedArrayBuffer != 'undefined',
-
-  emscripten_num_logical_cores: () =>
-#if ENVIRONMENT_MAY_BE_NODE
-    ENVIRONMENT_IS_NODE ? require('os').cpus().length :
-#endif
-    navigator['hardwareConcurrency'],
-
   _emscripten_init_main_thread_js: (tb) => {
     // Pass the thread address to the native code where they stored in wasm
     // globals which act as a form of TLS. Global constructors trying

src/library_wasm_worker.js

@@ -142,6 +142,9 @@ addToLibrary({
     '$_wasmWorkerAppendToQueue', '$_wasmWorkerRunPostMessage',
 #if WASM_WORKERS == 2
     '$_wasmWorkerBlobUrl',
+#endif
+#if ASSERTIONS
+    'emscripten_has_threading_support',
 #endif
   ],
   _emscripten_create_wasm_worker__postset: `
@@ -155,12 +158,12 @@ if (ENVIRONMENT_IS_WASM_WORKER
   addEventListener("message", _wasmWorkerAppendToQueue);
 }`,
   _emscripten_create_wasm_worker: (stackLowestAddress, stackSize) => {
-    if (typeof SharedArrayBuffer == 'undefined') {
 #if ASSERTIONS
-      dbg('create_wasm_worker: environment does not support SharedArrayBuffer, wasm workers are not available');
-#endif
+    if (!_emscripten_has_threading_support()) {
+      err('create_wasm_worker: environment does not support SharedArrayBuffer, wasm workers are not available');
       return 0;
     }
+#endif
     let worker = _wasmWorkers[_wasmWorkersID] = new Worker(
 #if WASM_WORKERS == 2
       // WASM_WORKERS=2 mode embeds .ww.js file contents into the main .js file

test/code_size/hello_wasm_worker_wasm.js

@@ -15,7 +15,6 @@ c && (m[0] = this, addEventListener("message", l));
 WebAssembly.instantiate(b.wasm, {
     a: {
         b: (a, d) => {
-            if ("undefined" == typeof SharedArrayBuffer) return 0;
             let r = m[n] = new Worker(b.$wb);
             r.postMessage({
                 $ww: n,

test/code_size/hello_wasm_worker_wasm.json

@@ -1,12 +1,12 @@
 {
   "a.html": 618,
   "a.html.gz": 384,
-  "a.js": 715,
-  "a.js.gz": 484,
+  "a.js": 665,
+  "a.js.gz": 455,
   "a.ww.js": 115,
   "a.ww.js.gz": 127,
   "a.wasm": 1850,
   "a.wasm.gz": 1050,
-  "total": 3298,
-  "total_gz": 2045
+  "total": 3248,
+  "total_gz": 2016
 }