Skip to content

Allow passing custom error buffer to wasm_instance_new_with_args #1526

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

Closed
wants to merge 1 commit into from
Closed

Allow passing custom error buffer to wasm_instance_new_with_args #1526

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
11 changes: 7 additions & 4 deletions core/iwasm/common/wasm_c_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4284,17 +4284,20 @@ wasm_instance_t *
wasm_instance_new(wasm_store_t *store, const wasm_module_t *module,
const wasm_extern_vec_t *imports, own wasm_trap_t **traps)
{
char error_buf[128] = { 0 };

return wasm_instance_new_with_args(store, module, imports, traps,
KILOBYTE(32), KILOBYTE(32));
KILOBYTE(32), KILOBYTE(32), error_buf,
sizeof(error_buf));
}

wasm_instance_t *
wasm_instance_new_with_args(wasm_store_t *store, const wasm_module_t *module,
const wasm_extern_vec_t *imports,
own wasm_trap_t **traps, const uint32 stack_size,
const uint32 heap_size)
const uint32 heap_size, char *error_buf,
uint32 error_buf_size)
{
char error_buf[128] = { 0 };
uint32 import_count = 0;
bool import_count_verified = false;
wasm_instance_t *instance = NULL;
Expand Down Expand Up @@ -4361,7 +4364,7 @@ wasm_instance_new_with_args(wasm_store_t *store, const wasm_module_t *module,
}

instance->inst_comm_rt = wasm_runtime_instantiate(
*module, stack_size, heap_size, error_buf, sizeof(error_buf));
*module, stack_size, heap_size, error_buf, error_buf_size);
if (!instance->inst_comm_rt) {
LOG_ERROR(error_buf);
goto failed;
Expand Down
3 changes: 2 additions & 1 deletion core/iwasm/include/wasm_c_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,8 @@ WASM_API_EXTERN own wasm_instance_t* wasm_instance_new(
// please refer to wasm_runtime_instantiate(...) in core/iwasm/include/wasm_export.h
WASM_API_EXTERN own wasm_instance_t* wasm_instance_new_with_args(
wasm_store_t*, const wasm_module_t*, const wasm_extern_vec_t *imports,
own wasm_trap_t**, const uint32_t stack_size, const uint32_t heap_size
own wasm_trap_t**, const uint32_t stack_size, const uint32_t heap_size,
char *error_buf, uint32_t error_buf_size
);

WASM_API_EXTERN void wasm_instance_exports(const wasm_instance_t*, own wasm_extern_vec_t* out);
Expand Down
6 changes: 3 additions & 3 deletions language-bindings/python/wamr/binding.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2007,11 +2007,11 @@ def wasm_instance_new(arg0,arg1,arg2,arg3):
_wasm_instance_new.argtypes = [POINTER(wasm_store_t),POINTER(wasm_module_t),POINTER(wasm_extern_vec_t),POINTER(POINTER(wasm_trap_t))]
return _wasm_instance_new(arg0,arg1,arg2,arg3)

def wasm_instance_new_with_args(arg0,arg1,arg2,arg3,arg4,arg5):
def wasm_instance_new_with_args(arg0,arg1,arg2,arg3,arg4,arg5,arg6,arg7):
_wasm_instance_new_with_args = libiwasm.wasm_instance_new_with_args
_wasm_instance_new_with_args.restype = POINTER(wasm_instance_t)
_wasm_instance_new_with_args.argtypes = [POINTER(wasm_store_t),POINTER(wasm_module_t),POINTER(wasm_extern_vec_t),POINTER(POINTER(wasm_trap_t)),c_uint32,c_uint32]
return _wasm_instance_new_with_args(arg0,arg1,arg2,arg3,arg4,arg5)
_wasm_instance_new_with_args.argtypes = [POINTER(wasm_store_t),POINTER(wasm_module_t),POINTER(wasm_extern_vec_t),POINTER(POINTER(wasm_trap_t)),c_uint32,c_uint32, c_char_p, c_uint32]
return _wasm_instance_new_with_args(arg0,arg1,arg2,arg3,arg4,arg5,arg6,arg7)

def wasm_instance_exports(arg0,arg1):
_wasm_instance_exports = libiwasm.wasm_instance_exports
Expand Down
Loading