Rename most remaining *chunk* APIs to *extent*.

include/jemalloc/internal/arena.h

@@ -278,22 +278,22 @@ extern ssize_t		opt_decay_time;
 
 extern const arena_bin_info_t	arena_bin_info[NBINS];
 
-extent_t	*arena_chunk_cache_alloc(tsdn_t *tsdn, arena_t *arena,
+extent_t	*arena_extent_cache_alloc(tsdn_t *tsdn, arena_t *arena,
     extent_hooks_t *extent_hooks, void *new_addr, size_t size, size_t alignment,
     bool *zero);
-void	arena_chunk_cache_dalloc(tsdn_t *tsdn, arena_t *arena,
+void	arena_extent_cache_dalloc(tsdn_t *tsdn, arena_t *arena,
     extent_hooks_t *extent_hooks, extent_t *extent);
-void	arena_chunk_cache_maybe_insert(arena_t *arena, extent_t *extent,
+void	arena_extent_cache_maybe_insert(arena_t *arena, extent_t *extent,
     bool cache);
-void	arena_chunk_cache_maybe_remove(arena_t *arena, extent_t *extent,
+void	arena_extent_cache_maybe_remove(arena_t *arena, extent_t *extent,
     bool cache);
-extent_t	*arena_chunk_alloc_large(tsdn_t *tsdn, arena_t *arena,
+extent_t	*arena_extent_alloc_large(tsdn_t *tsdn, arena_t *arena,
     size_t usize, size_t alignment, bool *zero);
-void	arena_chunk_dalloc_large(tsdn_t *tsdn, arena_t *arena, extent_t *extent,
-    bool locked);
-void	arena_chunk_ralloc_large_shrink(tsdn_t *tsdn, arena_t *arena,
+void	arena_extent_dalloc_large(tsdn_t *tsdn, arena_t *arena,
+    extent_t *extent, bool locked);
+void	arena_extent_ralloc_large_shrink(tsdn_t *tsdn, arena_t *arena,
     extent_t *extent, size_t oldsize);
-void	arena_chunk_ralloc_large_expand(tsdn_t *tsdn, arena_t *arena,
+void	arena_extent_ralloc_large_expand(tsdn_t *tsdn, arena_t *arena,
     extent_t *extent, size_t oldsize);
 ssize_t	arena_lg_dirty_mult_get(tsdn_t *tsdn, arena_t *arena);
 bool	arena_lg_dirty_mult_set(tsdn_t *tsdn, arena_t *arena,

include/jemalloc/internal/chunk.h

@@ -26,40 +26,7 @@ extern size_t		chunksize;
 extern size_t		chunksize_mask; /* (chunksize - 1). */
 extern size_t		chunk_npages;
 
-extern const extent_hooks_t	extent_hooks_default;
-
-extent_hooks_t	extent_hooks_get(tsdn_t *tsdn, arena_t *arena);
-extent_hooks_t	extent_hooks_set(tsdn_t *tsdn, arena_t *arena,
-    const extent_hooks_t *extent_hooks);
-
-extent_t	*chunk_alloc_cache(tsdn_t *tsdn, arena_t *arena,
-    extent_hooks_t *extent_hooks, void *new_addr, size_t usize, size_t pad,
-    size_t alignment, bool *zero, bool slab);
-extent_t	*chunk_alloc_wrapper(tsdn_t *tsdn, arena_t *arena,
-    extent_hooks_t *extent_hooks, void *new_addr, size_t usize, size_t pad,
-    size_t alignment, bool *zero, bool *commit, bool slab);
-void	chunk_dalloc_cache(tsdn_t *tsdn, arena_t *arena,
-    extent_hooks_t *extent_hooks, extent_t *extent);
-void	chunk_dalloc_wrapper(tsdn_t *tsdn, arena_t *arena,
-    extent_hooks_t *extent_hooks, extent_t *extent);
-bool	chunk_commit_wrapper(tsdn_t *tsdn, arena_t *arena,
-    extent_hooks_t *extent_hooks, extent_t *extent, size_t offset,
-    size_t length);
-bool	chunk_decommit_wrapper(tsdn_t *tsdn, arena_t *arena,
-    extent_hooks_t *extent_hooks, extent_t *extent, size_t offset,
-    size_t length);
-bool	chunk_purge_wrapper(tsdn_t *tsdn, arena_t *arena,
-    extent_hooks_t *extent_hooks, extent_t *extent, size_t offset,
-    size_t length);
-extent_t	*chunk_split_wrapper(tsdn_t *tsdn, arena_t *arena,
-    extent_hooks_t *extent_hooks, extent_t *extent, size_t size_a,
-    size_t usize_a, size_t size_b, size_t usize_b);
-bool	chunk_merge_wrapper(tsdn_t *tsdn, arena_t *arena,
-    extent_hooks_t *extent_hooks, extent_t *a, extent_t *b);
 bool	chunk_boot(void);
-void	chunk_prefork(tsdn_t *tsdn);
-void	chunk_postfork_parent(tsdn_t *tsdn);
-void	chunk_postfork_child(tsdn_t *tsdn);
 
 #endif /* JEMALLOC_H_EXTERNS */
 /******************************************************************************/
@@ -67,6 +34,3 @@ void	chunk_postfork_child(tsdn_t *tsdn);
 
 #endif /* JEMALLOC_H_INLINES */
 /******************************************************************************/
-
-#include "jemalloc/internal/chunk_dss.h"
-#include "jemalloc/internal/chunk_mmap.h"

include/jemalloc/internal/extent.h

@@ -38,7 +38,7 @@ struct extent_s {
 	bool			e_active;
 
 	/*
-	 * The zeroed flag is used by chunk recycling code to track whether
+	 * The zeroed flag is used by extent recycling code to track whether
 	 * memory is zero-filled.
 	 */
 	bool			e_zeroed;
@@ -87,11 +87,16 @@ typedef ph(extent_t) extent_heap_t;
 /******************************************************************************/
 #ifdef JEMALLOC_H_EXTERNS
 
-extern rtree_t		extents_rtree;
+extern rtree_t			extents_rtree;
+extern const extent_hooks_t	extent_hooks_default;
 
 extent_t	*extent_alloc(tsdn_t *tsdn, arena_t *arena);
 void	extent_dalloc(tsdn_t *tsdn, arena_t *arena, extent_t *extent);
 
+extent_hooks_t	extent_hooks_get(tsdn_t *tsdn, arena_t *arena);
+extent_hooks_t	extent_hooks_set(tsdn_t *tsdn, arena_t *arena,
+    const extent_hooks_t *extent_hooks);
+
 #ifdef JEMALLOC_JET
 typedef size_t (extent_size_quantize_t)(size_t);
 extern extent_size_quantize_t *extent_size_quantize_floor;
@@ -103,6 +108,34 @@ size_t	extent_size_quantize_ceil(size_t size);
 
 ph_proto(, extent_heap_, extent_heap_t, extent_t)
 
+extent_t	*extent_alloc_cache(tsdn_t *tsdn, arena_t *arena,
+    extent_hooks_t *extent_hooks, void *new_addr, size_t usize, size_t pad,
+    size_t alignment, bool *zero, bool slab);
+extent_t	*extent_alloc_wrapper(tsdn_t *tsdn, arena_t *arena,
+    extent_hooks_t *extent_hooks, void *new_addr, size_t usize, size_t pad,
+    size_t alignment, bool *zero, bool *commit, bool slab);
+void	extent_dalloc_cache(tsdn_t *tsdn, arena_t *arena,
+    extent_hooks_t *extent_hooks, extent_t *extent);
+void	extent_dalloc_wrapper(tsdn_t *tsdn, arena_t *arena,
+    extent_hooks_t *extent_hooks, extent_t *extent);
+bool	extent_commit_wrapper(tsdn_t *tsdn, arena_t *arena,
+    extent_hooks_t *extent_hooks, extent_t *extent, size_t offset,
+    size_t length);
+bool	extent_decommit_wrapper(tsdn_t *tsdn, arena_t *arena,
+    extent_hooks_t *extent_hooks, extent_t *extent, size_t offset,
+    size_t length);
+bool	extent_purge_wrapper(tsdn_t *tsdn, arena_t *arena,
+    extent_hooks_t *extent_hooks, extent_t *extent, size_t offset,
+    size_t length);
+extent_t	*extent_split_wrapper(tsdn_t *tsdn, arena_t *arena,
+    extent_hooks_t *extent_hooks, extent_t *extent, size_t size_a,
+    size_t usize_a, size_t size_b, size_t usize_b);
+bool	extent_merge_wrapper(tsdn_t *tsdn, arena_t *arena,
+    extent_hooks_t *extent_hooks, extent_t *a, extent_t *b);
+void	extent_prefork(tsdn_t *tsdn);
+void	extent_postfork_parent(tsdn_t *tsdn);
+void	extent_postfork_child(tsdn_t *tsdn);
+
 bool	extent_boot(void);
 
 #endif /* JEMALLOC_H_EXTERNS */
@@ -110,7 +143,7 @@ bool	extent_boot(void);
 #ifdef JEMALLOC_H_INLINES
 
 #ifndef JEMALLOC_ENABLE_INLINE
-extent_t	*extent_lookup(tsdn_t *tsdn, const void *chunk, bool dependent);
+extent_t	*extent_lookup(tsdn_t *tsdn, const void *ptr, bool dependent);
 arena_t	*extent_arena_get(const extent_t *extent);
 void	*extent_base_get(const extent_t *extent);
 void	*extent_addr_get(const extent_t *extent);
@@ -395,3 +428,5 @@ extent_ring_remove(extent_t *extent)
 #endif /* JEMALLOC_H_INLINES */
 /******************************************************************************/
 
+#include "jemalloc/internal/extent_dss.h"
+#include "jemalloc/internal/extent_mmap.h"

include/jemalloc/internal/extent_dss.h

@@ -21,15 +21,15 @@ extern const char *dss_prec_names[];
 /******************************************************************************/
 #ifdef JEMALLOC_H_EXTERNS
 
-dss_prec_t	chunk_dss_prec_get(tsdn_t *tsdn);
-bool	chunk_dss_prec_set(tsdn_t *tsdn, dss_prec_t dss_prec);
-void	*chunk_alloc_dss(tsdn_t *tsdn, arena_t *arena, void *new_addr,
+dss_prec_t	extent_dss_prec_get(tsdn_t *tsdn);
+bool	extent_dss_prec_set(tsdn_t *tsdn, dss_prec_t dss_prec);
+void	*extent_alloc_dss(tsdn_t *tsdn, arena_t *arena, void *new_addr,
     size_t size, size_t alignment, bool *zero, bool *commit);
-bool	chunk_in_dss(tsdn_t *tsdn, void *chunk);
-bool	chunk_dss_boot(void);
-void	chunk_dss_prefork(tsdn_t *tsdn);
-void	chunk_dss_postfork_parent(tsdn_t *tsdn);
-void	chunk_dss_postfork_child(tsdn_t *tsdn);
+bool	extent_in_dss(tsdn_t *tsdn, void *addr);
+bool	extent_dss_boot(void);
+void	extent_dss_prefork(tsdn_t *tsdn);
+void	extent_dss_postfork_parent(tsdn_t *tsdn);
+void	extent_dss_postfork_child(tsdn_t *tsdn);
 
 #endif /* JEMALLOC_H_EXTERNS */
 /******************************************************************************/

include/jemalloc/internal/extent_mmap.h

@@ -9,9 +9,9 @@
 /******************************************************************************/
 #ifdef JEMALLOC_H_EXTERNS
 
-void	*chunk_alloc_mmap(void *new_addr, size_t size, size_t alignment,
+void	*extent_alloc_mmap(void *new_addr, size_t size, size_t alignment,
     bool *zero, bool *commit);
-bool	chunk_dalloc_mmap(void *chunk, size_t size);
+bool	extent_dalloc_mmap(void *addr, size_t size);
 
 #endif /* JEMALLOC_H_EXTERNS */
 /******************************************************************************/

include/jemalloc/internal/private_symbols.txt

@@ -9,14 +9,6 @@ arena_boot
 arena_choose
 arena_choose_hard
 arena_choose_impl
-arena_chunk_alloc_large
-arena_chunk_cache_alloc
-arena_chunk_cache_dalloc
-arena_chunk_cache_maybe_insert
-arena_chunk_cache_maybe_remove
-arena_chunk_dalloc_large
-arena_chunk_ralloc_large_expand
-arena_chunk_ralloc_large_shrink
 arena_cleanup
 arena_dalloc
 arena_dalloc_bin_junked_locked
@@ -31,6 +23,14 @@ arena_decay_time_get
 arena_decay_time_set
 arena_dss_prec_get
 arena_dss_prec_set
+arena_extent_alloc_large
+arena_extent_cache_alloc
+arena_extent_cache_dalloc
+arena_extent_cache_maybe_insert
+arena_extent_cache_maybe_remove
+arena_extent_dalloc_large
+arena_extent_ralloc_large_expand
+arena_extent_ralloc_large_shrink
 arena_get
 arena_ichoose
 arena_init
@@ -115,30 +115,8 @@ bootstrap_free
 bootstrap_malloc
 bt_init
 buferror
-chunk_alloc_cache
-chunk_alloc_dss
-chunk_alloc_mmap
-chunk_alloc_wrapper
 chunk_boot
-chunk_commit_wrapper
-chunk_dalloc_cache
-chunk_dalloc_mmap
-chunk_dalloc_wrapper
-chunk_decommit_wrapper
-chunk_dss_boot
-chunk_dss_postfork_child
-chunk_dss_postfork_parent
-chunk_dss_prec_get
-chunk_dss_prec_set
-chunk_dss_prefork
-chunk_in_dss
-chunk_merge_wrapper
 chunk_npages
-chunk_postfork_child
-chunk_postfork_parent
-chunk_prefork
-chunk_purge_wrapper
-chunk_split_wrapper
 chunksize
 chunksize_mask
 ckh_count
@@ -167,14 +145,29 @@ extent_addr_get
 extent_addr_randomize
 extent_addr_set
 extent_alloc
+extent_alloc_cache
+extent_alloc_dss
+extent_alloc_mmap
+extent_alloc_wrapper
 extent_arena_get
 extent_arena_set
 extent_base_get
 extent_before_get
 extent_boot
+extent_commit_wrapper
 extent_committed_get
 extent_committed_set
 extent_dalloc
+extent_dalloc_cache
+extent_dalloc_mmap
+extent_dalloc_wrapper
+extent_decommit_wrapper
+extent_dss_boot
+extent_dss_postfork_child
+extent_dss_postfork_parent
+extent_dss_prec_get
+extent_dss_prec_set
+extent_dss_prefork
 extent_heap_empty
 extent_heap_first
 extent_heap_insert
@@ -184,12 +177,18 @@ extent_heap_remove_first
 extent_hooks_default
 extent_hooks_get
 extent_hooks_set
+extent_in_dss
 extent_init
 extent_last_get
 extent_lookup
+extent_merge_wrapper
 extent_past_get
+extent_postfork_child
+extent_postfork_parent
+extent_prefork
 extent_prof_tctx_get
 extent_prof_tctx_set
+extent_purge_wrapper
 extent_retained_get
 extent_ring_insert
 extent_ring_remove
@@ -201,6 +200,7 @@ extent_slab_data_get
 extent_slab_data_get_const
 extent_slab_get
 extent_slab_set
+extent_split_wrapper
 extent_usize_get
 extent_usize_set
 extent_zeroed_get