set extra debug padding per-heap

This commit is contained in:
daan 2020-04-20 17:09:28 -07:00
parent ae608cda2f
commit 9ebb94fe17
10 changed files with 65 additions and 49 deletions

View file

@ -32,26 +32,6 @@ terms of the MIT license. A copy of the license can be found in the file
#define mi_decl_cache_align
#endif
/* -----------------------------------------------------------
Padding
----------------------------------------------------------- */
#if (MI_PADDING)
#define MI_EXTRA_PADDING_XPARAM , size_t __extra_padding
#define MI_EXTRA_PADDING_XARG , __extra_padding
#define MI_EXTRA_PADDING_ARG __extra_padding
static inline size_t mi_extra_padding() {
return MI_PADDING_SIZE + mi_option_get(mi_option_debug_extra_padding);
}
#else
#define MI_EXTRA_PADDING_XPARAM
#define MI_EXTRA_PADDING_XARG
#define MI_EXTRA_PADDING_ARG 0
static inline size_t mi_extra_padding() {
return 0;
}
#endif
// "options.c"
void _mi_fputs(mi_output_fun* out, void* arg, const char* prefix, const char* message);
@ -110,7 +90,7 @@ void _mi_abandoned_await_readers(void);
// "page.c"
void* _mi_malloc_generic(mi_heap_t* heap, size_t size MI_EXTRA_PADDING_XPARAM MI_SOURCE_XPARAM) mi_attr_noexcept mi_attr_malloc;
void* _mi_malloc_generic(mi_heap_t* heap, size_t size MI_SOURCE_XPARAM) mi_attr_noexcept mi_attr_malloc;
void _mi_page_retire(mi_page_t* page); // free the page if there are no other pages with many free blocks
void _mi_page_unfull(mi_page_t* page);
@ -143,7 +123,7 @@ mi_msecs_t _mi_clock_end(mi_msecs_t start);
mi_msecs_t _mi_clock_start(void);
// "alloc.c"
void* _mi_page_malloc(mi_heap_t* heap, mi_page_t* page, size_t size MI_EXTRA_PADDING_XPARAM MI_SOURCE_XPARAM) mi_attr_noexcept; // called from `_mi_malloc_generic`
void* _mi_page_malloc(mi_heap_t* heap, mi_page_t* page, size_t size MI_SOURCE_XPARAM) mi_attr_noexcept; // called from `_mi_malloc_generic`
mi_block_t* _mi_page_ptr_unalign(const mi_segment_t* segment, const mi_page_t* page, const void* p);
bool _mi_free_delayed_block(mi_block_t* block);
void _mi_block_zero_init(const mi_page_t* page, void* p, size_t size);
@ -158,6 +138,21 @@ bool _mi_page_is_valid(mi_page_t* page);
#endif
/* -----------------------------------------------------------
Padding
----------------------------------------------------------- */
#if (MI_PADDING)
static inline size_t mi_extra_padding(mi_heap_t* const heap) {
return (MI_PADDING_SIZE + heap->extra_padding);
}
#else
static inline size_t mi_extra_padding() {
return 0;
}
#endif
// ------------------------------------------------------
// Branches
// ------------------------------------------------------

View file

@ -334,6 +334,7 @@ struct mi_heap_s {
size_t page_count; // total number of pages in the `pages` queues.
size_t page_retired_min; // smallest retired index (retired pages are fully free, but still in the page queues)
size_t page_retired_max; // largest retired index into the `pages` array.
size_t extra_padding; // extra padding bytes in each heap block to better detect heap block overflows
mi_heap_t* next; // list of heaps per thread
bool no_reclaim; // `true` if this heap should not reclaim abandoned pages
};

View file

@ -296,11 +296,12 @@ typedef bool (mi_cdecl mi_block_visit_fun)(const mi_heap_t* heap, const mi_heap_
mi_decl_export bool mi_heap_visit_blocks(const mi_heap_t* heap, bool visit_all_blocks, mi_block_visit_fun* visitor, void* arg);
// Experimental
mi_decl_export void mi_heap_print_json(mi_heap_t* heap, mi_output_fun* out, void* arg);
mi_decl_export bool mi_heap_is_empty(mi_heap_t* heap);
mi_decl_export void mi_heap_check_leak(mi_heap_t* heap, mi_output_fun* out, void* arg);
mi_decl_export void mi_heap_set_extra_padding(mi_heap_t* heap, size_t extra_padding);
// Experimental
mi_decl_nodiscard mi_decl_export bool mi_is_in_heap_region(const void* p) mi_attr_noexcept;
mi_decl_nodiscard mi_decl_export bool mi_is_redirected() mi_attr_noexcept;