Rename folly/detail/Malloc.h to folly/detail/MallocImpl.h

Summary: This makes the name of the header match the source file.

Reviewed By: yfeldblum

Differential Revision: D5186193

fbshipit-source-id: b1f9041fb730eacb91ad167e500c25df8f8ba947

diff --git a/folly/Makefile.am b/folly/Makefile.am
index 1b926cbac3885135f44e9a2275165bdb911c9801..8a15e9a49cd9932c6641441cc17f4a4f0dc35760 100644 (file)
--- a/folly/Makefile.am
+++ b/folly/Makefile.am
@@ -74,7 +74,7 @@ nobase_follyinclude_HEADERS = \
        detail/GroupVarintDetail.h \
        detail/IPAddress.h \
        detail/IPAddressSource.h \
-       detail/Malloc.h \
+       detail/MallocImpl.h \
        detail/MemoryIdler.h \
        detail/MPMCPipelineDetail.h \
        detail/RangeCommon.h \

diff --git a/folly/Malloc.h b/folly/Malloc.h
index a5884b0bc963f924c8af1e5aebe6c2d1462f75ba..ca9e7ae15705da3b5698b2a9e30df85cfd64fea3 100644 (file)
--- a/folly/Malloc.h
+++ b/folly/Malloc.h
@@ -45,7 +45,7 @@
 // includes and uses fbstring.
 #if defined(_GLIBCXX_USE_FB) && !defined(_LIBSTDCXX_FBSTRING)
 
-#include <folly/detail/Malloc.h>
+#include <folly/detail/MallocImpl.h>
 #include <folly/portability/BitsFunctexcept.h>
 
 #include <string>
@@ -98,7 +98,7 @@ __attribute__((__weak__));
 
 #else // !defined(_LIBSTDCXX_FBSTRING)
 
-#include <folly/detail/Malloc.h> /* nolint */
+#include <folly/detail/MallocImpl.h> /* nolint */
 #include <folly/portability/BitsFunctexcept.h> /* nolint */
 
 #endif

diff --git a/folly/detail/Malloc.h b/folly/detail/Malloc.h
deleted file mode 100644 (file)
index 74358f1..0000000
--- a/folly/detail/Malloc.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2017 Facebook, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <stdlib.h>
-
-#include <folly/Portability.h>
-
-extern "C" {
-
-#if FOLLY_HAVE_WEAK_SYMBOLS
-void* mallocx(size_t, int) __attribute__((__weak__));
-void* rallocx(void*, size_t, int) __attribute__((__weak__));
-size_t xallocx(void*, size_t, size_t, int) __attribute__((__weak__));
-size_t sallocx(const void*, int) __attribute__((__weak__));
-void dallocx(void*, int) __attribute__((__weak__));
-void sdallocx(void*, size_t, int) __attribute__((__weak__));
-size_t nallocx(size_t, int) __attribute__((__weak__));
-int mallctl(const char*, void*, size_t*, void*, size_t)
-      __attribute__((__weak__));
-int mallctlnametomib(const char*, size_t*, size_t*) __attribute__((__weak__));
-int mallctlbymib(const size_t*, size_t, void*, size_t*, void*, size_t)
-      __attribute__((__weak__));
-#else
-extern void* (*mallocx)(size_t, int);
-extern void* (*rallocx)(void*, size_t, int);
-extern size_t (*xallocx)(void*, size_t, size_t, int);
-extern size_t (*sallocx)(const void*, int);
-extern void (*dallocx)(void*, int);
-extern void (*sdallocx)(void*, size_t, int);
-extern size_t (*nallocx)(size_t, int);
-extern int (*mallctl)(const char*, void*, size_t*, void*, size_t);
-extern int (*mallctlnametomib)(const char*, size_t*, size_t*);
-extern int (*mallctlbymib)(const size_t*, size_t, void*, size_t*, void*,
-                           size_t);
-#ifdef _MSC_VER
-// We emulate weak linkage for MSVC. The symbols we're
-// aliasing to are hiding in MallocImpl.cpp
-#pragma comment(linker, "/alternatename:mallocx=mallocxWeak")
-#pragma comment(linker, "/alternatename:rallocx=rallocxWeak")
-#pragma comment(linker, "/alternatename:xallocx=xallocxWeak")
-#pragma comment(linker, "/alternatename:sallocx=sallocxWeak")
-#pragma comment(linker, "/alternatename:dallocx=dallocxWeak")
-#pragma comment(linker, "/alternatename:sdallocx=sdallocxWeak")
-#pragma comment(linker, "/alternatename:nallocx=nallocxWeak")
-#pragma comment(linker, "/alternatename:mallctl=mallctlWeak")
-#pragma comment(linker, "/alternatename:mallctlnametomib=mallctlnametomibWeak")
-#pragma comment(linker, "/alternatename:mallctlbymib=mallctlbymibWeak")
-#endif
-#endif
-
-}

diff --git a/folly/detail/MallocImpl.cpp b/folly/detail/MallocImpl.cpp
index a545f36284a13282a6e2a6a4d3bd4c00e265aaa7..3daa120a6eb58e7376f952fa73c662d7420d5acc 100644 (file)
--- a/folly/detail/MallocImpl.cpp
+++ b/folly/detail/MallocImpl.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <folly/detail/Malloc.h>
+#include <folly/detail/MallocImpl.h>
 
 extern "C" {
 

diff --git a/folly/detail/MallocImpl.h b/folly/detail/MallocImpl.h
new file mode 100644 (file)
index 0000000..74358f1
--- /dev/null
+++ b/folly/detail/MallocImpl.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2017 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include <stdlib.h>
+
+#include <folly/Portability.h>
+
+extern "C" {
+
+#if FOLLY_HAVE_WEAK_SYMBOLS
+void* mallocx(size_t, int) __attribute__((__weak__));
+void* rallocx(void*, size_t, int) __attribute__((__weak__));
+size_t xallocx(void*, size_t, size_t, int) __attribute__((__weak__));
+size_t sallocx(const void*, int) __attribute__((__weak__));
+void dallocx(void*, int) __attribute__((__weak__));
+void sdallocx(void*, size_t, int) __attribute__((__weak__));
+size_t nallocx(size_t, int) __attribute__((__weak__));
+int mallctl(const char*, void*, size_t*, void*, size_t)
+      __attribute__((__weak__));
+int mallctlnametomib(const char*, size_t*, size_t*) __attribute__((__weak__));
+int mallctlbymib(const size_t*, size_t, void*, size_t*, void*, size_t)
+      __attribute__((__weak__));
+#else
+extern void* (*mallocx)(size_t, int);
+extern void* (*rallocx)(void*, size_t, int);
+extern size_t (*xallocx)(void*, size_t, size_t, int);
+extern size_t (*sallocx)(const void*, int);
+extern void (*dallocx)(void*, int);
+extern void (*sdallocx)(void*, size_t, int);
+extern size_t (*nallocx)(size_t, int);
+extern int (*mallctl)(const char*, void*, size_t*, void*, size_t);
+extern int (*mallctlnametomib)(const char*, size_t*, size_t*);
+extern int (*mallctlbymib)(const size_t*, size_t, void*, size_t*, void*,
+                           size_t);
+#ifdef _MSC_VER
+// We emulate weak linkage for MSVC. The symbols we're
+// aliasing to are hiding in MallocImpl.cpp
+#pragma comment(linker, "/alternatename:mallocx=mallocxWeak")
+#pragma comment(linker, "/alternatename:rallocx=rallocxWeak")
+#pragma comment(linker, "/alternatename:xallocx=xallocxWeak")
+#pragma comment(linker, "/alternatename:sallocx=sallocxWeak")
+#pragma comment(linker, "/alternatename:dallocx=dallocxWeak")
+#pragma comment(linker, "/alternatename:sdallocx=sdallocxWeak")
+#pragma comment(linker, "/alternatename:nallocx=nallocxWeak")
+#pragma comment(linker, "/alternatename:mallctl=mallctlWeak")
+#pragma comment(linker, "/alternatename:mallctlnametomib=mallctlnametomibWeak")
+#pragma comment(linker, "/alternatename:mallctlbymib=mallctlbymibWeak")
+#endif
+#endif
+
+}