projects
/
folly.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
730db44
)
unify FOLLY_SANITIZE existing uses and add a few new
author
Igor Sugak
<sugak@fb.com>
Fri, 1 Dec 2017 19:19:44 +0000
(11:19 -0800)
committer
Facebook Github Bot
<facebook-github-bot@users.noreply.github.com>
Fri, 1 Dec 2017 19:26:53 +0000
(11:26 -0800)
Reviewed By: yfeldblum
Differential Revision:
D6453972
fbshipit-source-id:
fa083c0b782188f5f45a2a354045aee03e528829
folly/experimental/JemallocNodumpAllocator.h
patch
|
blob
|
history
folly/memory/Malloc.h
patch
|
blob
|
history
folly/memory/test/MallctlHelperTest.cpp
patch
|
blob
|
history
folly/portability/Malloc.h
patch
|
blob
|
history
diff --git
a/folly/experimental/JemallocNodumpAllocator.h
b/folly/experimental/JemallocNodumpAllocator.h
index 16d6aec8a41970071bb8dc8087ffe0322f499381..8b921d66d99a4a25b9f1123f1469560eff0cdcf8 100644
(file)
--- a/
folly/experimental/JemallocNodumpAllocator.h
+++ b/
folly/experimental/JemallocNodumpAllocator.h
@@
-21,7
+21,7
@@
#include <folly/CPortability.h>
#include <folly/portability/Config.h>
#include <folly/CPortability.h>
#include <folly/portability/Config.h>
-#if defined(FOLLY_HAVE_LIBJEMALLOC) && !
defined(FOLLY_SANITIZE)
+#if defined(FOLLY_HAVE_LIBJEMALLOC) && !
FOLLY_SANITIZE
#include <folly/portability/SysMman.h>
#include <jemalloc/jemalloc.h>
#include <folly/portability/SysMman.h>
#include <jemalloc/jemalloc.h>
diff --git
a/folly/memory/Malloc.h
b/folly/memory/Malloc.h
index 9eaf2c6ccec0f2777614262295924f32ed8d1dc9..c8aeaddd4573bacbf9e1f244be326f150d789eaa 100644
(file)
--- a/
folly/memory/Malloc.h
+++ b/
folly/memory/Malloc.h
@@
-19,6
+19,7
@@
#pragma once
#pragma once
+#include <folly/CPortability.h>
#include <folly/portability/Config.h>
/**
#include <folly/portability/Config.h>
/**
@@
-26,7
+27,7
@@
* them so that we don't have to include jemalloc.h, in case the program is
* built without jemalloc support.
*/
* them so that we don't have to include jemalloc.h, in case the program is
* built without jemalloc support.
*/
-#if
defined(USE_JEMALLOC) || defined(FOLLY_USE_JEMALLOC)
+#if
(defined(USE_JEMALLOC) || defined(FOLLY_USE_JEMALLOC)) && !FOLLY_SANITIZE
// We have JEMalloc, so use it.
# include <jemalloc/jemalloc.h>
#else
// We have JEMalloc, so use it.
# include <jemalloc/jemalloc.h>
#else
@@
-149,9
+150,9
@@
namespace folly {
* Determine if we are using jemalloc or not.
*/
#if defined(USE_JEMALLOC) && !FOLLY_SANITIZE
* Determine if we are using jemalloc or not.
*/
#if defined(USE_JEMALLOC) && !FOLLY_SANITIZE
-inline bool usingJEMalloc() noexcept {
- return true;
-}
+
inline bool usingJEMalloc() noexcept {
+
return true;
+
}
#else
FOLLY_MALLOC_NOINLINE inline bool usingJEMalloc() noexcept {
// Checking for rallocx != nullptr is not sufficient; we may be in a
#else
FOLLY_MALLOC_NOINLINE inline bool usingJEMalloc() noexcept {
// Checking for rallocx != nullptr is not sufficient; we may be in a
diff --git
a/folly/memory/test/MallctlHelperTest.cpp
b/folly/memory/test/MallctlHelperTest.cpp
index 0b5444c86ecb50953bf88eac268b763c571f581e..f6027780b07bc3ad1b723a69aeec1534d7e378f3 100644
(file)
--- a/
folly/memory/test/MallctlHelperTest.cpp
+++ b/
folly/memory/test/MallctlHelperTest.cpp
@@
-20,7
+20,7
@@
#include <folly/memory/Malloc.h>
#include <folly/portability/GTest.h>
#include <folly/memory/Malloc.h>
#include <folly/portability/GTest.h>
-#if defined(FOLLY_HAVE_LIBJEMALLOC) && !
defined(FOLLY_SANITIZE)
+#if defined(FOLLY_HAVE_LIBJEMALLOC) && !
FOLLY_SANITIZE
#include <jemalloc/jemalloc.h>
#endif
#include <jemalloc/jemalloc.h>
#endif
diff --git
a/folly/portability/Malloc.h
b/folly/portability/Malloc.h
index 1204c23365d8036ecccb92ebd319f79406fea301..1c93d825af3ffcdb1d7bd8f13001c2e811572325 100755
(executable)
--- a/
folly/portability/Malloc.h
+++ b/
folly/portability/Malloc.h
@@
-16,10
+16,12
@@
#pragma once
#pragma once
-#include <folly/portability/Config.h>
#include <stdlib.h>
#include <stdlib.h>
-#if defined(USE_JEMALLOC) || defined(FOLLY_USE_JEMALLOC)
+#include <folly/CPortability.h>
+#include <folly/portability/Config.h>
+
+#if (defined(USE_JEMALLOC) || defined(FOLLY_USE_JEMALLOC)) && !FOLLY_SANITIZE
// JEMalloc provides it's own implementation of
// malloc_usable_size, and that's what we should be using.
#include <jemalloc/jemalloc.h>
// JEMalloc provides it's own implementation of
// malloc_usable_size, and that's what we should be using.
#include <jemalloc/jemalloc.h>