Skip to content

Commit 9154b00

Browse files
sbc100sbc100
authored
Auto-generate sigs for src/library_trace.js (emscripten-core#19261)
1 parent ba2633b commit 9154b00

4 files changed

Lines changed: 40 additions & 16 deletions

File tree

‎src/library.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ mergeInto(LibraryManager.library, {
281281
#endif
282282

283283
#if EMSCRIPTEN_TRACING
284-
_emscripten_trace_js_log_message("Emscripten", "Enlarging memory arrays from " + oldSize + " to " + newSize);
284+
traceLogMessage("Emscripten", "Enlarging memory arrays from " + oldSize + " to " + newSize);
285285
// And now report the new layout
286286
_emscripten_trace_report_memory_layout();
287287
#endif

‎src/library_sigs.js‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -717,6 +717,31 @@ sigs = {
717717
emscripten_supports_offscreencanvas__sig: 'i',
718718
emscripten_throw_number__sig: 'vd',
719719
emscripten_throw_string__sig: 'vp',
720+
emscripten_trace_annotate_address_type__sig: 'vpp',
721+
emscripten_trace_associate_storage_size__sig: 'vpi',
722+
emscripten_trace_close__sig: 'v',
723+
emscripten_trace_configure__sig: 'vpp',
724+
emscripten_trace_configure_for_google_wtf__sig: 'v',
725+
emscripten_trace_configure_for_test__sig: 'v',
726+
emscripten_trace_enter_context__sig: 'vp',
727+
emscripten_trace_exit_context__sig: 'v',
728+
emscripten_trace_log_message__sig: 'vpp',
729+
emscripten_trace_mark__sig: 'vp',
730+
emscripten_trace_record_allocation__sig: 'vpi',
731+
emscripten_trace_record_frame_end__sig: 'v',
732+
emscripten_trace_record_frame_start__sig: 'v',
733+
emscripten_trace_record_free__sig: 'vp',
734+
emscripten_trace_record_reallocation__sig: 'vppi',
735+
emscripten_trace_report_error__sig: 'vp',
736+
emscripten_trace_report_memory_layout__sig: 'v',
737+
emscripten_trace_report_off_heap_data__sig: 'v',
738+
emscripten_trace_set_enabled__sig: 'vi',
739+
emscripten_trace_set_session_username__sig: 'vp',
740+
emscripten_trace_task_associate_data__sig: 'vpp',
741+
emscripten_trace_task_end__sig: 'v',
742+
emscripten_trace_task_resume__sig: 'vip',
743+
emscripten_trace_task_start__sig: 'vip',
744+
emscripten_trace_task_suspend__sig: 'vp',
720745
emscripten_unlock_orientation__sig: 'i',
721746
emscripten_unwind_to_js_event_loop__sig: 'v',
722747
emscripten_vibrate__sig: 'ii',

‎src/library_trace.js‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
var LibraryTracing = {
88
$EmscriptenTrace__deps: [
9-
'emscripten_trace_js_configure', 'emscripten_trace_configure_for_google_wtf',
10-
'emscripten_trace_js_enter_context', 'emscripten_trace_exit_context',
11-
'emscripten_trace_js_log_message', 'emscripten_trace_js_mark',
9+
'$traceConfigure', 'emscripten_trace_configure_for_google_wtf',
10+
'$traceEnterContext', 'emscripten_trace_exit_context',
11+
'$traceLogMessage', '$traceMark',
1212
'emscripten_get_now'
1313
],
1414
$EmscriptenTrace__postset: 'EmscriptenTrace.init()',
@@ -49,12 +49,12 @@ var LibraryTracing = {
4949
EVENT_USER_NAME: 'user-name',
5050

5151
init: function() {
52-
Module['emscripten_trace_configure'] = _emscripten_trace_js_configure;
52+
Module['emscripten_trace_configure'] = traceConfigure;
5353
Module['emscripten_trace_configure_for_google_wtf'] = _emscripten_trace_configure_for_google_wtf;
54-
Module['emscripten_trace_enter_context'] = _emscripten_trace_js_enter_context;
54+
Module['emscripten_trace_enter_context'] = traceEnterContext;
5555
Module['emscripten_trace_exit_context'] = _emscripten_trace_exit_context;
56-
Module['emscripten_trace_log_message'] = _emscripten_trace_js_log_message;
57-
Module['emscripten_trace_mark'] = _emscripten_trace_js_mark;
56+
Module['emscripten_trace_log_message'] = traceLogMessage;
57+
Module['emscripten_trace_mark'] = traceMark;
5858
},
5959

6060
// Work around CORS issues ...
@@ -133,7 +133,7 @@ var LibraryTracing = {
133133
}
134134
},
135135

136-
emscripten_trace_js_configure: function(collector_url, application) {
136+
$traceConfigure: function(collector_url, application) {
137137
EmscriptenTrace.configure(collector_url, application);
138138
},
139139

@@ -172,15 +172,14 @@ var LibraryTracing = {
172172
}
173173
},
174174

175-
emscripten_trace_js_log_message: function(channel, message) {
175+
$traceLogMessage: function(channel, message) {
176176
if (EmscriptenTrace.postEnabled) {
177177
var now = EmscriptenTrace.now();
178178
EmscriptenTrace.post([EmscriptenTrace.EVENT_LOG_MESSAGE, now,
179179
channel, message]);
180180
}
181181
},
182182

183-
emscripten_trace_log_message__sig: 'vpp',
184183
emscripten_trace_log_message: function(channel, message) {
185184
if (EmscriptenTrace.postEnabled) {
186185
var now = EmscriptenTrace.now();
@@ -190,7 +189,7 @@ var LibraryTracing = {
190189
}
191190
},
192191

193-
emscripten_trace_js_mark: function(message) {
192+
$traceMark: function(message) {
194193
if (EmscriptenTrace.postEnabled) {
195194
var now = EmscriptenTrace.now();
196195
EmscriptenTrace.post([EmscriptenTrace.EVENT_LOG_MESSAGE, now,
@@ -201,7 +200,6 @@ var LibraryTracing = {
201200
}
202201
},
203202

204-
emscripten_trace_mark__sig: 'vp',
205203
emscripten_trace_mark: function(message) {
206204
if (EmscriptenTrace.postEnabled) {
207205
var now = EmscriptenTrace.now();
@@ -300,7 +298,7 @@ var LibraryTracing = {
300298
}
301299
},
302300

303-
emscripten_trace_js_enter_context: function(name) {
301+
$traceEnterContext: function(name) {
304302
if (EmscriptenTrace.postEnabled) {
305303
var now = EmscriptenTrace.now();
306304
EmscriptenTrace.post([EmscriptenTrace.EVENT_ENTER_CONTEXT,
@@ -311,7 +309,6 @@ var LibraryTracing = {
311309
}
312310
},
313311

314-
emscripten_trace_enter_context__sig: 'vp',
315312
emscripten_trace_enter_context: function(name) {
316313
if (EmscriptenTrace.postEnabled) {
317314
var now = EmscriptenTrace.now();
@@ -333,7 +330,6 @@ var LibraryTracing = {
333330
}
334331
},
335332

336-
emscripten_trace_task_start__sig: 'vip',
337333
emscripten_trace_task_start: function(task_id, name) {
338334
if (EmscriptenTrace.postEnabled) {
339335
var now = EmscriptenTrace.now();

‎tools/gen_sig_info.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
#include <emscripten/fetch.h>
4141
#include <emscripten/webaudio.h>
4242
#include <emscripten/threading.h>
43+
#include <emscripten/trace.h>
4344
#include <emscripten/proxying.h>
4445
#include <wasi/api.h>
4546
@@ -282,6 +283,7 @@ def extract_sig_info(sig_info, extra_settings=None, extra_cflags=None, cxx=False
282283
'src/library_webaudio.js',
283284
'src/library_fetch.js',
284285
'src/library_pthread.js',
286+
'src/library_trace.js',
285287
],
286288
'SUPPORT_LONGJMP': 'emscripten'
287289
}
@@ -311,6 +313,7 @@ def extract_sig_info(sig_info, extra_settings=None, extra_cflags=None, cxx=False
311313
# or `size_t` types. These get marked as `p` in the `__sig`.
312314
obj_file = 'out.o'
313315
cmd = [compiler, c_file, '-c', '-pthread',
316+
'--tracing',
314317
'-Wno-deprecated-declarations',
315318
'-I' + utils.path_from_root('system/lib/libc'),
316319
'-o', obj_file]

0 commit comments

Comments
 (0)