Auto-generate sigs for src/library_wasm_worker.js (#19263)

sbc100 · web-flow · commit ae8d76b29f18 · 2023-05-10T19:22:39.000-07:00
diff --git a/emcc.py b/emcc.py
@@ -2426,7 +2426,7 @@ def phase_linker_setup(options, state, newargs):
     wasm_worker_imports = ['_emscripten_wasm_worker_initialize', '___set_thread_state']
     settings.EXPORTED_FUNCTIONS += wasm_worker_imports
     building.user_requested_exports.update(wasm_worker_imports)
-    settings.DEFAULT_LIBRARY_FUNCS_TO_INCLUDE += ['_wasm_worker_initializeRuntime']
+    settings.DEFAULT_LIBRARY_FUNCS_TO_INCLUDE += ['$_wasmWorkerInitializeRuntime']
     # set location of Wasm Worker bootstrap JS file
     if settings.WASM_WORKERS == 1:
       settings.WASM_WORKER_FILE = unsuffixed(os.path.basename(target)) + '.ww.js'
diff --git a/src/library_sigs.js b/src/library_sigs.js
@@ -298,6 +298,7 @@ sigs = {
   _embind_register_value_object__sig: 'vpppppp',
   _embind_register_value_object_field__sig: 'vpppppppppp',
   _embind_register_void__sig: 'vpp',
+  _emscripten_create_wasm_worker__sig: 'ipi',
   _emscripten_dbg__sig: 'vp',
   _emscripten_default_pthread_stack_size__sig: 'i',
   _emscripten_dlopen_js__sig: 'vpppp',
@@ -505,6 +506,11 @@ sigs = {
   emscripten_async_wget2_abort__sig: 'vi',
   emscripten_async_wget2_data__sig: 'ippppippp',
   emscripten_async_wget_data__sig: 'vpppp',
+  emscripten_atomic_cancel_all_wait_asyncs__sig: 'i',
+  emscripten_atomic_cancel_all_wait_asyncs_at_address__sig: 'ip',
+  emscripten_atomic_cancel_wait_async__sig: 'ii',
+  emscripten_atomic_wait_async__sig: 'ipippd',
+  emscripten_atomics_is_lock_free__sig: 'ii',
   emscripten_audio_context_state__sig: 'ii',
   emscripten_audio_worklet_post_function_sig__sig: 'vippp',
   emscripten_audio_worklet_post_function_v__sig: 'vip',
@@ -529,6 +535,7 @@ sigs = {
   emscripten_create_wasm_audio_worklet_processor_async__sig: 'vippp',
   emscripten_create_worker__sig: 'ip',
   emscripten_current_thread_is_audio_worklet__sig: 'i',
+  emscripten_current_thread_is_wasm_worker__sig: 'i',
   emscripten_date_now__sig: 'd',
   emscripten_debugger__sig: 'v',
   emscripten_destroy_audio_context__sig: 'vi',
@@ -583,6 +590,7 @@ sigs = {
   emscripten_idb_load__sig: 'vppppp',
   emscripten_idb_store__sig: 'vpppip',
   emscripten_is_webgl_context_lost__sig: 'ii',
+  emscripten_lock_async_acquire__sig: 'vpppd',
   emscripten_lock_orientation__sig: 'ii',
   emscripten_log__sig: 'vipp',
   emscripten_math_acos__sig: 'dd',
@@ -613,6 +621,7 @@ sigs = {
   emscripten_math_tan__sig: 'dd',
   emscripten_math_tanh__sig: 'dd',
   emscripten_memcpy_big__sig: 'vppp',
+  emscripten_navigator_hardware_concurrency__sig: 'i',
   emscripten_notify_memory_growth__sig: 'vp',
   emscripten_num_logical_cores__sig: 'i',
   emscripten_pause_main_loop__sig: 'v',
@@ -652,6 +661,7 @@ sigs = {
   emscripten_runtime_keepalive_push__sig: 'v',
   emscripten_sample_gamepad_data__sig: 'i',
   emscripten_scan_registers__sig: 'vp',
+  emscripten_semaphore_async_acquire__sig: 'vpippd',
   emscripten_set_batterychargingchange_callback_on_thread__sig: 'ippp',
   emscripten_set_batterylevelchange_callback_on_thread__sig: 'ippp',
   emscripten_set_beforeunload_callback_on_thread__sig: 'ippp',
@@ -714,6 +724,8 @@ sigs = {
   emscripten_start_fetch__sig: 'vp',
   emscripten_start_wasm_audio_worklet_thread_async__sig: 'vipipp',
   emscripten_supports_offscreencanvas__sig: 'i',
+  emscripten_terminate_all_wasm_workers__sig: 'v',
+  emscripten_terminate_wasm_worker__sig: 'vi',
   emscripten_throw_number__sig: 'vd',
   emscripten_throw_string__sig: 'vp',
   emscripten_trace_annotate_address_type__sig: 'vpp',
@@ -745,6 +757,15 @@ sigs = {
   emscripten_unwind_to_js_event_loop__sig: 'v',
   emscripten_vibrate__sig: 'ii',
   emscripten_vibrate_pattern__sig: 'ipi',
+  emscripten_wasm_worker_post_function_sig__sig: 'vippp',
+  emscripten_wasm_worker_post_function_v__sig: 'vip',
+  emscripten_wasm_worker_post_function_vd__sig: 'vipd',
+  emscripten_wasm_worker_post_function_vdd__sig: 'vipdd',
+  emscripten_wasm_worker_post_function_vddd__sig: 'vipddd',
+  emscripten_wasm_worker_post_function_vi__sig: 'vipi',
+  emscripten_wasm_worker_post_function_vii__sig: 'vipii',
+  emscripten_wasm_worker_post_function_viii__sig: 'vipiii',
+  emscripten_wasm_worker_self_id__sig: 'i',
   emscripten_webgl_commit_frame__sig: 'i',
   emscripten_webgl_create_context__sig: 'ipp',
   emscripten_webgl_destroy_context__sig: 'ii',
diff --git a/src/library_wasm_worker.js b/src/library_wasm_worker.js
diff --git a/src/library_webaudio.js b/src/library_webaudio.js
@@ -123,7 +123,7 @@ let LibraryWebAudio = {
 
 #if AUDIO_WORKLET
   emscripten_start_wasm_audio_worklet_thread_async__deps: [
-    'wasm_workers_id',
+    '$_wasmWorkersID',
     '$_EmAudioDispatchProcessorCallback'],
   emscripten_start_wasm_audio_worklet_thread_async: function(contextHandle, stackLowestAddress, stackSize, callback, userData) {
 
@@ -175,7 +175,7 @@ let LibraryWebAudio = {
 #endif
       audioWorklet.bootstrapMessage = new AudioWorkletNode(audioContext, 'message', {
         processorOptions: {
-          '$ww': _wasm_workers_id++, // Assign the loaded AudioWorkletGlobalScope a Wasm Worker ID so that it can utilized its own TLS slots, and it is recognized to not be the main browser thread.
+          '$ww': _wasmWorkersID++, // Assign the loaded AudioWorkletGlobalScope a Wasm Worker ID so that it can utilized its own TLS slots, and it is recognized to not be the main browser thread.
 #if MINIMAL_RUNTIME
           'wasm': Module['wasm'],
           'mem': wasmMemory,
diff --git a/src/postamble_minimal.js b/src/postamble_minimal.js
@@ -65,7 +65,7 @@ function initRuntime(asm) {
 #endif
 
 #if WASM_WORKERS
-  if (ENVIRONMENT_IS_WASM_WORKER) return __wasm_worker_initializeRuntime();
+  if (ENVIRONMENT_IS_WASM_WORKER) return _wasmWorkerInitializeRuntime();
 #endif
 
 #if STACK_OVERFLOW_CHECK
diff --git a/src/preamble.js b/src/preamble.js
@@ -221,7 +221,7 @@ function initRuntime() {
   runtimeInitialized = true;
 
 #if WASM_WORKERS
-  if (ENVIRONMENT_IS_WASM_WORKER) return __wasm_worker_initializeRuntime();
+  if (ENVIRONMENT_IS_WASM_WORKER) return _wasmWorkerInitializeRuntime();
 #endif
 
 #if PTHREADS
diff --git a/system/lib/libc/emscripten_internal.h b/system/lib/libc/emscripten_internal.h
@@ -14,6 +14,7 @@
 #include <emscripten/em_macros.h>
 #include <emscripten/proxying.h>
 #include <emscripten/html5.h>
+#include <emscripten/wasm_worker.h>
 
 #include <signal.h>    // for `sighandler_t`
 #include <stdbool.h>   // for `bool`
@@ -132,6 +133,10 @@ void _emscripten_fetch_free(unsigned int);
 
 EMSCRIPTEN_RESULT _emscripten_set_offscreencanvas_size(const char *target, int width, int height);
 
+// Internal implementation function in JavaScript side that emscripten_create_wasm_worker() calls to
+// to perform the wasm worker creation.
+emscripten_wasm_worker_t _emscripten_create_wasm_worker(void *stackLowestAddress, uint32_t stackSize);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/system/lib/wasm_worker/library_wasm_worker.c b/system/lib/wasm_worker/library_wasm_worker.c
@@ -5,17 +5,15 @@
 #include <emscripten/stack.h>
 #include <malloc.h>
 
+#include "emscripten_internal.h"
+
 #ifndef __EMSCRIPTEN_WASM_WORKERS__
 #error __EMSCRIPTEN_WASM_WORKERS__ should be defined when building this file!
 #endif
 
 // Options:
 // #define STACK_OVERFLOW_CHECK 0/1/2 : set to the current stack overflow check mode
 
-// Internal implementation function in JavaScript side that emscripten_create_wasm_worker() calls to
-// to perform the wasm worker creation.
-emscripten_wasm_worker_t _emscripten_create_wasm_worker(void *stackLowestAddress, uint32_t stackSize);
-
 void __wasm_init_tls(void *memory);
 
 __attribute__((constructor(48)))
diff --git a/test/code_size/hello_wasm_worker_wasm.js b/test/code_size/hello_wasm_worker_wasm.js
@@ -2,40 +2,40 @@ var b = Module, c = b.$ww, f, e = b.mem || new WebAssembly.Memory({
     initial: 256,
     maximum: 256,
     shared: !0
-}), g = e.buffer, h = {}, k = 1, m = [], p, q;
+}), g = e.buffer, h = [], m = {}, n = 1, p, q;
 
-function l(a) {
-    m.push(a);
-}
-
-function n(a) {
+function k(a) {
     a = a.data;
     let d = a._wsc;
     d && f.get(d)(...a.x);
 }
 
-c && (h[0] = this, addEventListener("message", l));
+function l(a) {
+    h.push(a);
+}
+
+c && (m[0] = this, addEventListener("message", l));
 
 WebAssembly.instantiate(b.wasm, {
     a: {
         b: function(a, d) {
-            let r = h[k] = new Worker(b.$wb);
+            let r = m[n] = new Worker(b.$wb);
             r.postMessage({
-                $ww: k,
+                $ww: n,
                 wasm: b.wasm,
                 js: b.js,
                 mem: e,
                 sb: a,
                 sz: d
             });
-            r.onmessage = n;
-            return k++;
+            r.onmessage = k;
+            return n++;
         },
         c: function() {
             return !1;
         },
         d: function(a, d) {
-            h[a].postMessage({
+            m[a].postMessage({
                 _wsc: d,
                 x: []
             });
@@ -50,7 +50,7 @@ WebAssembly.instantiate(b.wasm, {
     p = a.g;
     q = a.i;
     f = a.h;
-    c ? (a = b, q(a.sb, a.sz), removeEventListener("message", l), m = m.forEach(n), 
-    addEventListener("message", n)) : a.f();
+    c ? (a = b, q(a.sb, a.sz), removeEventListener("message", l), h = h.forEach(k), 
+    addEventListener("message", k)) : a.f();
     c || p();
 }));
diff --git a/tools/gen_sig_info.py b/tools/gen_sig_info.py
@@ -37,6 +37,7 @@
 #include <emscripten/html5.h>
 #include <emscripten/fiber.h>
 #include <emscripten/websocket.h>
+#include <emscripten/wasm_worker.h>
 #include <emscripten/fetch.h>
 #include <emscripten/webaudio.h>
 #include <emscripten/threading.h>
@@ -354,6 +355,7 @@ def main(args):
 
   print('generating signatures ...')
   sig_info = {}
+  extract_sig_info(sig_info, {'WASM_WORKERS': 1, 'JS_LIBRARIES': ['src/library_wasm_worker.js']})
   extract_sig_info(sig_info, {'USE_GLFW': 3}, ['-DGLFW3'])
   extract_sig_info(sig_info, {'JS_LIBRARIES': ['src/embind/embind.js', 'src/embind/emval.js'],
                               'USE_SDL': 0,
diff --git a/tools/system_libs.py b/tools/system_libs.py
@@ -1334,6 +1334,7 @@ def can_use(self):
 
 class libwasm_workers(MTLibrary):
   name = 'libwasm_workers'
+  includes = ['system/lib/libc']
 
   def __init__(self, **kwargs):
     self.debug = kwargs.pop('debug')
