From 632edf999632ff50bdfd89b3c287161da8b835de Mon Sep 17 00:00:00 2001 From: daanx Date: Mon, 24 Apr 2023 09:03:43 -0700 Subject: [PATCH] rename was_zero/committed to initially_zero/committed --- include/mimalloc/internal.h | 4 ++-- include/mimalloc/types.h | 20 ++++++++++---------- src/arena.c | 20 ++++++++++---------- src/init.c | 2 +- src/segment.c | 10 +++++----- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/include/mimalloc/internal.h b/include/mimalloc/internal.h index f3837973..4dabe8ba 100644 --- a/include/mimalloc/internal.h +++ b/include/mimalloc/internal.h @@ -673,8 +673,8 @@ static inline mi_memid_t _mi_memid_none(void) { static inline mi_memid_t _mi_memid_create_os(bool committed, bool is_zero, bool is_large) { mi_memid_t memid = _mi_memid_create(MI_MEM_OS); - memid.was_committed = committed; - memid.was_zero = is_zero; + memid.initially_committed = committed; + memid.initially_zero = is_zero; memid.is_pinned = is_large; return memid; } diff --git a/include/mimalloc/types.h b/include/mimalloc/types.h index cd207abd..06b96587 100644 --- a/include/mimalloc/types.h +++ b/include/mimalloc/types.h @@ -340,24 +340,24 @@ static inline bool mi_memkind_is_os(mi_memkind_t memkind) { } typedef struct mi_memid_os_info { - void* base; // actual base address of the block (used for offset aligned allocations) - size_t alignment; // alignment at allocation + void* base; // actual base address of the block (used for offset aligned allocations) + size_t alignment; // alignment at allocation } mi_memid_os_info_t; typedef struct mi_memid_arena_info { - size_t block_index; // index in the arena - mi_arena_id_t id; // arena id (>= 1) - bool is_exclusive; // the arena can only be used for specific arena allocations + size_t block_index; // index in the arena + mi_arena_id_t id; // arena id (>= 1) + bool is_exclusive; // the arena can only be used for specific arena allocations } mi_memid_arena_info_t; typedef struct mi_memid_s { union { - mi_memid_os_info_t os; // only used for MI_MEM_OS - mi_memid_arena_info_t arena;// only used for MI_MEM_ARENA + mi_memid_os_info_t os; // only used for MI_MEM_OS + mi_memid_arena_info_t arena; // only used for MI_MEM_ARENA } mem; - bool is_pinned; // `true` if we cannot decommit/reset/protect in this memory (e.g. when allocated using large OS pages) - bool was_committed; // `true` if the memory was originally allocated as committed - bool was_zero; // `true` if the memory was originally zero initialized + bool is_pinned; // `true` if we cannot decommit/reset/protect in this memory (e.g. when allocated using large OS pages) + bool initially_committed;// `true` if the memory was originally allocated as committed + bool initially_zero; // `true` if the memory was originally zero initialized mi_memkind_t memkind; } mi_memid_t; diff --git a/src/arena.c b/src/arena.c index 3549a907..7616bdf8 100644 --- a/src/arena.c +++ b/src/arena.c @@ -234,31 +234,31 @@ static mi_decl_noinline void* mi_arena_try_alloc_at(mi_arena_t* arena, size_t ar } // set the dirty bits (todo: no need for an atomic op here?) - memid->was_zero = _mi_bitmap_claim_across(arena->blocks_dirty, arena->field_count, needed_bcount, bitmap_index, NULL); + memid->initially_zero = _mi_bitmap_claim_across(arena->blocks_dirty, arena->field_count, needed_bcount, bitmap_index, NULL); // set commit state if (arena->blocks_committed == NULL) { // always committed - memid->was_committed = true; + memid->initially_committed = true; } else if (commit) { // commit requested, but the range may not be committed as a whole: ensure it is committed now - memid->was_committed = true; + memid->initially_committed = true; bool any_uncommitted; _mi_bitmap_claim_across(arena->blocks_committed, arena->field_count, needed_bcount, bitmap_index, &any_uncommitted); if (any_uncommitted) { bool commit_zero = false; if (!_mi_os_commit(p, mi_arena_block_size(needed_bcount), &commit_zero, tld->stats)) { - memid->was_committed = false; + memid->initially_committed = false; } else { - if (commit_zero) { memid->was_zero = true; } + if (commit_zero) { memid->initially_zero = true; } } } } else { // no need to commit, but check if already fully committed - memid->was_committed = _mi_bitmap_is_claimed_across(arena->blocks_committed, arena->field_count, needed_bcount, bitmap_index); + memid->initially_committed = _mi_bitmap_is_claimed_across(arena->blocks_committed, arena->field_count, needed_bcount, bitmap_index); } return p; @@ -747,7 +747,7 @@ static bool mi_manage_os_memory_ex2(void* start, size_t size, bool is_large, int if (size < MI_ARENA_BLOCK_SIZE) return false; if (is_large) { - mi_assert_internal(memid.was_committed && memid.is_pinned); + mi_assert_internal(memid.initially_committed && memid.is_pinned); } const size_t bcount = size / MI_ARENA_BLOCK_SIZE; @@ -776,7 +776,7 @@ static bool mi_manage_os_memory_ex2(void* start, size_t size, bool is_large, int arena->blocks_committed = (arena->memid.is_pinned ? NULL : &arena->blocks_inuse[2*fields]); // just after dirty bitmap arena->blocks_purge = (arena->memid.is_pinned ? NULL : &arena->blocks_inuse[3*fields]); // just after committed bitmap // initialize committed bitmap? - if (arena->blocks_committed != NULL && arena->memid.was_committed) { + if (arena->blocks_committed != NULL && arena->memid.initially_committed) { memset((void*)arena->blocks_committed, 0xFF, fields*sizeof(mi_bitmap_field_t)); // cast to void* to avoid atomic warning } @@ -794,8 +794,8 @@ static bool mi_manage_os_memory_ex2(void* start, size_t size, bool is_large, int bool mi_manage_os_memory_ex(void* start, size_t size, bool is_committed, bool is_large, bool is_zero, int numa_node, bool exclusive, mi_arena_id_t* arena_id) mi_attr_noexcept { mi_memid_t memid = _mi_memid_create(MI_MEM_EXTERNAL); - memid.was_committed = is_committed; - memid.was_zero = is_zero; + memid.initially_committed = is_committed; + memid.initially_zero = is_zero; memid.is_pinned = is_large; return mi_manage_os_memory_ex2(start,size,is_large,numa_node,exclusive,memid, arena_id); } diff --git a/src/init.c b/src/init.c index cd2fd643..c9aa4b0f 100644 --- a/src/init.c +++ b/src/init.c @@ -218,7 +218,7 @@ static mi_thread_data_t* mi_thread_data_zalloc(void) { } if (td != NULL) { td->memid = memid; - is_zero = memid.was_zero; + is_zero = memid.initially_zero; } } diff --git a/src/segment.c b/src/segment.c index 99e1c412..6798bb66 100644 --- a/src/segment.c +++ b/src/segment.c @@ -201,7 +201,7 @@ static void mi_segment_protect(mi_segment_t* segment, bool protect, mi_os_tld_t* // and protect the last (or only) page too mi_assert_internal(MI_SECURE <= 1 || segment->page_kind >= MI_PAGE_LARGE); uint8_t* start = (uint8_t*)segment + segment->segment_size - os_psize; - if (protect && !segment->memid.was_committed) { + if (protect && !segment->memid.initially_committed) { if (protect) { // ensure secure page is committed if (_mi_os_commit(start, os_psize, NULL, tld->stats)) { // if this fails that is ok (as it is an unaccessible page) @@ -528,7 +528,7 @@ static mi_segment_t* mi_segment_os_alloc(bool eager_delayed, size_t page_alignme return NULL; // failed to allocate } - if (!memid.was_committed) { + if (!memid.initially_committed) { // ensure the initial info is committed mi_assert_internal(!memid.is_pinned); bool ok = _mi_os_commit(segment, pre_size, NULL, tld_os->stats); @@ -586,7 +586,7 @@ static mi_segment_t* mi_segment_alloc(size_t required, mi_page_kind_t page_kind, mi_segment_t* segment = mi_segment_os_alloc(eager_delayed, page_alignment, req_arena_id, pre_size, info_size, init_commit, init_segment_size, tld, os_tld); if (segment == NULL) return NULL; mi_assert_internal(segment != NULL && (uintptr_t)segment % MI_SEGMENT_SIZE == 0); - mi_assert_internal(segment->memid.is_pinned ? segment->memid.was_committed : true); + mi_assert_internal(segment->memid.is_pinned ? segment->memid.initially_committed : true); mi_atomic_store_ptr_release(mi_segment_t, &segment->abandoned_next, NULL); // tsan @@ -598,8 +598,8 @@ static mi_segment_t* mi_segment_alloc(size_t required, mi_page_kind_t page_kind, for (size_t i = 0; i < capacity; i++) { mi_assert_internal(i <= 255); segment->pages[i].segment_idx = (uint8_t)i; - segment->pages[i].is_committed = segment->memid.was_committed; - segment->pages[i].is_zero_init = segment->memid.was_zero; + segment->pages[i].is_committed = segment->memid.initially_committed; + segment->pages[i].is_zero_init = segment->memid.initially_zero; } // initialize