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

further fixes to compile on mingw without warnings (issue #217)

Browse source
This commit is contained in:
daan 2020-04-06 10:56:53 -07:00
parent 0f3bd05fd5
commit 0a3e5bb699
4 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
include/mimalloc.h
View file

@ -42,13 +42,18 @@ terms of the MIT license. A copy of the license can be found in the file
#else #else
#define mi_decl_export __declspec(dllimport) #define mi_decl_export __declspec(dllimport)
#endif #endif
#if (_MSC_VER >= 1900) && !defined(__EDG__) #if defined(__MINGW32__)
#define mi_decl_restrict __declspec(allocator) __declspec(restrict) #define mi_decl_restrict
#define mi_attr_malloc __attribute__((malloc))
#else #else
#define mi_decl_restrict __declspec(restrict) #if (_MSC_VER >= 1900) && !defined(__EDG__)
#define mi_decl_restrict __declspec(allocator) __declspec(restrict)
#else
#define mi_decl_restrict __declspec(restrict)
#endif
#define mi_attr_malloc
#endif #endif
#define mi_cdecl __cdecl #define mi_cdecl __cdecl
#define mi_attr_malloc
#define mi_attr_alloc_size(s) #define mi_attr_alloc_size(s)
#define mi_attr_alloc_size2(s1,s2) #define mi_attr_alloc_size2(s1,s2)
#define mi_attr_alloc_align(p) #define mi_attr_alloc_align(p)

2
src/os.c
View file

@ -866,6 +866,8 @@ static void* mi_os_alloc_huge_os_pagesx(void* addr, size_t size, int numa_node)
params[0].ULong = (unsigned)numa_node; params[0].ULong = (unsigned)numa_node;
return (*pVirtualAlloc2)(GetCurrentProcess(), addr, size, flags, PAGE_READWRITE, params, 1); return (*pVirtualAlloc2)(GetCurrentProcess(), addr, size, flags, PAGE_READWRITE, params, 1);
} }
#else
UNUSED(numa_node);
#endif #endif
// otherwise use regular virtual alloc on older windows // otherwise use regular virtual alloc on older windows
return VirtualAlloc(addr, size, flags, PAGE_READWRITE); return VirtualAlloc(addr, size, flags, PAGE_READWRITE);

2
test/main-override.cpp
View file

@ -168,7 +168,7 @@ void heap_thread_free_large_worker() {
void heap_thread_free_large() { void heap_thread_free_large() {
for (int i = 0; i < 100; i++) { for (int i = 0; i < 100; i++) {
shared_p = mi_malloc(2*1024*1024 + 1); shared_p = mi_malloc_aligned(2*1024*1024 + 1, 8);
auto t1 = std::thread(heap_thread_free_large_worker); auto t1 = std::thread(heap_thread_free_large_worker);
t1.join(); t1.join();
} }