Add mutex initializer for wasm-c-api engine operations (#1656)
The host embedder may new/delete wasm-c-api engine simultaneously in multiple threads, which requires lock for the operations. Since there isn't one time called global init/destroy APIs provided by wasm-c-api, we define a global lock and initialize it with thread mutex initializer if the platform supports that, and use it to lock the operations of engine. If the platform doesn't support thread mutex initializer, we require developer to create the lock by himself to ensure the thread-safe of the engine operations.
This commit is contained in:
@ -327,45 +327,77 @@ wasm_engine_new_internal(mem_alloc_type_t type, const MemAllocOption *opts)
|
||||
|
||||
/* global engine instance */
|
||||
static wasm_engine_t *singleton_engine = NULL;
|
||||
#if defined(OS_THREAD_MUTEX_INITIALIZER)
|
||||
/**
|
||||
* lock for the singleton_engine
|
||||
* Note: if the platform has mutex initializer, we use a global lock to
|
||||
* lock the operations of the singleton_engine, 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 engine_lock = OS_THREAD_MUTEX_INITIALIZER;
|
||||
#endif
|
||||
|
||||
own wasm_engine_t *
|
||||
wasm_engine_new_with_args(mem_alloc_type_t type, const MemAllocOption *opts)
|
||||
{
|
||||
#if defined(OS_THREAD_MUTEX_INITIALIZER)
|
||||
os_mutex_lock(&engine_lock);
|
||||
#endif
|
||||
|
||||
if (!singleton_engine) {
|
||||
singleton_engine = wasm_engine_new_internal(type, opts);
|
||||
}
|
||||
|
||||
if (singleton_engine) {
|
||||
singleton_engine->ref_count++;
|
||||
}
|
||||
|
||||
#if defined(OS_THREAD_MUTEX_INITIALIZER)
|
||||
os_mutex_unlock(&engine_lock);
|
||||
#endif
|
||||
|
||||
return singleton_engine;
|
||||
}
|
||||
|
||||
own wasm_engine_t *
|
||||
wasm_engine_new()
|
||||
{
|
||||
if (!singleton_engine) {
|
||||
singleton_engine =
|
||||
wasm_engine_new_internal(Alloc_With_System_Allocator, NULL);
|
||||
}
|
||||
if (singleton_engine)
|
||||
singleton_engine->ref_count++;
|
||||
return singleton_engine;
|
||||
return wasm_engine_new_with_args(Alloc_With_System_Allocator, NULL);
|
||||
}
|
||||
|
||||
own wasm_engine_t *
|
||||
wasm_engine_new_with_config(own wasm_config_t *config)
|
||||
{
|
||||
(void)config;
|
||||
return wasm_engine_new();
|
||||
return wasm_engine_new_with_args(Alloc_With_System_Allocator, NULL);
|
||||
}
|
||||
|
||||
own wasm_engine_t *
|
||||
wasm_engine_new_with_args(mem_alloc_type_t type, const MemAllocOption *opts)
|
||||
{
|
||||
if (!singleton_engine) {
|
||||
singleton_engine = wasm_engine_new_internal(type, opts);
|
||||
}
|
||||
if (singleton_engine)
|
||||
singleton_engine->ref_count++;
|
||||
return singleton_engine;
|
||||
}
|
||||
|
||||
/* BE AWARE: will RESET the singleton */
|
||||
void
|
||||
wasm_engine_delete(wasm_engine_t *engine)
|
||||
{
|
||||
if (engine && (--engine->ref_count == 0)) {
|
||||
wasm_engine_delete_internal(engine);
|
||||
singleton_engine = NULL;
|
||||
#if defined(OS_THREAD_MUTEX_INITIALIZER)
|
||||
os_mutex_lock(&engine_lock);
|
||||
#endif
|
||||
|
||||
if (!engine || !singleton_engine || engine != singleton_engine) {
|
||||
#if defined(OS_THREAD_MUTEX_INITIALIZER)
|
||||
os_mutex_unlock(&engine_lock);
|
||||
#endif
|
||||
return;
|
||||
}
|
||||
|
||||
if (singleton_engine->ref_count > 0) {
|
||||
singleton_engine->ref_count--;
|
||||
if (singleton_engine->ref_count == 0) {
|
||||
wasm_engine_delete_internal(engine);
|
||||
singleton_engine = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
#if defined(OS_THREAD_MUTEX_INITIALIZER)
|
||||
os_mutex_unlock(&engine_lock);
|
||||
#endif
|
||||
}
|
||||
|
||||
wasm_store_t *
|
||||
|
||||
@ -27,7 +27,7 @@ WASM_DECLARE_VEC(store, *)
|
||||
struct wasm_engine_t {
|
||||
/* support one store for now */
|
||||
wasm_store_vec_t *stores;
|
||||
uint32_t ref_count;
|
||||
uint32 ref_count;
|
||||
};
|
||||
|
||||
struct wasm_store_t {
|
||||
|
||||
@ -145,6 +145,19 @@ WASM_API_EXTERN own wasm_config_t* wasm_config_new(void);
|
||||
|
||||
WASM_DECLARE_OWN(engine)
|
||||
|
||||
/**
|
||||
* Create a new engine
|
||||
*
|
||||
* Note: for the engine new/delete operations, including this,
|
||||
* wasm_engine_new_with_config, wasm_engine_new_with_args, and
|
||||
* wasm_engine_delete, if the platform has mutex initializer,
|
||||
* then they are thread-safe: we use a global lock to lock the
|
||||
* operations of the engine. Otherwise they are not thread-safe:
|
||||
* when there are engine new/delete operations happening
|
||||
* simultaneously in multiple threads, developer must create
|
||||
* the lock by himself, and add the lock when calling these
|
||||
* functions.
|
||||
*/
|
||||
WASM_API_EXTERN own wasm_engine_t* wasm_engine_new(void);
|
||||
WASM_API_EXTERN own wasm_engine_t* wasm_engine_new_with_config(own wasm_config_t*);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user