Skip to content

Commit a75db47

Browse files
authored
Rename _emscripten_run_on_main_thread_js. NFC (#24598)
Most other functions that end in `_js` signify the JS part of the implementation (e.g. `tzset_js`). This new name (I think) is more self-describing.
1 parent c1ad2b9 commit a75db47

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

src/lib/libpthread.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -881,7 +881,7 @@ var LibraryPThread = {
881881
$proxyToMainThreadPtr: (...args) => BigInt(proxyToMainThread(...args)),
882882
#endif
883883
884-
$proxyToMainThread__deps: ['$stackSave', '$stackRestore', '$stackAlloc', '_emscripten_run_on_main_thread_js'],
884+
$proxyToMainThread__deps: ['$stackSave', '$stackRestore', '$stackAlloc', '_emscripten_run_js_on_main_thread'],
885885
$proxyToMainThread__docs: '/** @type{function(number, (number|boolean), ...number)} */',
886886
$proxyToMainThread: (funcIndex, emAsmAddr, sync, ...callArgs) => {
887887
// EM_ASM proxying is done by passing a pointer to the address of the EM_ASM
@@ -921,7 +921,7 @@ var LibraryPThread = {
921921
HEAPF64[b + i] = arg;
922922
#endif
923923
}
924-
var rtn = __emscripten_run_on_main_thread_js(funcIndex, emAsmAddr, serializedNumCallArgs, args, sync);
924+
var rtn = __emscripten_run_js_on_main_thread(funcIndex, emAsmAddr, serializedNumCallArgs, args, sync);
925925
stackRestore(sp);
926926
return rtn;
927927
},

system/lib/pthread/proxying.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ static void run_js_func(void* arg) {
603603
}
604604
}
605605

606-
double _emscripten_run_on_main_thread_js(int func_index,
606+
double _emscripten_run_js_on_main_thread(int func_index,
607607
void* em_asm_addr,
608608
int num_args,
609609
double* buffer,

test/other/codesize/test_codesize_minimal_pthreads.exports

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ u (pthread_self)
1313
v (_emscripten_proxy_main)
1414
w (_emscripten_thread_init)
1515
x (_emscripten_thread_crashed)
16-
y (_emscripten_run_on_main_thread_js)
16+
y (_emscripten_run_js_on_main_thread)
1717
z (_emscripten_thread_free_data)

test/other/codesize/test_codesize_minimal_pthreads.funcs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ $__wasm_init_memory
2727
$__wasm_init_tls
2828
$_emscripten_check_mailbox
2929
$_emscripten_proxy_main
30-
$_emscripten_run_on_main_thread_js
30+
$_emscripten_run_js_on_main_thread
3131
$_emscripten_stack_alloc
3232
$_emscripten_stack_restore
3333
$_emscripten_thread_crashed

test/other/codesize/test_codesize_minimal_pthreads_memgrowth.exports

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ u (pthread_self)
1313
v (_emscripten_proxy_main)
1414
w (_emscripten_thread_init)
1515
x (_emscripten_thread_crashed)
16-
y (_emscripten_run_on_main_thread_js)
16+
y (_emscripten_run_js_on_main_thread)
1717
z (_emscripten_thread_free_data)

test/other/codesize/test_codesize_minimal_pthreads_memgrowth.funcs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ $__wasm_init_memory
2727
$__wasm_init_tls
2828
$_emscripten_check_mailbox
2929
$_emscripten_proxy_main
30-
$_emscripten_run_on_main_thread_js
30+
$_emscripten_run_js_on_main_thread
3131
$_emscripten_stack_alloc
3232
$_emscripten_stack_restore
3333
$_emscripten_thread_crashed

tools/emscripten.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1131,7 +1131,7 @@ def create_pointer_conversion_wrappers(metadata):
11311131
'_wasmfs_read_file': '_ppp',
11321132
'_wasmfs_node_record_dirent': '_pp_',
11331133
'__dl_seterr': '_pp',
1134-
'_emscripten_run_on_main_thread_js': '__p_p_',
1134+
'_emscripten_run_js_on_main_thread': '__p_p_',
11351135
'_emscripten_proxy_execute_task_queue': '_p',
11361136
'_emscripten_thread_exit': '_p',
11371137
'_emscripten_thread_init': '_p_____',

0 commit comments

Comments
 (0)