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

Merge 167cc14668 into 2e6ab0f230

Browse source
This commit is contained in:
David CARLIER 2023-03-08 07:24:28 +08:00 • committed by GitHub
commit 2b59ea2180
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
2 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
include/mimalloc-internal.h
View file

@ -188,6 +188,21 @@ bool _mi_page_is_valid(mi_page_t* page);
#define __has_builtin(x) 0
#endif
#if __has_builtin(__builtin_memcpy_inline)
#define _mi_memcpy_inline(x, y, s) __builtin_memcpy_inline(x, y, s)
#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)
#define _mi_memcpy_inline(x, y, s) do { _Static_assert(__builtin_choose_expr(__builtin_constant_p(s), 1, 0), "`_mi_memcpy_inline` must be a constant integer"); memcpy(x, y, s); } while (0)
#else
#define _mi_memcpy_inline(x, y, s) memcpy(x, y, s)
#endif
#if __has_builtin(__builtin_memset_inline)
#define _mi_memset_inline(x, y, s) __builtin_memset_inline(x, y, s)
#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)
#define _mi_memset_inline(x, y, s) do { _Static_assert(__builtin_choose_expr(__builtin_constant_p(s), 1, 0), "`_mi_memset_inline` must be a constant integer"); memset(x, y, s); } while (0)
#else
#define _mi_memset_inline(x, y, s) memset(x, y, s)
#endif
/* -----------------------------------------------------------
Error codes passed to `_mi_fatal_error`
@ -1008,6 +1023,17 @@ static inline void _mi_memzero_aligned(void* dst, size_t n) {
void* adst = __builtin_assume_aligned(dst, MI_INTPTR_SIZE);
_mi_memzero(adst, n);
}
#define _mi_memcpy_inline_aligned(dst, src, n) \
mi_assert_internal(((uintptr_t)dst % MI_INTPTR_SIZE == 0) && ((uintptr_t)src % MI_INTPTR_SIZE == 0)); \
void* adst = __builtin_assume_aligned(dst, MI_INTPTR_SIZE); \
const void* asrc = __builtin_assume_aligned(src, MI_INTPTR_SIZE); \
_mi_memcpy_inline(adst, asrc, n)
#define _mi_memzero_inline_aligned(dst, n) \
mi_assert_internal((uintptr_t)dst % MI_INTPTR_SIZE == 0); \
void* adst = __builtin_assume_aligned(dst, MI_INTPTR_SIZE); \
_mi_memzero_inline(adst, n)
#else
// Default fallback on `_mi_memcpy`
static inline void _mi_memcpy_aligned(void* dst, const void* src, size_t n) {
@ -1019,6 +1045,9 @@ static inline void _mi_memzero_aligned(void* dst, size_t n) {
mi_assert_internal((uintptr_t)dst % MI_INTPTR_SIZE == 0);
_mi_memzero(dst, n);
}
#define _mi_memcpy_inline_aligned(dst, src, n) _mi_memcpy_aligned(dst, src, n)
#define _mi_memzero_inline_aligned(dst, n) _mi_memzero_aligned(dst, n)
#endif

4
src/heap.c
View file

@ -194,7 +194,7 @@ mi_decl_nodiscard mi_heap_t* mi_heap_new(void) {
mi_heap_t* bheap = mi_heap_get_backing();
mi_heap_t* heap = mi_heap_malloc_tp(bheap, mi_heap_t); // todo: OS allocate in secure mode?
if (heap==NULL) return NULL;
_mi_memcpy_aligned(heap, &_mi_heap_empty, sizeof(mi_heap_t));
_mi_memcpy_inline_aligned(heap, &_mi_heap_empty, sizeof(mi_heap_t));
heap->tld = bheap->tld;
heap->thread_id = _mi_thread_id();
_mi_random_split(&bheap->random, &heap->random);
@ -221,7 +221,7 @@ static void mi_heap_reset_pages(mi_heap_t* heap) {
#ifdef MI_MEDIUM_DIRECT
memset(&heap->pages_free_medium, 0, sizeof(heap->pages_free_medium));
#endif
_mi_memcpy_aligned(&heap->pages, &_mi_heap_empty.pages, sizeof(heap->pages));
_mi_memcpy_inline_aligned(&heap->pages, &_mi_heap_empty.pages, sizeof(heap->pages));
heap->thread_delayed_free = NULL;
heap->page_count = 0;
}