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

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

Issue 1665553002: metrics: Connect leak detector to allocator (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Simplify alloc hook registration; Enclose more stuff in CrOS #ifdef Created 4 years, 9 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_extension.h" 5 #include "base/allocator/allocator_extension.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 8
9 #if defined(USE_TCMALLOC) 9 #if defined(USE_TCMALLOC)
10 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h" 10 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h"
11 #include "third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h" 11 #include "third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h"
12 #include "third_party/tcmalloc/chromium/src/gperftools/malloc_hook.h"
12 #endif 13 #endif
13 14
14 namespace base { 15 namespace base {
15 namespace allocator { 16 namespace allocator {
16 17
17 void ReleaseFreeMemory() { 18 void ReleaseFreeMemory() {
18 #if defined(USE_TCMALLOC) 19 #if defined(USE_TCMALLOC)
19 ::MallocExtension::instance()->ReleaseFreeMemory(); 20 ::MallocExtension::instance()->ReleaseFreeMemory();
20 #endif 21 #endif
21 } 22 }
22 23
23 bool GetNumericProperty(const char* name, size_t* value) { 24 bool GetNumericProperty(const char* name, size_t* value) {
24 #if defined(USE_TCMALLOC) 25 #if defined(USE_TCMALLOC)
25 return ::MallocExtension::instance()->GetNumericProperty(name, value); 26 return ::MallocExtension::instance()->GetNumericProperty(name, value);
26 #endif 27 #endif
27 return false; 28 return false;
28 } 29 }
29 30
30 bool IsHeapProfilerRunning() { 31 bool IsHeapProfilerRunning() {
31 #if defined(USE_TCMALLOC) 32 #if defined(USE_TCMALLOC)
32 return ::IsHeapProfilerRunning(); 33 return ::IsHeapProfilerRunning();
33 #endif 34 #endif
34 return false; 35 return false;
35 } 36 }
36 37
38 void SetHooks(AllocHookFunc alloc_hook, FreeHookFunc free_hook) {
39 #if defined(USE_TCMALLOC)
40 // Make sure no hooks get overwritten.
41 auto prev_alloc_hook = MallocHook::SetNewHook(alloc_hook);
42 if (alloc_hook)
43 DCHECK(!prev_alloc_hook);
44
45 auto prev_free_hook = MallocHook::SetDeleteHook(free_hook);
46 if (free_hook)
47 DCHECK(!prev_free_hook);
48 #endif
Primiano Tucci (use gerrit) 2016/03/02 22:16:11 Ok this looks great now, thanks :)
49 }
50
51 bool RemoveHooks(AllocHookFunc alloc_hook, FreeHookFunc free_hook) {
Primiano Tucci (use gerrit) 2016/03/02 22:16:11 Is this a leftover? This doesn't seem neither decl
Simon Que 2016/03/02 22:35:25 Done.
52 #if defined(USE_TCMALLOC)
53 return MallocHook::RemoveNewHook(alloc_hook) &&
54 MallocHook::RemoveDeleteHook(free_hook);
55 #endif
56 return false;
57 }
58
59 int GetCallStack(void** stack, int max_stack_size, int /* skip_count */) {
60 #if defined(USE_TCMALLOC)
61 // |skip_count| is not used by the following function. Instead, the number of
62 // frames to skip is determined internally.
63 // See MallocHook_GetCallerStackTrace() in
64 // third_party/tcmalloc/chromium/src/malloc_hook.cc.
65 return MallocHook::GetCallerStackTrace(stack, max_stack_size, 0);
66 #endif
67 return 0;
68 }
69
37 } // namespace allocator 70 } // namespace allocator
38 } // namespace base 71 } // namespace base
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698