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

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

Issue 1846483002: Fix IsAllocatorInitialized() for memory tools on Linux. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 | no next file » | 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_LINUX) 9 #if defined(OS_LINUX)
10 #include <malloc.h> 10 #include <malloc.h>
11 #endif 11 #endif
12 12
13 namespace base { 13 namespace base {
14 namespace allocator { 14 namespace allocator {
15 15
16 // Defined in allocator_shim_win.cc . 16 // Defined in allocator_shim_win.cc .
17 // TODO(primiano): replace with an include once base can depend on allocator. 17 // TODO(primiano): replace with an include once base can depend on allocator.
18 #if defined(OS_WIN) && defined(ALLOCATOR_SHIM) 18 #if defined(OS_WIN) && defined(ALLOCATOR_SHIM)
19 extern bool g_is_win_shim_layer_initialized; 19 extern bool g_is_win_shim_layer_initialized;
20 #endif 20 #endif
21 21
22 bool IsAllocatorInitialized() { 22 bool IsAllocatorInitialized() {
23 #if defined(OS_WIN) && defined(ALLOCATOR_SHIM) 23 #if defined(OS_WIN) && defined(ALLOCATOR_SHIM)
24 // Set by allocator_shim_win.cc when the shimmed _heap_init() is called. 24 // Set by allocator_shim_win.cc when the shimmed _heap_init() is called.
25 return g_is_win_shim_layer_initialized; 25 return g_is_win_shim_layer_initialized;
26 #elif defined(OS_LINUX) && defined(USE_TCMALLOC) 26 #elif defined(OS_LINUX) && defined(USE_TCMALLOC) && \
27 !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
27 // From third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h. 28 // From third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h.
28 // TODO(primiano): replace with an include once base can depend on allocator. 29 // TODO(primiano): replace with an include once base can depend on allocator.
29 #define TC_MALLOPT_IS_OVERRIDDEN_BY_TCMALLOC 0xbeef42 30 #define TC_MALLOPT_IS_OVERRIDDEN_BY_TCMALLOC 0xbeef42
30 return (mallopt(TC_MALLOPT_IS_OVERRIDDEN_BY_TCMALLOC, 0) == 31 return (mallopt(TC_MALLOPT_IS_OVERRIDDEN_BY_TCMALLOC, 0) ==
31 TC_MALLOPT_IS_OVERRIDDEN_BY_TCMALLOC); 32 TC_MALLOPT_IS_OVERRIDDEN_BY_TCMALLOC);
32 #else 33 #else
33 return true; 34 return true;
34 #endif 35 #endif
35 } 36 }
36 37
37 } // namespace allocator 38 } // namespace allocator
38 } // namespace base 39 } // namespace base
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698