Skip to content

Add custom data setter for InstantiationArgs2 #4936

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.

Sign up for GitHub

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

Open
mechakotik wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add custom data setter for InstantiationArgs2 #4936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions core/iwasm/aot/aot_runtime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1963,6 +1963,8 @@ aot_instantiate(AOTModule *module, AOTModuleInstance *parent,
module_inst->e =
(WASMModuleInstanceExtra *)((uint8 *)module_inst + extra_info_offset);
extra = (AOTModuleInstanceExtra *)module_inst->e;
wasm_runtime_set_custom_data_internal(
(WASMModuleInstanceCommon *)module_inst, args->custom_data);
#if WASM_ENABLE_THREAD_MGR != 0
if (os_mutex_init(&extra->common.exception_lock) != 0) {
wasm_runtime_free(module_inst);
Expand Down
7 changes: 7 additions & 0 deletions core/iwasm/common/wasm_runtime_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1755,6 +1755,13 @@ wasm_runtime_instantiation_args_set_max_memory_pages(
p->v1.max_memory_pages = v;
}

void
wasm_runtime_instantiation_args_set_custom_data(struct InstantiationArgs2 *p,
void *custom_data)
{
p->custom_data = custom_data;
}

#if WASM_ENABLE_LIBC_WASI != 0
void
wasm_runtime_instantiation_args_set_wasi_arg(struct InstantiationArgs2 *p,
Expand Down
6 changes: 6 additions & 0 deletions core/iwasm/common/wasm_runtime_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,6 +617,7 @@ wasm_runtime_get_exec_env_tls(void);

struct InstantiationArgs2 {
InstantiationArgs v1;
void *custom_data;
#if WASM_ENABLE_LIBC_WASI != 0
WASIArguments wasi;
#endif
Expand Down Expand Up @@ -741,6 +742,11 @@ void
wasm_runtime_instantiation_args_set_max_memory_pages(
struct InstantiationArgs2 *p, uint32 v);

/* See wasm_export.h for description */
WASM_RUNTIME_API_EXTERN void
wasm_runtime_instantiation_args_set_custom_data(struct InstantiationArgs2 *p,
void *custom_data);

/* See wasm_export.h for description */
WASM_RUNTIME_API_EXTERN void
wasm_runtime_instantiation_args_set_wasi_arg(struct InstantiationArgs2 *p,
Expand Down
4 changes: 4 additions & 0 deletions core/iwasm/include/wasm_export.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,6 +780,10 @@ WASM_RUNTIME_API_EXTERN void
wasm_runtime_instantiation_args_set_max_memory_pages(
struct InstantiationArgs2 *p, uint32_t v);

WASM_RUNTIME_API_EXTERN void
wasm_runtime_instantiation_args_set_custom_data(struct InstantiationArgs2 *p,
void *custom_data);

WASM_RUNTIME_API_EXTERN void
wasm_runtime_instantiation_args_set_wasi_arg(struct InstantiationArgs2 *p,
char *argv[], int argc);
Expand Down
2 changes: 2 additions & 0 deletions core/iwasm/interpreter/wasm_runtime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2512,6 +2512,8 @@ wasm_instantiate(WASMModule *module, WASMModuleInstance *parent,
module_inst->module = module;
module_inst->e =
(WASMModuleInstanceExtra *)((uint8 *)module_inst + extra_info_offset);
wasm_runtime_set_custom_data_internal(
(WASMModuleInstanceCommon *)module_inst, args->custom_data);
#if WASM_ENABLE_THREAD_MGR != 0
if (os_mutex_init(&module_inst->e->common.exception_lock) != 0) {
wasm_runtime_free(module_inst);
Expand Down
6 changes: 2 additions & 4 deletions core/iwasm/libraries/lib-pthread/lib_pthread_wrapper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,14 +582,12 @@ pthread_create_wrapper(wasm_exec_env_t exec_env,

wasm_runtime_instantiation_args_set_defaults(&args);
wasm_runtime_instantiation_args_set_default_stack_size(&args, stack_size);
wasm_runtime_instantiation_args_set_custom_data(
&args, wasm_runtime_get_custom_data(module_inst));
if (!(new_module_inst = wasm_runtime_instantiate_internal(
module, module_inst, exec_env, &args, NULL, 0)))
return -1;

/* Set custom_data to new module instance */
wasm_runtime_set_custom_data_internal(
new_module_inst, wasm_runtime_get_custom_data(module_inst));

wasm_native_inherit_contexts(new_module_inst, module_inst);

if (!(wasm_cluster_dup_c_api_imports(new_module_inst, module_inst)))
Expand Down
5 changes: 2 additions & 3 deletions core/iwasm/libraries/lib-wasi-threads/lib_wasi_threads_wrapper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,12 @@ thread_spawn_wrapper(wasm_exec_env_t exec_env, uint32 start_arg)

wasm_runtime_instantiation_args_set_defaults(&args);
wasm_runtime_instantiation_args_set_default_stack_size(&args, stack_size);
wasm_runtime_instantiation_args_set_custom_data(
&args, wasm_runtime_get_custom_data(module_inst));
if (!(new_module_inst = wasm_runtime_instantiate_internal(
module, module_inst, exec_env, &args, NULL, 0)))
return -1;

wasm_runtime_set_custom_data_internal(
new_module_inst, wasm_runtime_get_custom_data(module_inst));

if (!(wasm_cluster_dup_c_api_imports(new_module_inst, module_inst)))
goto thread_preparation_fail;

Expand Down
6 changes: 2 additions & 4 deletions core/iwasm/libraries/thread-mgr/thread_manager.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,15 +502,13 @@ wasm_cluster_spawn_exec_env(WASMExecEnv *exec_env)

wasm_runtime_instantiation_args_set_defaults(&args);
wasm_runtime_instantiation_args_set_default_stack_size(&args, stack_size);
wasm_runtime_instantiation_args_set_custom_data(
&args, wasm_runtime_get_custom_data(module_inst));
if (!(new_module_inst = wasm_runtime_instantiate_internal(
module, module_inst, exec_env, &args, NULL, 0))) {
return NULL;
}

/* Set custom_data to new module instance */
wasm_runtime_set_custom_data_internal(
new_module_inst, wasm_runtime_get_custom_data(module_inst));

wasm_native_inherit_contexts(new_module_inst, module_inst);

if (!(wasm_cluster_dup_c_api_imports(new_module_inst, module_inst))) {
Expand Down
Loading