Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(204)

Side by Side Diff: base/allocator/allocator_check.cc

Issue 2676093003: mac: Hook up allocator shim during app startup. (Closed)
Patch Set: Remove unused include. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | base/allocator/allocator_interception_mac.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/allocator/allocator_check.h" 5 #include "base/allocator/allocator_check.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 8
9 #if defined(OS_WIN) 9 #if defined(OS_WIN)
10 #include "base/allocator/allocator_shim_win.h" 10 #include "base/allocator/allocator_shim_win.h"
11 #endif 11 #endif
12 12
13 #if defined(OS_LINUX) 13 #if defined(OS_LINUX)
14 #include <malloc.h> 14 #include <malloc.h>
15 #endif 15 #endif
16 16
17 #if defined(OS_MACOSX)
18 #include "base/allocator/allocator_interception_mac.h"
19 #endif
20
17 namespace base { 21 namespace base {
18 namespace allocator { 22 namespace allocator {
19 23
20 bool IsAllocatorInitialized() { 24 bool IsAllocatorInitialized() {
21 #if defined(OS_WIN) && defined(ALLOCATOR_SHIM) 25 #if defined(OS_WIN) && defined(ALLOCATOR_SHIM)
22 // Set by allocator_shim_win.cc when the shimmed _set_new_mode() is called. 26 // Set by allocator_shim_win.cc when the shimmed _set_new_mode() is called.
23 return g_is_win_shim_layer_initialized; 27 return g_is_win_shim_layer_initialized;
24 #elif defined(OS_LINUX) && defined(USE_TCMALLOC) && \ 28 #elif defined(OS_LINUX) && defined(USE_TCMALLOC) && \
25 !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) 29 !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
26 // From third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h. 30 // From third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h.
27 // TODO(primiano): replace with an include once base can depend on allocator. 31 // TODO(primiano): replace with an include once base can depend on allocator.
28 #define TC_MALLOPT_IS_OVERRIDDEN_BY_TCMALLOC 0xbeef42 32 #define TC_MALLOPT_IS_OVERRIDDEN_BY_TCMALLOC 0xbeef42
29 return (mallopt(TC_MALLOPT_IS_OVERRIDDEN_BY_TCMALLOC, 0) == 33 return (mallopt(TC_MALLOPT_IS_OVERRIDDEN_BY_TCMALLOC, 0) ==
30 TC_MALLOPT_IS_OVERRIDDEN_BY_TCMALLOC); 34 TC_MALLOPT_IS_OVERRIDDEN_BY_TCMALLOC);
35 #elif defined(OS_MACOSX) && !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
36 // From allocator_interception_mac.mm.
37 return base::allocator::g_replaced_default_zone;
31 #else 38 #else
32 return true; 39 return true;
33 #endif 40 #endif
34 } 41 }
35 42
36 } // namespace allocator 43 } // namespace allocator
37 } // namespace base 44 } // namespace base
OLDNEW
« no previous file with comments | « no previous file | base/allocator/allocator_interception_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698