merge from dev

This commit is contained in:
daan 2021-11-14 11:25:51 -08:00
commit a4ea2205ba
3 changed files with 9 additions and 2 deletions

View file

@ -90,6 +90,10 @@ static size_t large_os_page_size = 0;
// set dynamically in _mi_os_init (and if true we use MAP_NORESERVE)
static bool os_overcommit = true;
bool _mi_os_has_overcommit(void) {
return os_overcommit;
}
// OS (small) page size
size_t _mi_os_page_size() {
return os_page_size;
@ -463,7 +467,7 @@ static void* mi_unix_mmap(void* addr, size_t size, size_t try_alignment, int pro
#endif
const int fd = mi_unix_mmap_fd();
int flags = MAP_PRIVATE | MAP_ANONYMOUS;
if (os_overcommit) {
if (_mi_os_has_overcommit()) {
flags |= MAP_NORESERVE;
}
#if defined(PROT_MAX)