gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2025-07-15 16:58:34 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge branch 'feature/user_classified_mem_mng' of github.com:dongsheng28849455/wasm-micro-runtime into feature/user_classified_mem_mng

Browse Source
This commit is contained in:
HongxiaWangSSSS 2024-04-15 10:01:34 +08:00
commit 024340a685
4 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -776,6 +776,17 @@ wasm_enlarge_memory_internal(WASMModuleInstance *module, uint32 inc_page_count)
bh_assert(total_size_new bh_assert(total_size_new
<= GET_MAX_LINEAR_MEMORY_SIZE(memory->is_memory64)); <= GET_MAX_LINEAR_MEMORY_SIZE(memory->is_memory64));
#if WASM_MEM_ALLOC_WITH_USAGE != 0
(void)full_size_mmaped;
if (!(memory_data_new = realloc_func(Alloc_For_LinearMemory,
memory_data_old, total_size_new))) {
ret = false;
goto return_func;
}
memory->heap_data = memory_data_new + (heap_data_old - memory_data_old);
memory->heap_data_end = memory->heap_data + heap_size;
memory->memory_data = memory_data_new;
#else
if (full_size_mmaped) { if (full_size_mmaped) {
#ifdef BH_PLATFORM_WINDOWS #ifdef BH_PLATFORM_WINDOWS
if (!os_mem_commit(memory->memory_data_end, if (!os_mem_commit(memory->memory_data_end,
@ -807,12 +818,6 @@ wasm_enlarge_memory_internal(WASMModuleInstance *module, uint32 inc_page_count)
} }
} }
#if WASM_MEM_ALLOC_WITH_USAGE != 0
if (!(memory_data_new = realloc_func(Alloc_For_LinearMemory, memory_data_old, total_size_new))) {
ret = false;
goto return_func;
}
#else
if (!(memory_data_new = if (!(memory_data_new =
wasm_mremap_linear_memory(memory_data_old, total_size_old, wasm_mremap_linear_memory(memory_data_old, total_size_old,
total_size_new, total_size_new))) { total_size_new, total_size_new))) {
@ -820,7 +825,6 @@ wasm_enlarge_memory_internal(WASMModuleInstance *module, uint32 inc_page_count)
goto return_func; goto return_func;
} }
#endif
if (heap_size > 0) { if (heap_size > 0) {
if (mem_allocator_migrate(memory->heap_handle, if (mem_allocator_migrate(memory->heap_handle,
(char *)heap_data_old (char *)heap_data_old
@ -841,6 +845,7 @@ wasm_enlarge_memory_internal(WASMModuleInstance *module, uint32 inc_page_count)
os_writegsbase(memory_data_new); os_writegsbase(memory_data_new);
#endif #endif
} }
#endif /* end of WASM_MEM_ALLOC_WITH_USAGE */
memory->num_bytes_per_page = num_bytes_per_page; memory->num_bytes_per_page = num_bytes_per_page;
memory->cur_page_count = total_page_count; memory->cur_page_count = total_page_count;
@ -923,6 +928,7 @@ wasm_deallocate_linear_memory(WASMMemoryInstance *memory_inst)
#endif #endif
#if WASM_MEM_ALLOC_WITH_USAGE != 0 #if WASM_MEM_ALLOC_WITH_USAGE != 0
(void)map_size;
free_func(Alloc_For_LinearMemory, memory_inst->memory_data); free_func(Alloc_For_LinearMemory, memory_inst->memory_data);
#else #else
wasm_munmap_linear_memory(memory_inst->memory_data, wasm_munmap_linear_memory(memory_inst->memory_data,
@ -979,6 +985,7 @@ wasm_allocate_linear_memory(uint8 **data, bool is_shared_memory,
if (map_size > 0) { if (map_size > 0) {
#if WASM_MEM_ALLOC_WITH_USAGE != 0 #if WASM_MEM_ALLOC_WITH_USAGE != 0
(void)wasm_mmap_linear_memory;
if (!(*data = malloc_func(Alloc_For_LinearMemory, *memory_data_size))) { if (!(*data = malloc_func(Alloc_For_LinearMemory, *memory_data_size))) {
return BHT_ERROR; return BHT_ERROR;
} }

5
product-mini/platforms/linux/CMakeLists.txt
View File

@ -123,11 +123,6 @@ if (WAMR_BUILD_DEBUG_INTERP EQUAL 1)
set (WAMR_BUILD_SIMD 0) set (WAMR_BUILD_SIMD 0)
endif () endif ()
if (NOT DEFINED WAMR_MEM_ALLOC_WITH_USAGE)
# Disable Debug feature by default
set (WAMR_MEM_ALLOC_WITH_USAGE 1)
endif ()
set (WAMR_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..) set (WAMR_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
include (${WAMR_ROOT_DIR}/build-scripts/runtime_lib.cmake) include (${WAMR_ROOT_DIR}/build-scripts/runtime_lib.cmake)

4
product-mini/platforms/nuttx/CMakeLists.txt
View File

@ -189,6 +189,10 @@ if(CONFIG_INTERPRETERS_WAMR_LIB_PTHREAD)
set(WAMR_BUILD_LIB_PTHREAD 1) set(WAMR_BUILD_LIB_PTHREAD 1)
endif() endif()
if (CONFIG_WAMR_MEM_ALLOC_WITH_USAGE)
set (WAMR_MEM_ALLOC_WITH_USAGE 1)
endif ()
set(WAMR_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/../../..) set(WAMR_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/../../..)
# enable WAMR build system # enable WAMR build system

3
product-mini/platforms/posix/main.c
View File

@ -452,7 +452,6 @@ malloc_func(
#endif #endif
unsigned int size) unsigned int size)
{ {
//printf("current allocated for %d\n", usage);
return malloc(size); return malloc(size);
} }
@ -465,7 +464,6 @@ realloc_func(
#endif #endif
void *ptr, unsigned int size) void *ptr, unsigned int size)
{ {
//printf("current realloc for %d\n", usage);
return realloc(ptr, size); return realloc(ptr, size);
} }
@ -478,7 +476,6 @@ free_func(
#endif #endif
void *ptr) void *ptr)
{ {
//printf("current free for %d\n", usage);
free(ptr); free(ptr);
} }
#endif /* end of WASM_ENABLE_GLOBAL_HEAP_POOL */ #endif /* end of WASM_ENABLE_GLOBAL_HEAP_POOL */