mirrors/mimalloc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into dev-exp

Browse Source
This commit is contained in:
daan 2019-07-15 11:10:12 -07:00
commit 0196622fff
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/os.c
View File

@ -21,6 +21,9 @@ terms of the MIT license. A copy of the license can be found in the file
#else #else
#include <sys/mman.h> // mmap #include <sys/mman.h> // mmap
#include <unistd.h> // sysconf #include <unistd.h> // sysconf
#if defined(__APPLE__)
#include <mach/vm_statistics.h>
#endif
#endif #endif
/* ----------------------------------------------------------- /* -----------------------------------------------------------
@ -258,6 +261,7 @@ static void* mi_unix_mmap(size_t size, size_t try_alignment, int protect_flags)
#endif #endif
if (large_os_page_size > 0 && use_large_os_page(size, try_alignment)) { if (large_os_page_size > 0 && use_large_os_page(size, try_alignment)) {
int lflags = flags; int lflags = flags;
int fd = -1;
#ifdef MAP_ALIGNED_SUPER #ifdef MAP_ALIGNED_SUPER
lflags |= MAP_ALIGNED_SUPER; lflags |= MAP_ALIGNED_SUPER;
#endif #endif
@ -267,11 +271,14 @@ static void* mi_unix_mmap(size_t size, size_t try_alignment, int protect_flags)
#ifdef MAP_HUGE_2MB #ifdef MAP_HUGE_2MB
lflags |= MAP_HUGE_2MB; lflags |= MAP_HUGE_2MB;
#endif #endif
#ifdef VM_FLAGS_SUPERPAGE_SIZE_2MB
fd = VM_FLAGS_SUPERPAGE_SIZE_2MB;
#endif
if (lflags != flags) { if (lflags != flags) {
// try large page allocation // try large page allocation
// TODO: if always failing due to permissions or no huge pages, try to avoid repeatedly trying? // TODO: if always failing due to permissions or no huge pages, try to avoid repeatedly trying?
// Should we check this in _mi_os_init? (as on Windows) // Should we check this in _mi_os_init? (as on Windows)
p = mmap(NULL, size, protect_flags, lflags, -1, 0); p = mmap(NULL, size, protect_flags, lflags, fd, 0);
if (p == MAP_FAILED) p = NULL; // fall back to regular mmap if large is exhausted or no permission if (p == MAP_FAILED) p = NULL; // fall back to regular mmap if large is exhausted or no permission
} }
} }