From 93284bb53d9c44a5c36297450a82aed5b8051526 Mon Sep 17 00:00:00 2001
From: David Goldblatt <davidgoldblatt@fb.com>
Date: Tue, 23 May 2017 14:36:09 -0700
Subject: [PATCH] Header refactoring: unify and de-catchall extent_dss.

---
 include/jemalloc/internal/arena_externs.h     |  1 +
 include/jemalloc/internal/arena_structs_b.h   |  1 +
 include/jemalloc/internal/extent_dss.h        | 26 +++++++++++++++++++
 .../jemalloc/internal/extent_dss_externs.h    | 14 ----------
 .../jemalloc/internal/extent_dss_structs.h    |  6 -----
 include/jemalloc/internal/extent_dss_types.h  | 14 ----------
 .../internal/jemalloc_internal_includes.h     |  3 ---
 src/arena.c                                   |  1 +
 src/ctl.c                                     |  1 +
 src/extent.c                                  |  1 +
 src/extent_dss.c                              |  1 +
 src/jemalloc.c                                |  1 +
 12 files changed, 33 insertions(+), 37 deletions(-)
 create mode 100644 include/jemalloc/internal/extent_dss.h
 delete mode 100644 include/jemalloc/internal/extent_dss_externs.h
 delete mode 100644 include/jemalloc/internal/extent_dss_structs.h
 delete mode 100644 include/jemalloc/internal/extent_dss_types.h

diff --git a/include/jemalloc/internal/arena_externs.h b/include/jemalloc/internal/arena_externs.h
index 273705f7..08a6d174 100644
--- a/include/jemalloc/internal/arena_externs.h
+++ b/include/jemalloc/internal/arena_externs.h
@@ -1,6 +1,7 @@
 #ifndef JEMALLOC_INTERNAL_ARENA_EXTERNS_H
 #define JEMALLOC_INTERNAL_ARENA_EXTERNS_H
 
+#include "jemalloc/internal/extent_dss.h"
 #include "jemalloc/internal/pages.h"
 #include "jemalloc/internal/size_classes.h"
 #include "jemalloc/internal/stats.h"
diff --git a/include/jemalloc/internal/arena_structs_b.h b/include/jemalloc/internal/arena_structs_b.h
index 160ac4fa..d1fffec1 100644
--- a/include/jemalloc/internal/arena_structs_b.h
+++ b/include/jemalloc/internal/arena_structs_b.h
@@ -3,6 +3,7 @@
 
 #include "jemalloc/internal/atomic.h"
 #include "jemalloc/internal/bitmap.h"
+#include "jemalloc/internal/extent_dss.h"
 #include "jemalloc/internal/jemalloc_internal_types.h"
 #include "jemalloc/internal/mutex.h"
 #include "jemalloc/internal/nstime.h"
diff --git a/include/jemalloc/internal/extent_dss.h b/include/jemalloc/internal/extent_dss.h
new file mode 100644
index 00000000..e8f02ce2
--- /dev/null
+++ b/include/jemalloc/internal/extent_dss.h
@@ -0,0 +1,26 @@
+#ifndef JEMALLOC_INTERNAL_EXTENT_DSS_H
+#define JEMALLOC_INTERNAL_EXTENT_DSS_H
+
+typedef enum {
+	dss_prec_disabled  = 0,
+	dss_prec_primary   = 1,
+	dss_prec_secondary = 2,
+
+	dss_prec_limit     = 3
+} dss_prec_t;
+#define DSS_PREC_DEFAULT dss_prec_secondary
+#define DSS_DEFAULT "secondary"
+
+extern const char *dss_prec_names[];
+
+extern const char *opt_dss;
+
+dss_prec_t extent_dss_prec_get(void);
+bool extent_dss_prec_set(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 extent_in_dss(void *addr);
+bool extent_dss_mergeable(void *addr_a, void *addr_b);
+void extent_dss_boot(void);
+
+#endif /* JEMALLOC_INTERNAL_EXTENT_DSS_H */
diff --git a/include/jemalloc/internal/extent_dss_externs.h b/include/jemalloc/internal/extent_dss_externs.h
deleted file mode 100644
index d376fa74..00000000
--- a/include/jemalloc/internal/extent_dss_externs.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef JEMALLOC_INTERNAL_EXTENT_DSS_EXTERNS_H
-#define JEMALLOC_INTERNAL_EXTENT_DSS_EXTERNS_H
-
-extern const char	*opt_dss;
-
-dss_prec_t	extent_dss_prec_get(void);
-bool	extent_dss_prec_set(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	extent_in_dss(void *addr);
-bool	extent_dss_mergeable(void *addr_a, void *addr_b);
-void	extent_dss_boot(void);
-
-#endif /* JEMALLOC_INTERNAL_EXTENT_DSS_EXTERNS_H */
diff --git a/include/jemalloc/internal/extent_dss_structs.h b/include/jemalloc/internal/extent_dss_structs.h
deleted file mode 100644
index 2d8c6f05..00000000
--- a/include/jemalloc/internal/extent_dss_structs.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef JEMALLOC_INTERNAL_EXTENT_DSS_STRUCTS_H
-#define JEMALLOC_INTERNAL_EXTENT_DSS_STRUCTS_H
-
-extern const char *dss_prec_names[];
-
-#endif /* JEMALLOC_INTERNAL_EXTENT_DSS_STRUCTS_H */
diff --git a/include/jemalloc/internal/extent_dss_types.h b/include/jemalloc/internal/extent_dss_types.h
deleted file mode 100644
index a851c7cb..00000000
--- a/include/jemalloc/internal/extent_dss_types.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef JEMALLOC_INTERNAL_EXTENT_DSS_TYPES_H
-#define JEMALLOC_INTERNAL_EXTENT_DSS_TYPES_H
-
-typedef enum {
-	dss_prec_disabled  = 0,
-	dss_prec_primary   = 1,
-	dss_prec_secondary = 2,
-
-	dss_prec_limit     = 3
-} dss_prec_t;
-#define DSS_PREC_DEFAULT	dss_prec_secondary
-#define DSS_DEFAULT		"secondary"
-
-#endif /* JEMALLOC_INTERNAL_EXTENT_DSS_TYPES_H */
diff --git a/include/jemalloc/internal/jemalloc_internal_includes.h b/include/jemalloc/internal/jemalloc_internal_includes.h
index 770bcaab..71c856b2 100644
--- a/include/jemalloc/internal/jemalloc_internal_includes.h
+++ b/include/jemalloc/internal/jemalloc_internal_includes.h
@@ -41,7 +41,6 @@
 /******************************************************************************/
 
 #include "jemalloc/internal/extent_types.h"
-#include "jemalloc/internal/extent_dss_types.h"
 #include "jemalloc/internal/base_types.h"
 #include "jemalloc/internal/arena_types.h"
 #include "jemalloc/internal/tcache_types.h"
@@ -54,7 +53,6 @@
 #include "jemalloc/internal/mutex_pool_structs.h"
 #include "jemalloc/internal/arena_structs_a.h"
 #include "jemalloc/internal/extent_structs.h"
-#include "jemalloc/internal/extent_dss_structs.h"
 #include "jemalloc/internal/base_structs.h"
 #include "jemalloc/internal/prof_structs.h"
 #include "jemalloc/internal/arena_structs_b.h"
@@ -67,7 +65,6 @@
 
 #include "jemalloc/internal/jemalloc_internal_externs.h"
 #include "jemalloc/internal/extent_externs.h"
-#include "jemalloc/internal/extent_dss_externs.h"
 #include "jemalloc/internal/extent_mmap_externs.h"
 #include "jemalloc/internal/base_externs.h"
 #include "jemalloc/internal/arena_externs.h"
diff --git a/src/arena.c b/src/arena.c
index 3d0725f4..01358959 100644
--- a/src/arena.c
+++ b/src/arena.c
@@ -3,6 +3,7 @@
 #include "jemalloc/internal/jemalloc_internal_includes.h"
 
 #include "jemalloc/internal/assert.h"
+#include "jemalloc/internal/extent_dss.h"
 #include "jemalloc/internal/mutex.h"
 #include "jemalloc/internal/rtree.h"
 #include "jemalloc/internal/size_classes.h"
diff --git a/src/ctl.c b/src/ctl.c
index e3337e8a..e81ca417 100644
--- a/src/ctl.c
+++ b/src/ctl.c
@@ -4,6 +4,7 @@
 
 #include "jemalloc/internal/assert.h"
 #include "jemalloc/internal/ctl.h"
+#include "jemalloc/internal/extent_dss.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 2264a0ca..0929aee4 100644
--- a/src/extent.c
+++ b/src/extent.c
@@ -3,6 +3,7 @@
 #include "jemalloc/internal/jemalloc_internal_includes.h"
 
 #include "jemalloc/internal/assert.h"
+#include "jemalloc/internal/extent_dss.h"
 #include "jemalloc/internal/ph.h"
 #include "jemalloc/internal/rtree.h"
 #include "jemalloc/internal/mutex.h"
diff --git a/src/extent_dss.c b/src/extent_dss.c
index 8e0ca654..e72da958 100644
--- a/src/extent_dss.c
+++ b/src/extent_dss.c
@@ -3,6 +3,7 @@
 #include "jemalloc/internal/jemalloc_internal_includes.h"
 
 #include "jemalloc/internal/assert.h"
+#include "jemalloc/internal/extent_dss.h"
 #include "jemalloc/internal/spin.h"
 
 /******************************************************************************/
diff --git a/src/jemalloc.c b/src/jemalloc.c
index 00b645f0..32f4a4c5 100644
--- a/src/jemalloc.c
+++ b/src/jemalloc.c
@@ -5,6 +5,7 @@
 #include "jemalloc/internal/assert.h"
 #include "jemalloc/internal/atomic.h"
 #include "jemalloc/internal/ctl.h"
+#include "jemalloc/internal/extent_dss.h"
 #include "jemalloc/internal/jemalloc_internal_types.h"
 #include "jemalloc/internal/malloc_io.h"
 #include "jemalloc/internal/mutex.h"