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

Add user to enlarge memory error callback (#2546)

Browse Source
This commit is contained in:
Enrico Loparco 2023-09-13 12:03:49 +02:00 committed by GitHub
parent a6fda9b7ab
commit 83db970953
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/iwasm/common/wasm_memory.c
View File

@ -26,6 +26,7 @@ static Memory_Mode memory_mode = MEMORY_MODE_UNKNOWN;
static mem_allocator_t pool_allocator = NULL; static mem_allocator_t pool_allocator = NULL;
static enlarge_memory_error_callback_t enlarge_memory_error_cb; static enlarge_memory_error_callback_t enlarge_memory_error_cb;
static void *enlarge_memory_error_user_data;
#if WASM_MEM_ALLOC_WITH_USER_DATA != 0 #if WASM_MEM_ALLOC_WITH_USER_DATA != 0
static void *allocator_user_data = NULL; static void *allocator_user_data = NULL;
@ -716,7 +717,8 @@ return_func:
enlarge_memory_error_cb(inc_page_count, total_size_old, 0, enlarge_memory_error_cb(inc_page_count, total_size_old, 0,
failure_reason, failure_reason,
(WASMModuleInstanceCommon *)module, exec_env); (WASMModuleInstanceCommon *)module, exec_env,
enlarge_memory_error_user_data);
} }
return ret; return ret;
@ -822,7 +824,8 @@ return_func:
enlarge_memory_error_cb(inc_page_count, total_size_old, 0, enlarge_memory_error_cb(inc_page_count, total_size_old, 0,
failure_reason, failure_reason,
(WASMModuleInstanceCommon *)module, exec_env); (WASMModuleInstanceCommon *)module, exec_env,
enlarge_memory_error_user_data);
} }
return ret; return ret;
@ -831,9 +834,10 @@ return_func:
void void
wasm_runtime_set_enlarge_mem_error_callback( wasm_runtime_set_enlarge_mem_error_callback(
const enlarge_memory_error_callback_t callback) const enlarge_memory_error_callback_t callback, void *user_data)
{ {
enlarge_memory_error_cb = callback; enlarge_memory_error_cb = callback;
enlarge_memory_error_user_data = user_data;
} }
bool bool

2
core/iwasm/common/wasm_memory.h
View File

@ -26,7 +26,7 @@ wasm_runtime_memory_pool_size();
void void
wasm_runtime_set_enlarge_mem_error_callback( wasm_runtime_set_enlarge_mem_error_callback(
const enlarge_memory_error_callback_t callback); const enlarge_memory_error_callback_t callback, void *user_data);
#ifdef __cplusplus #ifdef __cplusplus
} }

5
core/iwasm/include/wasm_export.h
View File

@ -1468,14 +1468,15 @@ typedef enum {
typedef void (*enlarge_memory_error_callback_t)( typedef void (*enlarge_memory_error_callback_t)(
uint32_t inc_page_count, uint64_t current_memory_size, uint32_t inc_page_count, uint64_t current_memory_size,
uint32_t memory_index, enlarge_memory_error_reason_t failure_reason, uint32_t memory_index, enlarge_memory_error_reason_t failure_reason,
wasm_module_inst_t instance, wasm_exec_env_t exec_env); wasm_module_inst_t instance, wasm_exec_env_t exec_env,
void* user_data);
/** /**
* Setup callback invoked when memory.grow fails * Setup callback invoked when memory.grow fails
*/ */
WASM_RUNTIME_API_EXTERN void WASM_RUNTIME_API_EXTERN void
wasm_runtime_set_enlarge_mem_error_callback( wasm_runtime_set_enlarge_mem_error_callback(
const enlarge_memory_error_callback_t callback); const enlarge_memory_error_callback_t callback, void *user_data);
/* /*
* module instance context APIs * module instance context APIs