Header refactoring: Split up jemalloc_internal.h

This is a biggy.  jemalloc_internal.h has been doing multiple jobs for a while
now:
- The source of system-wide definitions.
- The catch-all include file.
- The module header file for jemalloc.c

This commit splits up this functionality.  The system-wide definitions
responsibility has moved to jemalloc_preamble.h.  The catch-all include file is
now jemalloc_internal_includes.h.  The module headers for jemalloc.c are now in
jemalloc_internal_[externs|inlines|types].h, just as they are for the other
modules.

27 files changed, 56 insertions, 27 deletions

diff --git a/src/arena.c b/src/arena.c
index 198c6e49..5d313e32 100644
--- a/src/arena.c
+++ b/src/arena.c
@@ -1,5 +1,6 @@
 #define JEMALLOC_ARENA_C_
-#include "jemalloc/internal/jemalloc_internal.h"
+#include "jemalloc/internal/jemalloc_preamble.h"
+#include "jemalloc/internal/jemalloc_internal_includes.h"
 
 /******************************************************************************/
 /* Data. */
diff --git a/src/base.c b/src/base.c
index 4275259e..eb68a175 100644
--- a/src/base.c
+++ b/src/base.c
@@ -1,5 +1,6 @@
 #define JEMALLOC_BASE_C_
-#include "jemalloc/internal/jemalloc_internal.h"
+#include "jemalloc/internal/jemalloc_preamble.h"
+#include "jemalloc/internal/jemalloc_internal_includes.h"
 
 /******************************************************************************/
 /* Data. */
diff --git a/src/bitmap.c b/src/bitmap.c
index a629aca6..2eb50f1b 100644
--- a/src/bitmap.c
+++ b/src/bitmap.c
@@ -1,5 +1,6 @@
 #define JEMALLOC_BITMAP_C_
-#include "jemalloc/internal/jemalloc_internal.h"
+#include "jemalloc/internal/jemalloc_preamble.h"
+#include "jemalloc/internal/jemalloc_internal_includes.h"
 
 /******************************************************************************/
 
diff --git a/src/ckh.c b/src/ckh.c
index 03262ef5..a359a5cc 100644
--- a/src/ckh.c
+++ b/src/ckh.c
@@ -35,7 +35,8 @@
  *
  ******************************************************************************/
 #define JEMALLOC_CKH_C_
-#include "jemalloc/internal/jemalloc_internal.h"
+#include "jemalloc/internal/jemalloc_preamble.h"
+#include "jemalloc/internal/jemalloc_internal_includes.h"
 
 /******************************************************************************/
 /* Function prototypes for non-inline static functions. */
diff --git a/src/ctl.c b/src/ctl.c
index a59a741f..6d6fadc7 100644
--- a/src/ctl.c
+++ b/src/ctl.c
@@ -1,5 +1,6 @@
 #define JEMALLOC_CTL_C_
-#include "jemalloc/internal/jemalloc_internal.h"
+#include "jemalloc/internal/jemalloc_preamble.h"
+#include "jemalloc/internal/jemalloc_internal_includes.h"
 
 /******************************************************************************/
 /* Data. */
diff --git a/src/extent.c b/src/extent.c
index b6c3f4b4..2344e9cd 100644
--- a/src/extent.c
+++ b/src/extent.c
@@ -1,8 +1,10 @@
 #define JEMALLOC_EXTENT_C_
-#include "jemalloc/internal/jemalloc_internal.h"
+#include "jemalloc/internal/jemalloc_preamble.h"
 
 #include "jemalloc/internal/ph.h"
 
+#include "jemalloc/internal/jemalloc_internal_includes.h"
+
 /******************************************************************************/
 /* Data. */
 
diff --git a/src/extent_dss.c b/src/extent_dss.c
index 99919090..c609f14c 100644
--- a/src/extent_dss.c
+++ b/src/extent_dss.c
@@ -1,5 +1,7 @@
 #define JEMALLOC_EXTENT_DSS_C_
-#include "jemalloc/internal/jemalloc_internal.h"
+#include "jemalloc/internal/jemalloc_preamble.h"
+#include "jemalloc/internal/jemalloc_internal_includes.h"
+
 /******************************************************************************/
 /* Data. */
 
diff --git a/src/extent_mmap.c b/src/extent_mmap.c
index 7265159a..5717573e 100644
--- a/src/extent_mmap.c
+++ b/src/extent_mmap.c
@@ -1,5 +1,6 @@
 #define JEMALLOC_EXTENT_MMAP_C_
-#include "jemalloc/internal/jemalloc_internal.h"
+#include "jemalloc/internal/jemalloc_preamble.h"
+#include "jemalloc/internal/jemalloc_internal_includes.h"
 
 /******************************************************************************/
 
diff --git a/src/hash.c b/src/hash.c
index ffd4f2be..7b2bdc2b 100644
--- a/src/hash.c
+++ b/src/hash.c
@@ -1,2 +1,3 @@
 #define JEMALLOC_HASH_C_
-#include "jemalloc/internal/jemalloc_internal.h"
+#include "jemalloc/internal/jemalloc_preamble.h"
+#include "jemalloc/internal/jemalloc_internal_includes.h"
diff --git a/src/hooks.c b/src/hooks.c
index c32471e9..6266ecd4 100644
--- a/src/hooks.c
+++ b/src/hooks.c
@@ -1,4 +1,4 @@
-#include "jemalloc/internal/jemalloc_internal.h"
+#include "jemalloc/internal/jemalloc_preamble.h"
 
 /*
  * The hooks are a little bit screwy -- they're not genuinely exported in the
diff --git a/src/jemalloc.c b/src/jemalloc.c
index bc659325..27f9711c 100644
--- a/src/jemalloc.c
+++ b/src/jemalloc.c
@@ -1,5 +1,6 @@
 #define JEMALLOC_C_
-#include "jemalloc/internal/jemalloc_internal.h"
+#include "jemalloc/internal/jemalloc_preamble.h"
+#include "jemalloc/internal/jemalloc_internal_includes.h"
 
 /******************************************************************************/
 /* Data. */
diff --git a/src/jemalloc_cpp.cpp b/src/jemalloc_cpp.cpp
index 9692b5ba..b6d7c9a5 100644
--- a/src/jemalloc_cpp.cpp
+++ b/src/jemalloc_cpp.cpp
@@ -2,7 +2,8 @@
 #include <new>
 
 #define JEMALLOC_CPP_CPP_
-#include "jemalloc/internal/jemalloc_internal.h"
+#include "jemalloc/internal/jemalloc_preamble.h"
+#include "jemalloc/internal/jemalloc_internal_includes.h"
 
 // All operators in this file are exported.
 
diff --git a/src/large.c b/src/large.c
index 3f96c521..18987c1a 100644
--- a/src/large.c
+++ b/src/large.c
@@ -1,5 +1,6 @@
 #define JEMALLOC_LARGE_C_
-#include "jemalloc/internal/jemalloc_internal.h"
+#include "jemalloc/internal/jemalloc_preamble.h"
+#include "jemalloc/internal/jemalloc_internal_includes.h"
 
 /******************************************************************************/
 
diff --git a/src/malloc_io.c b/src/malloc_io.c
index fd6ff0f0..98ef7a65 100644
--- a/src/malloc_io.c
+++ b/src/malloc_io.c
@@ -1,5 +1,6 @@
 #define JEMALLOC_MALLOC_IO_C_
-#include "jemalloc/internal/jemalloc_internal.h"
+#include "jemalloc/internal/jemalloc_preamble.h"
+#include "jemalloc/internal/jemalloc_internal_includes.h"
 
 #ifdef assert
 #  undef assert
diff --git a/src/mutex.c b/src/mutex.c
index 8c593101..26af5239 100644
--- a/src/mutex.c
+++ b/src/mutex.c
@@ -1,5 +1,6 @@
 #define JEMALLOC_MUTEX_C_
-#include "jemalloc/internal/jemalloc_internal.h"
+#include "jemalloc/internal/jemalloc_preamble.h"
+#include "jemalloc/internal/jemalloc_internal_includes.h"
 
 #if defined(JEMALLOC_LAZY_LOCK) && !defined(_WIN32)
 #include <dlfcn.h>
diff --git a/src/nstime.c b/src/nstime.c
index 70b2f9d8..ee8d78e7 100644
--- a/src/nstime.c
+++ b/src/nstime.c
@@ -1,4 +1,5 @@
-#include "jemalloc/internal/jemalloc_internal.h"
+#include "jemalloc/internal/jemalloc_preamble.h"
+#include "jemalloc/internal/jemalloc_internal_includes.h"
 
 #define BILLION	UINT64_C(1000000000)
 #define MILLION	UINT64_C(1000000)
diff --git a/src/pages.c b/src/pages.c
index fa986ba6..53ca653b 100644
--- a/src/pages.c
+++ b/src/pages.c
@@ -1,5 +1,6 @@
 #define JEMALLOC_PAGES_C_
-#include "jemalloc/internal/jemalloc_internal.h"
+#include "jemalloc/internal/jemalloc_preamble.h"
+#include "jemalloc/internal/jemalloc_internal_includes.h"
 
 #ifdef JEMALLOC_SYSCTL_VM_OVERCOMMIT
 #include <sys/sysctl.h>
diff --git a/src/prng.c b/src/prng.c
index bf908790..83c04bf9 100644
--- a/src/prng.c
+++ b/src/prng.c
@@ -1,2 +1,3 @@
 #define JEMALLOC_PRNG_C_
-#include "jemalloc/internal/jemalloc_internal.h"
+#include "jemalloc/internal/jemalloc_preamble.h"
+#include "jemalloc/internal/jemalloc_internal_includes.h"
diff --git a/src/prof.c b/src/prof.c
index 40610d71..1844c2f3 100644
--- a/src/prof.c
+++ b/src/prof.c
@@ -1,5 +1,7 @@
 #define JEMALLOC_PROF_C_
-#include "jemalloc/internal/jemalloc_internal.h"
+#include "jemalloc/internal/jemalloc_preamble.h"
+#include "jemalloc/internal/jemalloc_internal_includes.h"
+
 /******************************************************************************/
 
 #ifdef JEMALLOC_PROF_LIBUNWIND
diff --git a/src/rtree.c b/src/rtree.c
index de4990bd..051428f1 100644
--- a/src/rtree.c
+++ b/src/rtree.c
@@ -1,5 +1,6 @@
 #define JEMALLOC_RTREE_C_
-#include "jemalloc/internal/jemalloc_internal.h"
+#include "jemalloc/internal/jemalloc_preamble.h"
+#include "jemalloc/internal/jemalloc_internal_includes.h"
 
 /*
  * Only the most significant bits of keys passed to rtree_{read,write}() are
diff --git a/src/spin.c b/src/spin.c
index d7eb5fa8..d2d39419 100644
--- a/src/spin.c
+++ b/src/spin.c
@@ -1,2 +1,3 @@
 #define JEMALLOC_SPIN_C_
-#include "jemalloc/internal/jemalloc_internal.h"
+#include "jemalloc/internal/jemalloc_preamble.h"
+#include "jemalloc/internal/jemalloc_internal_includes.h"
diff --git a/src/stats.c b/src/stats.c
index aa7ca507..110d62f7 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -1,5 +1,6 @@
 #define JEMALLOC_STATS_C_
-#include "jemalloc/internal/jemalloc_internal.h"
+#include "jemalloc/internal/jemalloc_preamble.h"
+#include "jemalloc/internal/jemalloc_internal_includes.h"
 
 const char *global_mutex_names[num_global_prof_mutexes] = {
 #define OP(mtx) #mtx,
diff --git a/src/tcache.c b/src/tcache.c
index 09776e1a..99749fbc 100644
--- a/src/tcache.c
+++ b/src/tcache.c
@@ -1,5 +1,6 @@
 #define JEMALLOC_TCACHE_C_
-#include "jemalloc/internal/jemalloc_internal.h"
+#include "jemalloc/internal/jemalloc_preamble.h"
+#include "jemalloc/internal/jemalloc_internal_includes.h"
 
 /******************************************************************************/
 /* Data. */
diff --git a/src/ticker.c b/src/ticker.c
index b0149e1c..d7b8cd26 100644
--- a/src/ticker.c
+++ b/src/ticker.c
@@ -1,2 +1,3 @@
 #define JEMALLOC_TICKER_C_
-#include "jemalloc/internal/jemalloc_internal.h"
+#include "jemalloc/internal/jemalloc_preamble.h"
+#include "jemalloc/internal/jemalloc_internal_includes.h"
diff --git a/src/tsd.c b/src/tsd.c
index 0d5de8ea..3e72548c 100644
--- a/src/tsd.c
+++ b/src/tsd.c
@@ -1,5 +1,6 @@
 #define JEMALLOC_TSD_C_
-#include "jemalloc/internal/jemalloc_internal.h"
+#include "jemalloc/internal/jemalloc_preamble.h"
+#include "jemalloc/internal/jemalloc_internal_includes.h"
 
 /******************************************************************************/
 /* Data. */
diff --git a/src/witness.c b/src/witness.c
index cbffaeaa..26b16e77 100644
--- a/src/witness.c
+++ b/src/witness.c
@@ -1,5 +1,6 @@
 #define JEMALLOC_WITNESS_C_
-#include "jemalloc/internal/jemalloc_internal.h"
+#include "jemalloc/internal/jemalloc_preamble.h"
+#include "jemalloc/internal/jemalloc_internal_includes.h"
 
 void
 witness_init(witness_t *witness, const char *name, witness_rank_t rank,
diff --git a/src/zone.c b/src/zone.c
index e69f0b4a..a8a571fd 100644
--- a/src/zone.c
+++ b/src/zone.c
@@ -1,4 +1,5 @@
-#include "jemalloc/internal/jemalloc_internal.h"
+#include "jemalloc/internal/jemalloc_preamble.h"
+#include "jemalloc/internal/jemalloc_internal_includes.h"
 #ifndef JEMALLOC_ZONE
 #  error "This source file is for zones on Darwin (OS X)."
 #endif