kiper220/mimalloc
1
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2025-07-01 17:24:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix merge conflict

Browse source
This commit is contained in:
Daan 2025-05-21 15:28:52 -07:00
parent ed474ce525
commit 0c62893367
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/stats.c
View file

@ -407,10 +407,6 @@ void _mi_stats_merge_from(mi_stats_t* to, mi_stats_t* from) {
} }
} }
void _mi_stats_merge_thread(mi_tld_t* tld) {
_mi_stats_merge_from( &tld->subproc->stats, &tld->stats );
}
void _mi_stats_done(mi_stats_t* stats) { // called from `mi_thread_done` void _mi_stats_done(mi_stats_t* stats) { // called from `mi_thread_done`
_mi_stats_merge_from(&_mi_subproc()->stats, stats); _mi_stats_merge_from(&_mi_subproc()->stats, stats);
} }

5
test/test-api.c
View file

@ -86,9 +86,12 @@ int main(void) {
CHECK_BODY("malloc-nomem1") { CHECK_BODY("malloc-nomem1") {
result = (mi_malloc((size_t)PTRDIFF_MAX + (size_t)1) == NULL); result = (mi_malloc((size_t)PTRDIFF_MAX + (size_t)1) == NULL);
}; };
CHECK_BODY("malloc-null") { CHECK_BODY("malloc-free-null") {
mi_free(NULL); mi_free(NULL);
}; };
CHECK_BODY("malloc-free-invalid-low") {
mi_free((void*)(MI_ZU(0x0000000003990080))); // issue #1087
};
CHECK_BODY("calloc-overflow") { CHECK_BODY("calloc-overflow") {
// use (size_t)&mi_calloc to get some number without triggering compiler warnings // use (size_t)&mi_calloc to get some number without triggering compiler warnings
result = (mi_calloc((size_t)&mi_calloc,SIZE_MAX/1000) == NULL); result = (mi_calloc((size_t)&mi_calloc,SIZE_MAX/1000) == NULL);