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

Merge pull request #4 from synacker/master

Browse source 
Merge master into dev
This commit is contained in:
synacker 2020-04-07 14:13:38 +03:00 • committed by GitHub
commit 8ff080130d
WARNING! Although there is a key with this ID in the database it does not verify this commit! This commit is SUSPICIOUS.
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 51 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/os.c
View file

@ -173,6 +173,39 @@ void _mi_os_init() {
}
#endif
#if MI_USER_CLEANUP
static mi_cleanup_fun* user_cleanup = NULL;
static void* cleanup_udata = NULL;
static void _mi_call_user_cleanup(void* p, size_t size)
{
if(user_cleanup)
user_cleanup(cleanup_udata, p, size);
#if (MI_DEBUG>1)
else
memset(p, 0, size);
#endif
}
#else
static void _mi_call_user_cleanup(void* p, size_t size)
{
(void)p;
(void)size;
#if (MI_DEBUG>1)
if (MI_SECURE==0)
memset(p, 0, size); // pretend it is eagerly reset
#endif
}
#endif
void mi_register_user_cleanup(mi_cleanup_fun* cleanup, void* user_data) mi_attr_noexcept
{
(void)cleanup;
(void)user_data;
#if MI_USER_CLEANUP
user_cleanup = cleanup;
cleanup_udata = user_data;
#endif
}
/* -----------------------------------------------------------
Raw allocation on Windows (VirtualAlloc) and Unix's (mmap).
@ -182,6 +215,8 @@ static bool mi_os_mem_free(void* addr, size_t size, bool was_committed, mi_stats
{
if (addr == NULL || size == 0) return true; // || _mi_os_is_huge_reserved(addr)
bool err = false;
if(was_committed)
_mi_call_user_cleanup(addr, size);
#if defined(_WIN32)
err = (VirtualFree(addr, 0, MEM_RELEASE) == 0);
#elif defined(__wasi__)
@ -694,11 +729,7 @@ static bool mi_os_resetx(void* addr, size_t size, bool reset, mi_stats_t* stats)
else _mi_stat_decrease(&stats->reset, csize);
if (!reset) return true; // nothing to do on unreset!
#if (MI_DEBUG>1)
if (MI_SECURE==0) {
memset(start, 0, csize); // pretend it is eagerly reset
}
#endif
_mi_call_user_cleanup(start, csize);
#if defined(_WIN32)
// Testing shows that for us (on `malloc-large`) MEM_RESET is 2x faster than DiscardVirtualMemory