Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[browser] mono_memory_barrier #112199

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/mono/browser/browser.proj
Original file line number Diff line number Diff line change
Expand Up @@ -265,9 +265,6 @@
<ItemGroup Condition="'$(WasmEnableThreads)' == 'true'">
<EmccExportedFunction Include="_emscripten_main_runtime_thread_id" />
</ItemGroup>
<ItemGroup Condition="'$(WasmEnableThreads)' == 'true'">
<EmccExportedFunction Include="_emscripten_main_runtime_thread_id" />
</ItemGroup>
<PropertyGroup>
<_EmccExportedLibraryFunction>"[@(EmccExportedLibraryFunction -> '%27%(Identity)%27', ',')]"</_EmccExportedLibraryFunction>
<_EmccExportedRuntimeMethods>"[@(EmccExportedRuntimeMethod -> '%27%(Identity)%27', ',')]"</_EmccExportedRuntimeMethods>
Expand Down
20 changes: 17 additions & 3 deletions src/mono/browser/runtime/corebindings.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ extern void mono_wasm_install_js_worker_interop (int context_gc_handle);
void mono_wasm_install_js_worker_interop_wrapper (int context_gc_handle, void* beforeSyncJSImport, void* afterSyncJSImport, void* pumpHandler);
extern void mono_wasm_uninstall_js_worker_interop ();
extern void mono_wasm_invoke_jsimport_MT (void* signature, void* args);
void mono_wasm_invoke_jsimport_MT_barrier (void* signature, void* args);
void mono_wasm_invoke_jsimport_async_post (pthread_t target_tid, void* signature, void* args);
void mono_wasm_invoke_jsimport_sync_send (pthread_t target_tid, void* signature, void* args);
void mono_wasm_invoke_js_function_send (pthread_t target_tid, int function_js_handle, void *args);
Expand Down Expand Up @@ -73,7 +74,7 @@ void bindings_initialize_internals (void)
mono_add_internal_call ("Interop/Runtime::ResolveOrRejectPromisePost", mono_wasm_resolve_or_reject_promise_post);
mono_add_internal_call ("Interop/Runtime::InstallWebWorkerInterop", mono_wasm_install_js_worker_interop_wrapper);
mono_add_internal_call ("Interop/Runtime::UninstallWebWorkerInterop", mono_wasm_uninstall_js_worker_interop);
mono_add_internal_call ("Interop/Runtime::InvokeJSImportSync", mono_wasm_invoke_jsimport_MT);
mono_add_internal_call ("Interop/Runtime::InvokeJSImportSync", mono_wasm_invoke_jsimport_MT_barrier);
mono_add_internal_call ("Interop/Runtime::InvokeJSImportSyncSend", mono_wasm_invoke_jsimport_sync_send);
mono_add_internal_call ("Interop/Runtime::InvokeJSImportAsyncPost", mono_wasm_invoke_jsimport_async_post);
mono_add_internal_call ("Interop/Runtime::InvokeJSFunctionSend", mono_wasm_invoke_js_function_send);
Expand Down Expand Up @@ -255,43 +256,56 @@ void mono_wasm_install_js_worker_interop_wrapper (int context_gc_handle, void* b
before_sync_js_import = beforeSyncJSImport;
after_sync_js_import = afterSyncJSImport;
synchronization_context_pump_handler = pumpHandler;
__sync_synchronize ();
mono_wasm_install_js_worker_interop (context_gc_handle);
}

// async
void mono_wasm_release_cs_owned_object_post (pthread_t target_tid, int js_handle)
{
__sync_synchronize ();
mono_threads_wasm_async_run_in_target_thread_vi (target_tid, (void (*) (gpointer))mono_wasm_release_cs_owned_object, (gpointer)js_handle);
}

// async
void mono_wasm_resolve_or_reject_promise_post (pthread_t target_tid, void* args)
{
__sync_synchronize ();
mono_threads_wasm_async_run_in_target_thread_vi (target_tid, (void (*) (gpointer))mono_wasm_resolve_or_reject_promise, (gpointer)args);
}

// async
void mono_wasm_cancel_promise_post (pthread_t target_tid, int task_holder_gc_handle)
{
__sync_synchronize ();
mono_threads_wasm_async_run_in_target_thread_vi (target_tid, (void (*) (gpointer))mono_wasm_cancel_promise, (gpointer)task_holder_gc_handle);
}

// async
void mono_wasm_invoke_jsimport_async_post (pthread_t target_tid, void* signature, void* args)
{
mono_threads_wasm_async_run_in_target_thread_vii (target_tid, (void (*) (gpointer, gpointer))mono_wasm_invoke_jsimport_MT, (gpointer)signature, (gpointer)args);
__sync_synchronize ();
mono_threads_wasm_async_run_in_target_thread_vii (target_tid, (void (*) (gpointer, gpointer))mono_wasm_invoke_jsimport_MT_barrier, (gpointer)signature, (gpointer)args);
}

// sync
void mono_wasm_invoke_jsimport_sync_send (pthread_t target_tid, void* signature, void* args)
{
mono_threads_wasm_sync_run_in_target_thread_vii (target_tid, (void (*) (gpointer, gpointer))mono_wasm_invoke_jsimport_MT, (gpointer)signature, (gpointer)args);
__sync_synchronize ();
mono_threads_wasm_sync_run_in_target_thread_vii (target_tid, (void (*) (gpointer, gpointer))mono_wasm_invoke_jsimport_MT_barrier, (gpointer)signature, (gpointer)args);
}

// sync
void mono_wasm_invoke_js_function_send (pthread_t target_tid, int function_js_handle, void *args)
{
__sync_synchronize ();
mono_threads_wasm_sync_run_in_target_thread_vii (target_tid, (void (*) (gpointer, gpointer))mono_wasm_invoke_js_function, (gpointer)function_js_handle, (gpointer)args);
}

void mono_wasm_invoke_jsimport_MT_barrier (void* signature, void* args)
{
__sync_synchronize ();
mono_wasm_invoke_jsimport_MT (signature, args);
}

#endif /* DISABLE_THREADS */
13 changes: 13 additions & 0 deletions src/mono/browser/runtime/driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,10 @@ mono_wasm_load_runtime (int debug_level)
runtime_initialized = 1;
const char *interp_opts = "";

#ifndef DISABLE_THREADS
__sync_synchronize ();
#endif /* DISABLE_THREADS */

#ifndef INVARIANT_GLOBALIZATION
mono_wasm_link_icu_shim ();
#endif
Expand Down Expand Up @@ -230,6 +234,11 @@ mono_wasm_load_runtime (int debug_level)
root_domain = mono_wasm_load_runtime_common (debug_level, wasm_trace_logger, interp_opts);

bindings_initialize_internals();

#ifndef DISABLE_THREADS
__sync_synchronize ();
#endif /* DISABLE_THREADS */

}

int initialize_runtime()
Expand Down Expand Up @@ -283,6 +292,7 @@ mono_wasm_print_thread_dump (void)
static void
mono_wasm_invoke_jsexport_async_post_cb (MonoMethod *method, void* args)
{
__sync_synchronize ();
mono_wasm_invoke_jsexport (method, args);
if (args) {
MonoBoolean *is_receiver_should_free = (MonoBoolean *)(((char *) args) + 20/*JSMarshalerArgumentOffsets.ReceiverShouldFree*/);
Expand All @@ -296,6 +306,7 @@ mono_wasm_invoke_jsexport_async_post_cb (MonoMethod *method, void* args)
EMSCRIPTEN_KEEPALIVE void
mono_wasm_invoke_jsexport_async_post (void* target_thread, MonoMethod *method, void* args /*JSMarshalerArguments*/)
{
__sync_synchronize ();
mono_threads_wasm_async_run_in_target_thread_vii(target_thread, (void (*)(gpointer, gpointer))mono_wasm_invoke_jsexport_async_post_cb, method, args);
}

Expand All @@ -310,6 +321,7 @@ extern sync_context_pump synchronization_context_pump_handler;
EMSCRIPTEN_KEEPALIVE void
mono_wasm_invoke_jsexport_sync (MonoMethod *method, void* args)
{
__sync_synchronize ();
before_sync_js_import (args);
mono_wasm_invoke_jsexport (method, args);
after_sync_js_import (args);
Expand All @@ -319,6 +331,7 @@ mono_wasm_invoke_jsexport_sync (MonoMethod *method, void* args)
EMSCRIPTEN_KEEPALIVE void
mono_wasm_invoke_jsexport_sync_send (void* target_thread, MonoMethod *method, void* args /*JSMarshalerArguments*/)
{
__sync_synchronize ();
mono_threads_wasm_sync_run_in_target_thread_vii (target_thread, (void (*)(gpointer, gpointer))mono_wasm_invoke_jsexport_sync, method, args);
}

Expand Down
1 change: 1 addition & 0 deletions src/mono/browser/runtime/pthreads/deputy-thread.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ export function mono_wasm_start_deputy_thread_async () {
}
});

forceThreadMemoryViewRefresh();
await start_runtime();

postMessageToMain({
Expand Down
3 changes: 3 additions & 0 deletions src/mono/browser/runtime/pthreads/ui-thread.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { MonoWorkerToMainMessage, monoThreadInfo, mono_wasm_pthread_ptr, update_
import { Module, ENVIRONMENT_IS_WORKER, createPromiseController, loaderHelpers, mono_assert, runtimeHelpers } from "../globals";
import { PThreadLibrary, MainToWorkerMessageType, MonoThreadMessage, PThreadInfo, PThreadPtr, PThreadPtrNull, PThreadWorker, PromiseController, Thread, WorkerToMainMessageType, monoMessageSymbol } from "../types/internal";
import { mono_log_info, mono_log_debug, mono_log_warn } from "../logging";
import { forceThreadMemoryViewRefresh } from "../memory";

const threadPromises: Map<PThreadPtr, PromiseController<Thread>[]> = new Map();

Expand Down Expand Up @@ -71,6 +72,8 @@ function monoWorkerMessageHandler (worker: PThreadWorker, ev: MessageEvent<any>)
return;
}

forceThreadMemoryViewRefresh();

let thread: Thread;
pthreadId = message.info?.pthreadId ?? 0;
worker.info = Object.assign({}, worker.info, message.info);
Expand Down
3 changes: 2 additions & 1 deletion src/mono/browser/runtime/startup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import { populateEmscriptenPool, mono_wasm_init_threads } from "./pthreads";
import { currentWorkerThreadEvents, dotnetPthreadCreated, initWorkerThreadEvents, monoThreadInfo } from "./pthreads";
import { mono_wasm_pthread_ptr, update_thread_info } from "./pthreads";
import { jiterpreter_allocate_tables } from "./jiterpreter-support";
import { localHeapViewU8, malloc } from "./memory";
import { forceThreadMemoryViewRefresh, localHeapViewU8, malloc } from "./memory";
import { assertNoProxies } from "./gc-handles";
import { runtimeList } from "./exports";
import { nativeAbort, nativeExit } from "./run";
Expand Down Expand Up @@ -321,6 +321,7 @@ async function onRuntimeInitializedAsync (userOnRuntimeInitialized: (module:Emsc
await wait_for_all_assets();

if (WasmEnableThreads) {
forceThreadMemoryViewRefresh();
runtimeHelpers.deputyWorker.thread!.postMessageToWorker({
type:"deputyThread",
cmd: MainToWorkerMessageType.allAssetsLoaded,
Expand Down
3 changes: 3 additions & 0 deletions src/mono/mono/utils/mono-threads-wasm.c
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,9 @@ mono_threads_platform_in_critical_region (THREAD_INFO_TYPE *info)
void
mono_memory_barrier_process_wide (void)
{
#ifndef DISABLE_THREADS
mono_memory_barrier ();
#endif
}

#ifdef HOST_BROWSER
Expand Down
Loading