Skip to content

Commit 63f4756

Browse files
committed
fix debug_show_arenas parameters
1 parent 587e08c commit 63f4756

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

include/mimalloc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ mi_decl_export int mi_reserve_huge_os_pages_at(size_t pages, int numa_node, size
276276
mi_decl_export int mi_reserve_os_memory(size_t size, bool commit, bool allow_large) mi_attr_noexcept;
277277
mi_decl_export bool mi_manage_os_memory(void* start, size_t size, bool is_committed, bool is_large, bool is_zero, int numa_node) mi_attr_noexcept;
278278

279-
mi_decl_export void mi_debug_show_arenas(bool show_inuse, bool show_abandoned, bool show_purge) mi_attr_noexcept;
279+
mi_decl_export void mi_debug_show_arenas(bool show_inuse) mi_attr_noexcept;
280280

281281
// Experimental: heaps associated with specific memory arena's
282282
typedef int mi_arena_id_t;

src/arena.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -911,11 +911,11 @@ static size_t mi_debug_show_bitmap(const char* prefix, const char* header, size_
911911
return inuse_count;
912912
}
913913

914-
void mi_debug_show_arenas(bool show_inuse, bool show_abandoned, bool show_purge) mi_attr_noexcept {
914+
void mi_debug_show_arenas(bool show_inuse) mi_attr_noexcept {
915915
size_t max_arenas = mi_atomic_load_relaxed(&mi_arena_count);
916916
size_t inuse_total = 0;
917-
size_t abandoned_total = 0;
918-
size_t purge_total = 0;
917+
//size_t abandoned_total = 0;
918+
//size_t purge_total = 0;
919919
for (size_t i = 0; i < max_arenas; i++) {
920920
mi_arena_t* arena = mi_atomic_load_ptr_relaxed(mi_arena_t, &mi_arenas[i]);
921921
if (arena == NULL) break;
@@ -926,16 +926,16 @@ void mi_debug_show_arenas(bool show_inuse, bool show_abandoned, bool show_purge)
926926
if (arena->blocks_committed != NULL) {
927927
mi_debug_show_bitmap(" ", "committed blocks", arena->block_count, arena->blocks_committed, arena->field_count);
928928
}
929-
if (show_abandoned) {
930-
abandoned_total += mi_debug_show_bitmap(" ", "abandoned blocks", arena->block_count, arena->blocks_abandoned, arena->field_count);
931-
}
932-
if (show_purge && arena->blocks_purge != NULL) {
933-
purge_total += mi_debug_show_bitmap(" ", "purgeable blocks", arena->block_count, arena->blocks_purge, arena->field_count);
934-
}
929+
//if (show_abandoned) {
930+
// abandoned_total += mi_debug_show_bitmap(" ", "abandoned blocks", arena->block_count, arena->blocks_abandoned, arena->field_count);
931+
//}
932+
//if (show_purge && arena->blocks_purge != NULL) {
933+
// purge_total += mi_debug_show_bitmap(" ", "purgeable blocks", arena->block_count, arena->blocks_purge, arena->field_count);
934+
//}
935935
}
936936
if (show_inuse) _mi_verbose_message("total inuse blocks : %zu\n", inuse_total);
937-
if (show_abandoned) _mi_verbose_message("total abandoned blocks: %zu\n", abandoned_total);
938-
if (show_purge) _mi_verbose_message("total purgeable blocks: %zu\n", purge_total);
937+
//if (show_abandoned) _mi_verbose_message("total abandoned blocks: %zu\n", abandoned_total);
938+
//if (show_purge) _mi_verbose_message("total purgeable blocks: %zu\n", purge_total);
939939
}
940940

941941

test/test-stress.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ static void test_stress(void) {
238238
}
239239
#ifndef NDEBUG
240240
//mi_collect(false);
241-
//mi_debug_show_arenas();
241+
//mi_debug_show_arenas(true);
242242
#endif
243243
#if !defined(NDEBUG) || defined(MI_TSAN)
244244
if ((n + 1) % 10 == 0) { printf("- iterations left: %3d\n", ITER - (n + 1)); }
@@ -316,7 +316,7 @@ int main(int argc, char** argv) {
316316

317317
#ifndef USE_STD_MALLOC
318318
#ifndef NDEBUG
319-
mi_debug_show_arenas(true,true,true);
319+
mi_debug_show_arenas(true);
320320
mi_collect(true);
321321
#endif
322322
#endif

0 commit comments

Comments
 (0)