From 98774e64a4696c7bce6d2317aa59fe5b39bba69f Mon Sep 17 00:00:00 2001
From: David Goldblatt <davidgoldblatt@fb.com>
Date: Tue, 23 May 2017 14:42:32 -0700
Subject: [PATCH] Header refactoring: unify and de-catchall extent_mmap module.

---
 .../internal/{extent_mmap_externs.h => extent_mmap.h}       | 6 +++---
 include/jemalloc/internal/jemalloc_internal_includes.h      | 1 -
 src/arena.c                                                 | 1 +
 src/base.c                                                  | 1 +
 src/ctl.c                                                   | 1 +
 src/extent.c                                                | 1 +
 src/extent_mmap.c                                           | 1 +
 src/jemalloc.c                                              | 1 +
 src/large.c                                                 | 1 +
 test/unit/arena_reset.c                                     | 1 +
 10 files changed, 11 insertions(+), 4 deletions(-)
 rename include/jemalloc/internal/{extent_mmap_externs.h => extent_mmap.h} (57%)

diff --git a/include/jemalloc/internal/extent_mmap_externs.h b/include/jemalloc/internal/extent_mmap.h
similarity index 57%
rename from include/jemalloc/internal/extent_mmap_externs.h
rename to include/jemalloc/internal/extent_mmap.h
index fe9a79ac..55f17ee4 100644
--- a/include/jemalloc/internal/extent_mmap_externs.h
+++ b/include/jemalloc/internal/extent_mmap.h
@@ -1,10 +1,10 @@
 #ifndef JEMALLOC_INTERNAL_EXTENT_MMAP_EXTERNS_H
 #define JEMALLOC_INTERNAL_EXTENT_MMAP_EXTERNS_H
 
-extern bool	opt_retain;
+extern bool opt_retain;
 
-void	*extent_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	extent_dalloc_mmap(void *addr, size_t size);
+bool extent_dalloc_mmap(void *addr, size_t size);
 
 #endif /* JEMALLOC_INTERNAL_EXTENT_MMAP_EXTERNS_H */
diff --git a/include/jemalloc/internal/jemalloc_internal_includes.h b/include/jemalloc/internal/jemalloc_internal_includes.h
index 71c856b2..837e9e41 100644
--- a/include/jemalloc/internal/jemalloc_internal_includes.h
+++ b/include/jemalloc/internal/jemalloc_internal_includes.h
@@ -65,7 +65,6 @@
 
 #include "jemalloc/internal/jemalloc_internal_externs.h"
 #include "jemalloc/internal/extent_externs.h"
-#include "jemalloc/internal/extent_mmap_externs.h"
 #include "jemalloc/internal/base_externs.h"
 #include "jemalloc/internal/arena_externs.h"
 #include "jemalloc/internal/large_externs.h"
diff --git a/src/arena.c b/src/arena.c
index 01358959..bf1d6e65 100644
--- a/src/arena.c
+++ b/src/arena.c
@@ -4,6 +4,7 @@
 
 #include "jemalloc/internal/assert.h"
 #include "jemalloc/internal/extent_dss.h"
+#include "jemalloc/internal/extent_mmap.h"
 #include "jemalloc/internal/mutex.h"
 #include "jemalloc/internal/rtree.h"
 #include "jemalloc/internal/size_classes.h"
diff --git a/src/base.c b/src/base.c
index 892c28dd..498e5c9d 100644
--- a/src/base.c
+++ b/src/base.c
@@ -3,6 +3,7 @@
 #include "jemalloc/internal/jemalloc_internal_includes.h"
 
 #include "jemalloc/internal/assert.h"
+#include "jemalloc/internal/extent_mmap.h"
 #include "jemalloc/internal/mutex.h"
 
 /******************************************************************************/
diff --git a/src/ctl.c b/src/ctl.c
index e81ca417..33275d70 100644
--- a/src/ctl.c
+++ b/src/ctl.c
@@ -5,6 +5,7 @@
 #include "jemalloc/internal/assert.h"
 #include "jemalloc/internal/ctl.h"
 #include "jemalloc/internal/extent_dss.h"
+#include "jemalloc/internal/extent_mmap.h"
 #include "jemalloc/internal/mutex.h"
 #include "jemalloc/internal/nstime.h"
 #include "jemalloc/internal/size_classes.h"
diff --git a/src/extent.c b/src/extent.c
index 0929aee4..6589de55 100644
--- a/src/extent.c
+++ b/src/extent.c
@@ -4,6 +4,7 @@
 
 #include "jemalloc/internal/assert.h"
 #include "jemalloc/internal/extent_dss.h"
+#include "jemalloc/internal/extent_mmap.h"
 #include "jemalloc/internal/ph.h"
 #include "jemalloc/internal/rtree.h"
 #include "jemalloc/internal/mutex.h"
diff --git a/src/extent_mmap.c b/src/extent_mmap.c
index 3e4e1ef7..8d607dc8 100644
--- a/src/extent_mmap.c
+++ b/src/extent_mmap.c
@@ -3,6 +3,7 @@
 #include "jemalloc/internal/jemalloc_internal_includes.h"
 
 #include "jemalloc/internal/assert.h"
+#include "jemalloc/internal/extent_mmap.h"
 
 /******************************************************************************/
 /* Data. */
diff --git a/src/jemalloc.c b/src/jemalloc.c
index 32f4a4c5..1befb64d 100644
--- a/src/jemalloc.c
+++ b/src/jemalloc.c
@@ -6,6 +6,7 @@
 #include "jemalloc/internal/atomic.h"
 #include "jemalloc/internal/ctl.h"
 #include "jemalloc/internal/extent_dss.h"
+#include "jemalloc/internal/extent_mmap.h"
 #include "jemalloc/internal/jemalloc_internal_types.h"
 #include "jemalloc/internal/malloc_io.h"
 #include "jemalloc/internal/mutex.h"
diff --git a/src/large.c b/src/large.c
index 27c9bc60..79d2c9da 100644
--- a/src/large.c
+++ b/src/large.c
@@ -3,6 +3,7 @@
 #include "jemalloc/internal/jemalloc_internal_includes.h"
 
 #include "jemalloc/internal/assert.h"
+#include "jemalloc/internal/extent_mmap.h"
 #include "jemalloc/internal/mutex.h"
 #include "jemalloc/internal/rtree.h"
 #include "jemalloc/internal/util.h"
diff --git a/test/unit/arena_reset.c b/test/unit/arena_reset.c
index 678ae57c..958453d1 100644
--- a/test/unit/arena_reset.c
+++ b/test/unit/arena_reset.c
@@ -2,6 +2,7 @@
 #include "test/jemalloc_test.h"
 #endif
 
+#include "jemalloc/internal/extent_mmap.h"
 #include "jemalloc/internal/rtree.h"
 
 #include "test/extent_hooks.h"