From e210ccc57ed165cc4308a09a9637f5d6e49b0dbd Mon Sep 17 00:00:00 2001 From: David Goldblatt Date: Mon, 16 Dec 2019 11:05:07 -0800 Subject: [PATCH] Move extent2 -> extent. Eventually, we may fully break off the extent module; but not for some time. If it's going to live on in a non-transitory state, it might as well have the nicer name. --- Makefile.in | 2 +- include/jemalloc/internal/{extent2.h => extent.h} | 11 +++-------- .../jemalloc/internal/jemalloc_internal_inlines_b.h | 2 +- msvc/projects/vc2015/jemalloc/jemalloc.vcxproj | 2 +- msvc/projects/vc2017/jemalloc/jemalloc.vcxproj | 2 +- src/{extent2.c => extent.c} | 0 6 files changed, 7 insertions(+), 12 deletions(-) rename include/jemalloc/internal/{extent2.h => extent.h} (85%) rename src/{extent2.c => extent.c} (100%) diff --git a/Makefile.in b/Makefile.in index 71458487..40ba7f26 100644 --- a/Makefile.in +++ b/Makefile.in @@ -109,7 +109,7 @@ C_SRCS := $(srcroot)src/jemalloc.c \ $(srcroot)src/edata_cache.c \ $(srcroot)src/ehooks.c \ $(srcroot)src/eset.c \ - $(srcroot)src/extent2.c \ + $(srcroot)src/extent.c \ $(srcroot)src/extent_dss.c \ $(srcroot)src/extent_mmap.c \ $(srcroot)src/hash.c \ diff --git a/include/jemalloc/internal/extent2.h b/include/jemalloc/internal/extent.h similarity index 85% rename from include/jemalloc/internal/extent2.h rename to include/jemalloc/internal/extent.h index fff69bb2..8fecee62 100644 --- a/include/jemalloc/internal/extent2.h +++ b/include/jemalloc/internal/extent.h @@ -1,5 +1,5 @@ -#ifndef JEMALLOC_INTERNAL_EXTENT2_H -#define JEMALLOC_INTERNAL_EXTENT2_H +#ifndef JEMALLOC_INTERNAL_EXTENT_H +#define JEMALLOC_INTERNAL_EXTENT_H #include "jemalloc/internal/ecache.h" #include "jemalloc/internal/ehooks.h" @@ -10,11 +10,6 @@ * This module contains the page-level allocator. It chooses the addresses that * allocations requested by other modules will inhabit, and updates the global * metadata to reflect allocation/deallocation/purging decisions. - * - * The naming ("extent2" for the module, and "extent_" or "extents_" for most of - * the functions) is historical. Eventually, the naming should be updated to - * reflect the functionality. Similarly, the utilization stats live here for no - * particular reason. This will also be changed, but much more immediately. */ /* @@ -61,4 +56,4 @@ bool extent_merge_wrapper(tsdn_t *tsdn, ehooks_t *ehooks, bool extent_boot(void); -#endif /* JEMALLOC_INTERNAL_EXTENT2_H */ +#endif /* JEMALLOC_INTERNAL_EXTENT_H */ diff --git a/include/jemalloc/internal/jemalloc_internal_inlines_b.h b/include/jemalloc/internal/jemalloc_internal_inlines_b.h index 8367ee2b..ebfb331b 100644 --- a/include/jemalloc/internal/jemalloc_internal_inlines_b.h +++ b/include/jemalloc/internal/jemalloc_internal_inlines_b.h @@ -1,7 +1,7 @@ #ifndef JEMALLOC_INTERNAL_INLINES_B_H #define JEMALLOC_INTERNAL_INLINES_B_H -#include "jemalloc/internal/extent2.h" +#include "jemalloc/internal/extent.h" #include "jemalloc/internal/rtree.h" /* Choose an arena based on a per-thread value. */ diff --git a/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj b/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj index 7b2e84a9..58790903 100644 --- a/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj +++ b/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj @@ -49,7 +49,7 @@ - + diff --git a/msvc/projects/vc2017/jemalloc/jemalloc.vcxproj b/msvc/projects/vc2017/jemalloc/jemalloc.vcxproj index 338962b3..631de575 100644 --- a/msvc/projects/vc2017/jemalloc/jemalloc.vcxproj +++ b/msvc/projects/vc2017/jemalloc/jemalloc.vcxproj @@ -49,7 +49,7 @@ - + diff --git a/src/extent2.c b/src/extent.c similarity index 100% rename from src/extent2.c rename to src/extent.c