Remove obsolete stats.arenas.<i>.metadata.mapped mallctl.

Rename stats.arenas.<i>.metadata.allocated mallctl to
stats.arenas.<i>.metadata .

4 files changed, 18 insertions, 22 deletions

diff --git a/include/jemalloc/internal/arena.h b/include/jemalloc/internal/arena.h
index bc16975..fc0a755 100644
--- a/include/jemalloc/internal/arena.h
+++ b/include/jemalloc/internal/arena.h
@@ -359,9 +359,9 @@ void	arena_postfork_child(tsdn_t *tsdn, arena_t *arena);
 #ifdef JEMALLOC_H_INLINES
 
 #ifndef JEMALLOC_ENABLE_INLINE
-void	arena_metadata_allocated_add(arena_t *arena, size_t size);
-void	arena_metadata_allocated_sub(arena_t *arena, size_t size);
-size_t	arena_metadata_allocated_get(arena_t *arena);
+void	arena_metadata_add(arena_t *arena, size_t size);
+void	arena_metadata_sub(arena_t *arena, size_t size);
+size_t	arena_metadata_get(arena_t *arena);
 bool	arena_prof_accum_impl(arena_t *arena, uint64_t accumbytes);
 bool	arena_prof_accum_locked(arena_t *arena, uint64_t accumbytes);
 bool	arena_prof_accum(tsdn_t *tsdn, arena_t *arena, uint64_t accumbytes);
@@ -387,24 +387,24 @@ void	arena_sdalloc(tsdn_t *tsdn, extent_t *extent, void *ptr, size_t size,
 #if (defined(JEMALLOC_ENABLE_INLINE) || defined(JEMALLOC_ARENA_C_))
 #  ifdef JEMALLOC_ARENA_INLINE_A
 JEMALLOC_INLINE void
-arena_metadata_allocated_add(arena_t *arena, size_t size)
+arena_metadata_add(arena_t *arena, size_t size)
 {
 
-	atomic_add_z(&arena->stats.metadata_allocated, size);
+	atomic_add_z(&arena->stats.metadata, size);
 }
 
 JEMALLOC_INLINE void
-arena_metadata_allocated_sub(arena_t *arena, size_t size)
+arena_metadata_sub(arena_t *arena, size_t size)
 {
 
-	atomic_sub_z(&arena->stats.metadata_allocated, size);
+	atomic_sub_z(&arena->stats.metadata, size);
 }
 
 JEMALLOC_INLINE size_t
-arena_metadata_allocated_get(arena_t *arena)
+arena_metadata_get(arena_t *arena)
 {
 
-	return (atomic_read_z(&arena->stats.metadata_allocated));
+	return (atomic_read_z(&arena->stats.metadata));
 }
 
 JEMALLOC_INLINE bool
diff --git a/include/jemalloc/internal/jemalloc_internal.h.in b/include/jemalloc/internal/jemalloc_internal.h.in
index 243aae6..176487e 100644
--- a/include/jemalloc/internal/jemalloc_internal.h.in
+++ b/include/jemalloc/internal/jemalloc_internal.h.in
@@ -1006,7 +1006,7 @@ iallocztm(tsdn_t *tsdn, size_t size, szind_t ind, bool zero, tcache_t *tcache,
 
 	ret = arena_malloc(tsdn, arena, size, ind, zero, tcache, slow_path);
 	if (config_stats && is_metadata && likely(ret != NULL)) {
-		arena_metadata_allocated_add(iaalloc(tsdn, ret), isalloc(tsdn,
+		arena_metadata_add(iaalloc(tsdn, ret), isalloc(tsdn,
 		    iealloc(tsdn, ret), ret));
 	}
 	return (ret);
@@ -1034,7 +1034,7 @@ ipallocztm(tsdn_t *tsdn, size_t usize, size_t alignment, bool zero,
 	ret = arena_palloc(tsdn, arena, usize, alignment, zero, tcache);
 	assert(ALIGNMENT_ADDR2BASE(ret, alignment) == ret);
 	if (config_stats && is_metadata && likely(ret != NULL)) {
-		arena_metadata_allocated_add(iaalloc(tsdn, ret), isalloc(tsdn,
+		arena_metadata_add(iaalloc(tsdn, ret), isalloc(tsdn,
 		    iealloc(tsdn, ret), ret));
 	}
 	return (ret);
@@ -1088,8 +1088,8 @@ idalloctm(tsdn_t *tsdn, extent_t *extent, void *ptr, tcache_t *tcache,
 	assert(!is_metadata || tcache == NULL);
 	assert(!is_metadata || iaalloc(tsdn, ptr)->ind < narenas_auto);
 	if (config_stats && is_metadata) {
-		arena_metadata_allocated_sub(iaalloc(tsdn, ptr), isalloc(tsdn,
-		    extent, ptr));
+		arena_metadata_sub(iaalloc(tsdn, ptr), isalloc(tsdn, extent,
+		    ptr));
 	}
 
 	arena_dalloc(tsdn, extent, ptr, tcache, slow_path);
diff --git a/include/jemalloc/internal/private_symbols.txt b/include/jemalloc/internal/private_symbols.txt
index a2f093e..be81d74 100644
--- a/include/jemalloc/internal/private_symbols.txt
+++ b/include/jemalloc/internal/private_symbols.txt
@@ -41,9 +41,9 @@ arena_lg_dirty_mult_set
 arena_malloc
 arena_malloc_hard
 arena_maybe_purge
-arena_metadata_allocated_add
-arena_metadata_allocated_get
-arena_metadata_allocated_sub
+arena_metadata_add
+arena_metadata_get
+arena_metadata_sub
 arena_migrate
 arena_new
 arena_nthreads_dec
diff --git a/include/jemalloc/internal/stats.h b/include/jemalloc/internal/stats.h
index 7bba57a..d5eea8e 100644
--- a/include/jemalloc/internal/stats.h
+++ b/include/jemalloc/internal/stats.h
@@ -101,12 +101,8 @@ struct arena_stats_s {
 	uint64_t	nmadvise;
 	uint64_t	purged;
 
-	/*
-	 * Number of bytes currently mapped purely for metadata purposes, and
-	 * number of bytes currently allocated for internal metadata.
-	 */
-	size_t		metadata_mapped;
-	size_t		metadata_allocated; /* Protected via atomic_*_z(). */
+	/* Number of bytes currently allocated for internal metadata. */
+	size_t		metadata; /* Protected via atomic_*_z(). */
 
 	size_t		allocated_large;
 	uint64_t	nmalloc_large;