gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2025-02-06 15:05:19 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Add lock and ref_count for runtime init (#3263)

Browse Source 
Some environment may call wasm_runtime_full_init/wasm_runtime_init multiple
times without knowing that runtime is initialized or not, it is better to add lock
and increase reference count during initialization.

ps. https://github.com/bytecodealliance/wasm-micro-runtime/discussions/3253.
This commit is contained in:
Wenyong Huang 2024-04-01 12:39:46 +08:00 committed by GitHub
parent 9c8551cf75
commit ec15b6bbad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 85 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
core/iwasm/common/wasm_runtime_common.c
View File

@ -564,8 +564,20 @@ wasm_runtime_exec_env_check(WASMExecEnv *exec_env)
&& exec_env->wasm_stack.top <= exec_env->wasm_stack.top_boundary; && exec_env->wasm_stack.top <= exec_env->wasm_stack.top_boundary;
} }
bool #if defined(OS_THREAD_MUTEX_INITIALIZER)
wasm_runtime_init() /**
* lock for wasm_runtime_init/wasm_runtime_full_init and runtime_ref_count
* Note: if the platform has mutex initializer, we use a global lock to
* lock the operations of runtime init/full_init, otherwise when there are
* operations happening simultaneously in multiple threads, developer
* must create the lock by himself, and use it to lock the operations
*/
static korp_mutex runtime_lock = OS_THREAD_MUTEX_INITIALIZER;
#endif
static int32 runtime_ref_count = 0;
static bool
wasm_runtime_init_internal()
{ {
if (!wasm_runtime_memory_init(Alloc_With_System_Allocator, NULL)) if (!wasm_runtime_memory_init(Alloc_With_System_Allocator, NULL))
return false; return false;
@ -578,8 +590,32 @@ wasm_runtime_init()
return true; return true;
} }
void bool
wasm_runtime_destroy() wasm_runtime_init()
{
bool ret = true;
#if defined(OS_THREAD_MUTEX_INITIALIZER)
os_mutex_lock(&runtime_lock);
#endif
bh_assert(runtime_ref_count >= 0);
if (runtime_ref_count == 0) {
ret = wasm_runtime_init_internal();
}
if (ret) {
runtime_ref_count++;
}
#if defined(OS_THREAD_MUTEX_INITIALIZER)
os_mutex_unlock(&runtime_lock);
#endif
return ret;
}
static void
wasm_runtime_destroy_internal()
{ {
#if WASM_ENABLE_GC == 0 && WASM_ENABLE_REF_TYPES != 0 #if WASM_ENABLE_GC == 0 && WASM_ENABLE_REF_TYPES != 0
wasm_externref_map_destroy(); wasm_externref_map_destroy();
@ -640,6 +676,24 @@ wasm_runtime_destroy()
wasm_runtime_memory_destroy(); wasm_runtime_memory_destroy();
} }
void
wasm_runtime_destroy()
{
#if defined(OS_THREAD_MUTEX_INITIALIZER)
os_mutex_lock(&runtime_lock);
#endif
bh_assert(runtime_ref_count > 0);
runtime_ref_count--;
if (runtime_ref_count == 0) {
wasm_runtime_destroy_internal();
}
#if defined(OS_THREAD_MUTEX_INITIALIZER)
os_mutex_unlock(&runtime_lock);
#endif
}
RunningMode RunningMode
wasm_runtime_get_default_running_mode(void) wasm_runtime_get_default_running_mode(void)
{ {
@ -662,8 +716,8 @@ wasm_runtime_get_gc_heap_size_default(void)
} }
#endif #endif
bool static bool
wasm_runtime_full_init(RuntimeInitArgs *init_args) wasm_runtime_full_init_internal(RuntimeInitArgs *init_args)
{ {
if (!wasm_runtime_memory_init(init_args->mem_alloc_type, if (!wasm_runtime_memory_init(init_args->mem_alloc_type,
&init_args->mem_alloc_option)) &init_args->mem_alloc_option))
@ -725,6 +779,30 @@ wasm_runtime_full_init(RuntimeInitArgs *init_args)
return true; return true;
} }
bool
wasm_runtime_full_init(RuntimeInitArgs *init_args)
{
bool ret = true;
#if defined(OS_THREAD_MUTEX_INITIALIZER)
os_mutex_lock(&runtime_lock);
#endif
bh_assert(runtime_ref_count >= 0);
if (runtime_ref_count == 0) {
ret = wasm_runtime_full_init_internal(init_args);
}
if (ret) {
runtime_ref_count++;
}
#if defined(OS_THREAD_MUTEX_INITIALIZER)
os_mutex_unlock(&runtime_lock);
#endif
return ret;
}
void void
wasm_runtime_set_log_level(log_level_t level) wasm_runtime_set_log_level(log_level_t level)
{ {