diff options
| author | primiano <primiano@chromium.org> | 2015-11-07 22:40:06 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-08 06:40:49 +0000 |
| commit | 549425200e38dad0ddd8bd826a032f7a6062e47a (patch) | |
| tree | 86371602c86163aac8b31dfafbe0a4b30811fa66 | |
| parent | 2e96c73ff03289dfe326e33c5681886b5b99018a (diff) | |
| download | chromium_src-549425200e38dad0ddd8bd826a032f7a6062e47a.zip chromium_src-549425200e38dad0ddd8bd826a032f7a6062e47a.tar.gz chromium_src-549425200e38dad0ddd8bd826a032f7a6062e47a.tar.bz2 | |
[tracing] Fix typo in malloc dump provider for Mac
Follow-up to crrev.com/1431903003 which had a typo in the #ifdef
which was actually preventing the CL to work as intended.
Also this fixes the name of the MALLOC_MEMORY_TRACING_SUPPORTED
macro, making it more uniform to the other similar macros
(XXX_SUPPORTED vs SUPPORTS_XXX).
BUG=466141
TBR=ssid@chromium.org
Review URL: https://codereview.chromium.org/1431113002
Cr-Commit-Position: refs/heads/master@{#358546}
| -rw-r--r-- | base/trace_event/malloc_dump_provider.h | 4 | ||||
| -rw-r--r-- | base/trace_event/memory_dump_manager.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/base/trace_event/malloc_dump_provider.h b/base/trace_event/malloc_dump_provider.h index f463d0a..63fc1b0 100644 --- a/base/trace_event/malloc_dump_provider.h +++ b/base/trace_event/malloc_dump_provider.h @@ -13,8 +13,8 @@ #include "build/build_config.h" #if defined(OS_LINUX) || defined(OS_ANDROID) || \ - (defined(OS_MACOXS) && !defined(OS_IOS)) -#define SUPPORTS_MALLOC_MEMORY_TRACING + (defined(OS_MACOSX) && !defined(OS_IOS)) +#define MALLOC_MEMORY_TRACING_SUPPORTED #endif namespace base { diff --git a/base/trace_event/memory_dump_manager.cc b/base/trace_event/memory_dump_manager.cc index 43c784b..19bdcc4 100644 --- a/base/trace_event/memory_dump_manager.cc +++ b/base/trace_event/memory_dump_manager.cc @@ -96,7 +96,7 @@ const uint64_t MemoryDumpManager::kInvalidTracingProcessId = 0; // static const char* const MemoryDumpManager::kSystemAllocatorPoolName = -#if defined(SUPPORTS_MALLOC_MEMORY_TRACING) +#if defined(MALLOC_MEMORY_TRACING_SUPPORTED) MallocDumpProvider::kAllocatedObjects; #elif defined(OS_WIN) WinHeapDumpProvider::kAllocatedObjects; @@ -155,7 +155,7 @@ void MemoryDumpManager::Initialize(MemoryDumpManagerDelegate* delegate, "ProcessMemoryTotals", nullptr); #endif -#if defined(SUPPORTS_MALLOC_MEMORY_TRACING) +#if defined(MALLOC_MEMORY_TRACING_SUPPORTED) RegisterDumpProvider(MallocDumpProvider::GetInstance(), "Malloc", nullptr); #endif |