From a936fbd8818cf85f7e0c579cf1c28c395b8fd357 Mon Sep 17 00:00:00 2001
From: Yedidya Feldblum <yfeldblum@fb.com>
Date: Wed, 18 Oct 2017 14:18:47 -0700
Subject: [PATCH] Move folly/MallctlHelper.h to folly/memory/

Summary: [Folly] Move `folly/MallctlHelper.h` to `folly/memory/`.

Reviewed By: aary

Differential Revision: D6087216

fbshipit-source-id: 4e0fa4aea976e2578127d3c340e0e9b559a224ca
---
 folly/Makefile.am                             | 4 ++--
 folly/detail/MemoryIdler.cpp                  | 2 +-
 folly/{ => memory}/MallctlHelper.cpp          | 2 +-
 folly/{ => memory}/MallctlHelper.h            | 0
 folly/{ => memory}/test/MallctlHelperTest.cpp | 2 +-
 folly/test/Makefile.am                        | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename folly/{ => memory}/MallctlHelper.cpp (95%)
 rename folly/{ => memory}/MallctlHelper.h (100%)
 rename folly/{ => memory}/test/MallctlHelperTest.cpp (98%)

diff --git a/folly/Makefile.am b/folly/Makefile.am
index e91dba2d..bb2d3e14 100644
--- a/folly/Makefile.am
+++ b/folly/Makefile.am
@@ -326,12 +326,12 @@ nobase_follyinclude_HEADERS = \
 	LockTraitsBoost.h \
 	Logging.h \
 	MacAddress.h \
-	MallctlHelper.h \
 	Malloc.h \
 	MapUtil.h \
 	Math.h \
 	Memory.h \
 	MemoryMapping.h \
+	memory/MallctlHelper.h \
 	memory/UninitializedMemoryHacks.h \
 	MicroSpinLock.h \
 	MicroLock.h \
@@ -482,7 +482,7 @@ libfollybase_la_SOURCES = \
 	Format.cpp \
 	FormatArg.cpp \
 	FormatTables.cpp \
-	MallctlHelper.cpp \
+	memory/MallctlHelper.cpp \
 	portability/BitsFunctexcept.cpp \
 	String.cpp \
 	Unicode.cpp
diff --git a/folly/detail/MemoryIdler.cpp b/folly/detail/MemoryIdler.cpp
index 70c4c055..0171939c 100644
--- a/folly/detail/MemoryIdler.cpp
+++ b/folly/detail/MemoryIdler.cpp
@@ -17,11 +17,11 @@
 #include <folly/detail/MemoryIdler.h>
 
 #include <folly/Logging.h>
-#include <folly/MallctlHelper.h>
 #include <folly/Malloc.h>
 #include <folly/Portability.h>
 #include <folly/ScopeGuard.h>
 #include <folly/concurrency/CacheLocality.h>
+#include <folly/memory/MallctlHelper.h>
 #include <folly/portability/PThread.h>
 #include <folly/portability/SysMman.h>
 #include <folly/portability/Unistd.h>
diff --git a/folly/MallctlHelper.cpp b/folly/memory/MallctlHelper.cpp
similarity index 95%
rename from folly/MallctlHelper.cpp
rename to folly/memory/MallctlHelper.cpp
index 32b7277d..6593992d 100644
--- a/folly/MallctlHelper.cpp
+++ b/folly/memory/MallctlHelper.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <folly/MallctlHelper.h>
+#include <folly/memory/MallctlHelper.h>
 #include <folly/Format.h>
 #include <folly/String.h>
 
diff --git a/folly/MallctlHelper.h b/folly/memory/MallctlHelper.h
similarity index 100%
rename from folly/MallctlHelper.h
rename to folly/memory/MallctlHelper.h
diff --git a/folly/test/MallctlHelperTest.cpp b/folly/memory/test/MallctlHelperTest.cpp
similarity index 98%
rename from folly/test/MallctlHelperTest.cpp
rename to folly/memory/test/MallctlHelperTest.cpp
index e2f26954..e2d3c2a7 100644
--- a/folly/test/MallctlHelperTest.cpp
+++ b/folly/memory/test/MallctlHelperTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <folly/MallctlHelper.h>
+#include <folly/memory/MallctlHelper.h>
 #include <folly/Malloc.h>
 #include <folly/init/Init.h>
 #include <folly/portability/GTest.h>
diff --git a/folly/test/Makefile.am b/folly/test/Makefile.am
index eeada6eb..a2f58830 100644
--- a/folly/test/Makefile.am
+++ b/folly/test/Makefile.am
@@ -329,7 +329,7 @@ ssl_test_SOURCES = \
 ssl_test_LDADD = libfollytestmain.la -lcrypto
 TESTS += ssl_test
 
-mallctl_helper_test_SOURCES = MallctlHelperTest.cpp
+mallctl_helper_test_SOURCES = ../memory/test/MallctlHelperTest.cpp
 mallctl_helper_test_LDADD = libfollytestmain.la
 TESTS += mallctl_helper_test
 
-- 
2.34.1