christoph/wamr
1
Fork 0
Code Releases Activity

shared-platform: Remove dependency on shared-utils' bh_memory_remap_slow (#3153)

Browse Source 
As an original design rule, the code in `core/shared/platform` should not
rely on the code in `core/share/utils`. In the current implementation,
platform layer calls function `bh_memory_remap_slow` in utils layer.

This PR adds inline function `os_mremap_slow` in platform_api_vmcore.h,
and lets os_remap call it if mremap fails. And remove bh_memutils.h/c as
as they are unused.

And resolve the compilation warning in wamrc:
```bash
core/shared/platform/common/posix/posix_memmap.c:255:16:
warning: implicit declaration of function ‘bh_memory_remap_slow’
  255 |         return bh_memory_remap_slow(old_addr, old_size, new_size);
```
This commit is contained in:
Wenyong Huang
2024-02-17 13:44:33 +08:00
committed by GitHub
parent 3a0e86454e
commit b6adec373e
7 changed files with 22 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/shared/utils/bh_memutils.c
View File

@ -1,24 +0,0 @@
/*
* Copyright (C) 2024 Amazon Inc. All rights reserved.
* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
*/
#include "bh_memutils.h"
void *
bh_memory_remap_slow(void *old_addr, size_t old_size, size_t new_size)
{
void *new_memory =
os_mmap(NULL, new_size, MMAP_PROT_WRITE | MMAP_PROT_READ, 0, -1);
if (!new_memory) {
return NULL;
}
/*
* bh_memcpy_s can't be used as it doesn't support values bigger than
* UINT32_MAX
*/
memcpy(new_memory, old_addr, new_size < old_size ? new_size : old_size);
os_munmap(old_addr, old_size);
return new_memory;
}

35
core/shared/utils/bh_memutils.h
View File

@ -1,35 +0,0 @@
/*
* Copyright (C) 2024 Amazon Inc. All rights reserved.
* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
*/
#ifndef _BH_MEMUTILS_H
#define _BH_MEMUTILS_H
#include "bh_platform.h"
#ifdef __cplusplus
extern "C" {
#endif
/**
* Remaps memory by mapping a new region, copying data from the old
* region and umapping the old region.
*
* Unless the behavior is desired, in most cases os_mremap should be used
* as it's at worst equally slow as this function, and on some platforms
* (e.g. posix with mremap) os_mremap will perform better.
*
* @param old_addr an old address.
* @param old_size a size of the old address.
* @param new_size a size of the new memory region.
* @return a pointer to the new memory region.
*/
void *
bh_memory_remap_slow(void *old_addr, size_t old_size, size_t new_size);
#ifdef __cplusplus
}
#endif
#endif /* end of _BH_MEMUTILS_H */