3party/mimalloc
0
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2024-12-25 20:14:12 +08:00
Code Issues Projects Releases Wiki Activity

merge from dev, bump version to v2.1.7

Browse Source
This commit is contained in:
Daan 2024-05-16 19:07:14 -07:00
commit 69f81732f8
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/mimalloc-config-version.cmake
View File

@ -1,6 +1,6 @@
set(mi_version_major 2) set(mi_version_major 2)
set(mi_version_minor 1) set(mi_version_minor 1)
set(mi_version_patch 6) set(mi_version_patch 7)
set(mi_version ${mi_version_major}.${mi_version_minor}) set(mi_version ${mi_version_major}.${mi_version_minor})
set(PACKAGE_VERSION ${mi_version}) set(PACKAGE_VERSION ${mi_version})

2
include/mimalloc.h
View File

@ -8,7 +8,7 @@ terms of the MIT license. A copy of the license can be found in the file
#ifndef MIMALLOC_H #ifndef MIMALLOC_H
#define MIMALLOC_H #define MIMALLOC_H
#define MI_MALLOC_VERSION 216 // major + 2 digits minor #define MI_MALLOC_VERSION 217 // major + 2 digits minor
// ------------------------------------------------------ // ------------------------------------------------------
// Compiler specific attributes // Compiler specific attributes

7
src/arena.c
View File

@ -177,7 +177,12 @@ static void* mi_arena_meta_zalloc(size_t size, mi_memid_t* memid, mi_stats_t* st
*memid = _mi_memid_none(); *memid = _mi_memid_none();
// try static // try static
void* p = mi_arena_static_zalloc(size, MI_MAX_ALIGN_SIZE, memid); void* p = NULL;
#if (MI_INTPTR_SIZE==4 && MI_LIBC_MUSL) // fix 32-bit musl compilation, issue #895
MI_UNUSED(mi_arena_static_zalloc);
#else
p = mi_arena_static_zalloc(size, MI_MAX_ALIGN_SIZE, memid);
#endif
if (p != NULL) return p; if (p != NULL) return p;
// or fall back to the OS // or fall back to the OS

2
src/init.c
View File

@ -33,9 +33,7 @@ const mi_page_t _mi_page_empty = {
MI_ATOMIC_VAR_INIT(0), // xthread_free MI_ATOMIC_VAR_INIT(0), // xthread_free
MI_ATOMIC_VAR_INIT(0), // xheap MI_ATOMIC_VAR_INIT(0), // xheap
NULL, NULL NULL, NULL
#if MI_INTPTR_SIZE==8
, { 0 } // padding , { 0 } // padding
#endif
}; };
#define MI_PAGE_EMPTY() ((mi_page_t*)&_mi_page_empty) #define MI_PAGE_EMPTY() ((mi_page_t*)&_mi_page_empty)