kiper220/mimalloc
1
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2025-07-01 09:14:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' into dev3

Browse source
This commit is contained in:
Daan 2025-06-06 20:15:27 -07:00
commit 444902a4c8
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/prim/unix/prim.c
View file

@ -435,6 +435,7 @@ int _mi_prim_commit(void* start, size_t size, bool* is_zero) {
}
int _mi_prim_reuse(void* start, size_t size) {
MI_UNUSED(start); MI_UNUSED(size);
#if defined(__APPLE__) && defined(MADV_FREE_REUSE)
return unix_madvise(start, size, MADV_FREE_REUSE);
#endif
@ -443,18 +444,17 @@ int _mi_prim_reuse(void* start, size_t size) {
int _mi_prim_decommit(void* start, size_t size, bool* needs_recommit) {
int err = 0;
#if !MI_DEBUG && MI_SECURE<=2
*needs_recommit = false;
#if defined(__APPLE__) && defined(MADV_FREE_REUSABLE)
#if defined(__APPLE__) && defined(MADV_FREE_REUSABLE)
// decommit on macOS: use MADV_FREE_REUSABLE as it does immediate rss accounting (issue #1097)
err = unix_madvise(start, size, MADV_FREE_REUSABLE);
#else
if (err) { err = unix_madvise(start, size, MADV_DONTNEED); }
#else
// decommit: use MADV_DONTNEED as it decreases rss immediately (unlike MADV_FREE)
err = unix_madvise(start, size, MADV_DONTNEED);
#endif
#endif
#if !MI_DEBUG && MI_SECURE<=2
*needs_recommit = false;
#else
// note: don't use MADV_FREE_REUSABLE as the range may contain protected areas
err = unix_madvise(start, size, MADV_DONTNEED);
*needs_recommit = true;
mprotect(start, size, PROT_NONE);
#endif
@ -470,10 +470,11 @@ int _mi_prim_decommit(void* start, size_t size, bool* needs_recommit) {
int _mi_prim_reset(void* start, size_t size) {
int err = 0;
#if defined(__APPLE__) && defined(MADV_FREE_REUSABLE)
// on macOS we try to use MADV_FREE_REUSABLE as it seems the fastest
// on macOS can use MADV_FREE_REUSABLE (but we disable this for now as it seems slower)
#if 0 && defined(__APPLE__) && defined(MADV_FREE_REUSABLE)
err = unix_madvise(start, size, MADV_FREE_REUSABLE);
if (err == 0) return 0;
if (err==0) return 0;
// fall through
#endif