Replace extent_achunk_[gs]et() with extent_slab_[gs]et().
This commit is contained in:
@@ -525,8 +525,8 @@ arena_chunk_register(tsdn_t *tsdn, arena_t *arena, arena_chunk_t *chunk,
|
||||
* runs is tracked individually, and upon chunk deallocation the entire
|
||||
* chunk is in a consistent commit state.
|
||||
*/
|
||||
extent_init(&chunk->extent, arena, chunk, chunksize, true, zero, true);
|
||||
extent_achunk_set(&chunk->extent, true);
|
||||
extent_init(&chunk->extent, arena, chunk, chunksize, true, zero, true,
|
||||
true);
|
||||
return (chunk_register(tsdn, chunk, &chunk->extent));
|
||||
}
|
||||
|
||||
@@ -1723,7 +1723,7 @@ arena_purge_to_limit(tsdn_t *tsdn, arena_t *arena, size_t ndirty_limit)
|
||||
|
||||
qr_new(&purge_runs_sentinel, rd_link);
|
||||
extent_init(&purge_chunks_sentinel, arena, NULL, 0, false, false,
|
||||
false);
|
||||
false, false);
|
||||
|
||||
npurge = arena_stash_dirty(tsdn, arena, &chunk_hooks, ndirty_limit,
|
||||
&purge_runs_sentinel, &purge_chunks_sentinel);
|
||||
|
@@ -66,7 +66,7 @@ base_chunk_alloc(tsdn_t *tsdn, size_t minsize)
|
||||
base_resident += PAGE_CEILING(nsize);
|
||||
}
|
||||
}
|
||||
extent_init(extent, NULL, addr, csize, true, true, true);
|
||||
extent_init(extent, NULL, addr, csize, true, true, true, false);
|
||||
return (extent);
|
||||
}
|
||||
|
||||
@@ -90,7 +90,7 @@ base_alloc(tsdn_t *tsdn, size_t size)
|
||||
csize = CACHELINE_CEILING(size);
|
||||
|
||||
usize = s2u(csize);
|
||||
extent_init(&key, NULL, NULL, usize, false, false, false);
|
||||
extent_init(&key, NULL, NULL, usize, false, false, false, false);
|
||||
malloc_mutex_lock(tsdn, &base_mtx);
|
||||
extent = extent_tree_szad_nsearch(&base_avail_szad, &key);
|
||||
if (extent != NULL) {
|
||||
|
10
src/chunk.c
10
src/chunk.c
@@ -239,7 +239,7 @@ chunk_first_best_fit(arena_t *arena, extent_tree_t *chunks_szad,
|
||||
|
||||
assert(size == CHUNK_CEILING(size));
|
||||
|
||||
extent_init(&key, arena, NULL, size, false, false, false);
|
||||
extent_init(&key, arena, NULL, size, false, false, false, false);
|
||||
return (extent_tree_szad_nsearch(chunks_szad, &key));
|
||||
}
|
||||
|
||||
@@ -271,7 +271,7 @@ chunk_recycle(tsdn_t *tsdn, arena_t *arena, chunk_hooks_t *chunk_hooks,
|
||||
if (new_addr != NULL) {
|
||||
extent_t key;
|
||||
extent_init(&key, arena, new_addr, alloc_size, false, false,
|
||||
false);
|
||||
false, false);
|
||||
extent = extent_tree_ad_search(chunks_ad, &key);
|
||||
} else {
|
||||
extent = chunk_first_best_fit(arena, chunks_szad, chunks_ad,
|
||||
@@ -337,7 +337,7 @@ chunk_recycle(tsdn_t *tsdn, arena_t *arena, chunk_hooks_t *chunk_hooks,
|
||||
}
|
||||
}
|
||||
extent_init(extent, arena, (void *)((uintptr_t)(ret) + size),
|
||||
trailsize, false, zeroed, committed);
|
||||
trailsize, false, zeroed, committed, false);
|
||||
extent_tree_szad_insert(chunks_szad, extent);
|
||||
extent_tree_ad_insert(chunks_ad, extent);
|
||||
arena_chunk_cache_maybe_insert(arena, extent, cache);
|
||||
@@ -535,7 +535,7 @@ chunk_record(tsdn_t *tsdn, arena_t *arena, chunk_hooks_t *chunk_hooks,
|
||||
malloc_mutex_lock(tsdn, &arena->chunks_mtx);
|
||||
chunk_hooks_assure_initialized_locked(tsdn, arena, chunk_hooks);
|
||||
extent_init(&key, arena, (void *)((uintptr_t)chunk + size), 0, false,
|
||||
false, false);
|
||||
false, false, false);
|
||||
extent = extent_tree_ad_nsearch(chunks_ad, &key);
|
||||
/* Try to coalesce forward. */
|
||||
if (extent != NULL && extent_addr_get(extent) == extent_addr_get(&key)
|
||||
@@ -572,7 +572,7 @@ chunk_record(tsdn_t *tsdn, arena_t *arena, chunk_hooks_t *chunk_hooks,
|
||||
goto label_return;
|
||||
}
|
||||
extent_init(extent, arena, chunk, size, false, !unzeroed,
|
||||
committed);
|
||||
committed, false);
|
||||
extent_tree_ad_insert(chunks_ad, extent);
|
||||
extent_tree_szad_insert(chunks_szad, extent);
|
||||
arena_chunk_cache_maybe_insert(arena, extent, cache);
|
||||
|
@@ -50,7 +50,7 @@ huge_palloc(tsdn_t *tsdn, arena_t *arena, size_t usize, size_t alignment,
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
extent_init(extent, arena, ret, usize, true, is_zeroed, true);
|
||||
extent_init(extent, arena, ret, usize, true, is_zeroed, true, false);
|
||||
|
||||
if (chunk_register(tsdn, ret, extent)) {
|
||||
arena_chunk_dalloc_huge(tsdn, arena, ret, usize);
|
||||
|
Reference in New Issue
Block a user