diff --git a/src/override/malloc.cc b/src/override/malloc.cc index 42c1fd2..ea1838b 100644 --- a/src/override/malloc.cc +++ b/src/override/malloc.cc @@ -23,12 +23,12 @@ extern "C" SNMALLOC_EXPORT void* SNMALLOC_NAME_MANGLE(malloc)(size_t size) { - return ThreadAlloc::get()->alloc(size); + return ThreadAlloc::get_noncachable()->alloc(size); } SNMALLOC_EXPORT void SNMALLOC_NAME_MANGLE(free)(void* ptr) { - ThreadAlloc::get()->dealloc(ptr); + ThreadAlloc::get_noncachable()->dealloc(ptr); } SNMALLOC_EXPORT void* SNMALLOC_NAME_MANGLE(calloc)(size_t nmemb, size_t size) @@ -40,7 +40,7 @@ extern "C" errno = ENOMEM; return nullptr; } - return ThreadAlloc::get()->alloc(sz); + return ThreadAlloc::get_noncachable()->alloc(sz); } SNMALLOC_EXPORT size_t SNMALLOC_NAME_MANGLE(malloc_usable_size)(void* ptr) diff --git a/src/override/new.cc b/src/override/new.cc index c89b313..87450e7 100644 --- a/src/override/new.cc +++ b/src/override/new.cc @@ -18,50 +18,50 @@ using namespace snmalloc; void* operator new(size_t size) { - return ThreadAlloc::get()->alloc(size); + return ThreadAlloc::get_noncachable()->alloc(size); } void* operator new[](size_t size) { - return ThreadAlloc::get()->alloc(size); + return ThreadAlloc::get_noncachable()->alloc(size); } void* operator new(size_t size, std::nothrow_t&) { - return ThreadAlloc::get()->alloc(size); + return ThreadAlloc::get_noncachable()->alloc(size); } void* operator new[](size_t size, std::nothrow_t&) { - return ThreadAlloc::get()->alloc(size); + return ThreadAlloc::get_noncachable()->alloc(size); } void operator delete(void* p)EXCEPTSPEC { - ThreadAlloc::get()->dealloc(p); + ThreadAlloc::get_noncachable()->dealloc(p); } void operator delete(void* p, size_t size)EXCEPTSPEC { - ThreadAlloc::get()->dealloc(p, size); + ThreadAlloc::get_noncachable()->dealloc(p, size); } void operator delete(void* p, std::nothrow_t&) { - ThreadAlloc::get()->dealloc(p); + ThreadAlloc::get_noncachable()->dealloc(p); } void operator delete[](void* p) EXCEPTSPEC { - ThreadAlloc::get()->dealloc(p); + ThreadAlloc::get_noncachable()->dealloc(p); } void operator delete[](void* p, size_t size) EXCEPTSPEC { - ThreadAlloc::get()->dealloc(p, size); + ThreadAlloc::get_noncachable()->dealloc(p, size); } void operator delete[](void* p, std::nothrow_t&) { - ThreadAlloc::get()->dealloc(p); + ThreadAlloc::get_noncachable()->dealloc(p); }