Auto-generate sigs for src/library_trace.js (#19261)

Author: sbc100

src/library.js

@@ -281,7 +281,7 @@ mergeInto(LibraryManager.library, {
 #endif
 
 #if EMSCRIPTEN_TRACING
-        _emscripten_trace_js_log_message("Emscripten", "Enlarging memory arrays from " + oldSize + " to " + newSize);
+        traceLogMessage("Emscripten", "Enlarging memory arrays from " + oldSize + " to " + newSize);
         // And now report the new layout
         _emscripten_trace_report_memory_layout();
 #endif

src/library_sigs.js

@@ -717,6 +717,31 @@ sigs = {
   emscripten_supports_offscreencanvas__sig: 'i',
   emscripten_throw_number__sig: 'vd',
   emscripten_throw_string__sig: 'vp',
+  emscripten_trace_annotate_address_type__sig: 'vpp',
+  emscripten_trace_associate_storage_size__sig: 'vpi',
+  emscripten_trace_close__sig: 'v',
+  emscripten_trace_configure__sig: 'vpp',
+  emscripten_trace_configure_for_google_wtf__sig: 'v',
+  emscripten_trace_configure_for_test__sig: 'v',
+  emscripten_trace_enter_context__sig: 'vp',
+  emscripten_trace_exit_context__sig: 'v',
+  emscripten_trace_log_message__sig: 'vpp',
+  emscripten_trace_mark__sig: 'vp',
+  emscripten_trace_record_allocation__sig: 'vpi',
+  emscripten_trace_record_frame_end__sig: 'v',
+  emscripten_trace_record_frame_start__sig: 'v',
+  emscripten_trace_record_free__sig: 'vp',
+  emscripten_trace_record_reallocation__sig: 'vppi',
+  emscripten_trace_report_error__sig: 'vp',
+  emscripten_trace_report_memory_layout__sig: 'v',
+  emscripten_trace_report_off_heap_data__sig: 'v',
+  emscripten_trace_set_enabled__sig: 'vi',
+  emscripten_trace_set_session_username__sig: 'vp',
+  emscripten_trace_task_associate_data__sig: 'vpp',
+  emscripten_trace_task_end__sig: 'v',
+  emscripten_trace_task_resume__sig: 'vip',
+  emscripten_trace_task_start__sig: 'vip',
+  emscripten_trace_task_suspend__sig: 'vp',
   emscripten_unlock_orientation__sig: 'i',
   emscripten_unwind_to_js_event_loop__sig: 'v',
   emscripten_vibrate__sig: 'ii',

src/library_trace.js

@@ -6,9 +6,9 @@
 
 var LibraryTracing = {
   $EmscriptenTrace__deps: [
-    'emscripten_trace_js_configure', 'emscripten_trace_configure_for_google_wtf',
-    'emscripten_trace_js_enter_context', 'emscripten_trace_exit_context',
-    'emscripten_trace_js_log_message', 'emscripten_trace_js_mark',
+    '$traceConfigure', 'emscripten_trace_configure_for_google_wtf',
+    '$traceEnterContext', 'emscripten_trace_exit_context',
+    '$traceLogMessage', '$traceMark',
     'emscripten_get_now'
   ],
   $EmscriptenTrace__postset: 'EmscriptenTrace.init()',
@@ -49,12 +49,12 @@ var LibraryTracing = {
     EVENT_USER_NAME: 'user-name',
 
     init: function() {
-      Module['emscripten_trace_configure'] = _emscripten_trace_js_configure;
+      Module['emscripten_trace_configure'] = traceConfigure;
       Module['emscripten_trace_configure_for_google_wtf'] = _emscripten_trace_configure_for_google_wtf;
-      Module['emscripten_trace_enter_context'] = _emscripten_trace_js_enter_context;
+      Module['emscripten_trace_enter_context'] = traceEnterContext;
       Module['emscripten_trace_exit_context'] = _emscripten_trace_exit_context;
-      Module['emscripten_trace_log_message'] = _emscripten_trace_js_log_message;
-      Module['emscripten_trace_mark'] = _emscripten_trace_js_mark;
+      Module['emscripten_trace_log_message'] = traceLogMessage;
+      Module['emscripten_trace_mark'] = traceMark;
     },
 
     // Work around CORS issues ...
@@ -133,7 +133,7 @@ var LibraryTracing = {
     }
   },
 
-  emscripten_trace_js_configure: function(collector_url, application) {
+  $traceConfigure: function(collector_url, application) {
     EmscriptenTrace.configure(collector_url, application);
   },
 
@@ -172,15 +172,14 @@ var LibraryTracing = {
     }
   },
 
-  emscripten_trace_js_log_message: function(channel, message) {
+  $traceLogMessage: function(channel, message) {
     if (EmscriptenTrace.postEnabled) {
       var now = EmscriptenTrace.now();
       EmscriptenTrace.post([EmscriptenTrace.EVENT_LOG_MESSAGE, now,
                             channel, message]);
     }
   },
 
-  emscripten_trace_log_message__sig: 'vpp',
   emscripten_trace_log_message: function(channel, message) {
     if (EmscriptenTrace.postEnabled) {
       var now = EmscriptenTrace.now();
@@ -190,7 +189,7 @@ var LibraryTracing = {
     }
   },
 
-  emscripten_trace_js_mark: function(message) {
+  $traceMark: function(message) {
     if (EmscriptenTrace.postEnabled) {
       var now = EmscriptenTrace.now();
       EmscriptenTrace.post([EmscriptenTrace.EVENT_LOG_MESSAGE, now,
@@ -201,7 +200,6 @@ var LibraryTracing = {
     }
   },
 
-  emscripten_trace_mark__sig: 'vp',
   emscripten_trace_mark: function(message) {
     if (EmscriptenTrace.postEnabled) {
       var now = EmscriptenTrace.now();
@@ -300,7 +298,7 @@ var LibraryTracing = {
     }
   },
 
-  emscripten_trace_js_enter_context: function(name) {
+  $traceEnterContext: function(name) {
     if (EmscriptenTrace.postEnabled) {
       var now = EmscriptenTrace.now();
       EmscriptenTrace.post([EmscriptenTrace.EVENT_ENTER_CONTEXT,
@@ -311,7 +309,6 @@ var LibraryTracing = {
     }
   },
 
-  emscripten_trace_enter_context__sig: 'vp',
   emscripten_trace_enter_context: function(name) {
     if (EmscriptenTrace.postEnabled) {
       var now = EmscriptenTrace.now();
@@ -333,7 +330,6 @@ var LibraryTracing = {
     }
   },
 
-  emscripten_trace_task_start__sig: 'vip',
   emscripten_trace_task_start: function(task_id, name) {
     if (EmscriptenTrace.postEnabled) {
       var now = EmscriptenTrace.now();

tools/gen_sig_info.py

@@ -40,6 +40,7 @@
 #include <emscripten/fetch.h>
 #include <emscripten/webaudio.h>
 #include <emscripten/threading.h>
+#include <emscripten/trace.h>
 #include <emscripten/proxying.h>
 #include <wasi/api.h>
 
@@ -282,6 +283,7 @@ def extract_sig_info(sig_info, extra_settings=None, extra_cflags=None, cxx=False
       'src/library_webaudio.js',
       'src/library_fetch.js',
       'src/library_pthread.js',
+      'src/library_trace.js',
     ],
     'SUPPORT_LONGJMP': 'emscripten'
   }
@@ -311,6 +313,7 @@ def extract_sig_info(sig_info, extra_settings=None, extra_cflags=None, cxx=False
     # or `size_t` types.  These get marked as `p` in the `__sig`.
     obj_file = 'out.o'
     cmd = [compiler, c_file, '-c', '-pthread',
+           '--tracing',
            '-Wno-deprecated-declarations',
            '-I' + utils.path_from_root('system/lib/libc'),
            '-o', obj_file]