christoph/wamr
1
Fork 0
Code Releases Activity

Add a reference counter to wasm_engine_t (#1001)

Browse Source 
This patch allows safer (note: safer, not safe) embedding in a plugin
environment where multiple instances of the engine could be needed.

Original code initializes and tears down the full runtime during
wasm_engine_new() and wasm_engine_delete() respectively. After this
update the C API implementation keeps track of engine instances count
and inits/deinits the runtime only when needed.

This allows for example to call wasm_engine_new() twice and then call
wasm_engine_delete() once without rendering the first engine instance
invalid.
This commit is contained in:
lucianoiam
2022-03-22 10:14:15 +01:00
committed by GitHub
parent a02cc6626d
commit f8ee05db4b
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/iwasm/common/wasm_c_api.c
View File

@ -320,6 +320,7 @@ wasm_engine_new()
singleton_engine = singleton_engine =
wasm_engine_new_internal(Alloc_With_System_Allocator, NULL); wasm_engine_new_internal(Alloc_With_System_Allocator, NULL);
} }
singleton_engine->ref_count++;
return singleton_engine; return singleton_engine;
} }
@ -336,6 +337,7 @@ wasm_engine_new_with_args(mem_alloc_type_t type, const MemAllocOption *opts)
if (!singleton_engine) { if (!singleton_engine) {
singleton_engine = wasm_engine_new_internal(type, opts); singleton_engine = wasm_engine_new_internal(type, opts);
} }
singleton_engine->ref_count++;
return singleton_engine; return singleton_engine;
} }
@ -343,7 +345,7 @@ wasm_engine_new_with_args(mem_alloc_type_t type, const MemAllocOption *opts)
void void
wasm_engine_delete(wasm_engine_t *engine) wasm_engine_delete(wasm_engine_t *engine)
{ {
if (engine) { if (engine && (--engine->ref_count == 0)) {
wasm_engine_delete_internal(engine); wasm_engine_delete_internal(engine);
singleton_engine = NULL; singleton_engine = NULL;
} }

1
core/iwasm/common/wasm_c_api_internal.h
View File

@ -27,6 +27,7 @@ WASM_DECLARE_VEC(store, *)
struct wasm_engine_t { struct wasm_engine_t {
/* support one store for now */ /* support one store for now */
wasm_store_vec_t *stores; wasm_store_vec_t *stores;
uint32_t ref_count;
}; };
struct wasm_store_t { struct wasm_store_t {