christoph/wamr
1
Fork 0
Code Releases Activity

Add realloc func argument for memory allocator (#191)

Browse Source
This commit is contained in:
wenyongh
2020-03-08 21:18:18 +08:00
committed by GitHub
parent 057c849fc0
commit 180ee4c78a
12 changed files with 213 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/iwasm/common/wasm_runtime_common.c
View File

@ -50,6 +50,10 @@ wasm_runtime_destroy()
vm_thread_sys_destroy();
}
int bh_memory_init_with_allocator_internal(void *_malloc_func,
void *_realloc_func,
void *_free_func);
bool
wasm_runtime_full_init(RuntimeInitArgs *init_args)
{
@ -61,8 +65,11 @@ wasm_runtime_full_init(RuntimeInitArgs *init_args)
}
else if (init_args->mem_alloc_type == Alloc_With_Allocator) {
void *malloc_func = init_args->mem_alloc.allocator.malloc_func;
void *realloc_func = init_args->mem_alloc.allocator.realloc_func;
void *free_func = init_args->mem_alloc.allocator.free_func;
if (bh_memory_init_with_allocator(malloc_func, free_func) != 0)
if (bh_memory_init_with_allocator_internal(malloc_func,
realloc_func,
free_func) != 0)
return false;
}
else

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

@ -23,6 +23,7 @@ extern "C" {
#endif
#define wasm_malloc bh_malloc
#define wasm_realloc bh_realloc
#define wasm_free bh_free
typedef struct WASMModuleCommon {