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

Side by Side Diff: base/trace_event/malloc_dump_provider.h

Issue 2890363003: Enable sharding of AllocationRegister on desktop. (Closed)
Patch Set: comments from primiano, thakis. Created 3 years, 7 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #ifndef BASE_TRACE_EVENT_MALLOC_DUMP_PROVIDER_H_ 5 #ifndef BASE_TRACE_EVENT_MALLOC_DUMP_PROVIDER_H_
6 #define BASE_TRACE_EVENT_MALLOC_DUMP_PROVIDER_H_ 6 #define BASE_TRACE_EVENT_MALLOC_DUMP_PROVIDER_H_
7 7
8 #include <istream> 8 #include <istream>
9 #include <memory> 9 #include <memory>
10 10
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/memory/singleton.h" 12 #include "base/memory/singleton.h"
13 #include "base/synchronization/lock.h"
14 #include "base/threading/platform_thread.h" 13 #include "base/threading/platform_thread.h"
15 #include "base/trace_event/memory_dump_provider.h" 14 #include "base/trace_event/memory_dump_provider.h"
15 #include "base/trace_event/sharded_allocation_register.h"
16 #include "build/build_config.h" 16 #include "build/build_config.h"
17 17
18 #if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WIN) || \ 18 #if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WIN) || \
19 (defined(OS_MACOSX) && !defined(OS_IOS)) 19 (defined(OS_MACOSX) && !defined(OS_IOS))
20 #define MALLOC_MEMORY_TRACING_SUPPORTED 20 #define MALLOC_MEMORY_TRACING_SUPPORTED
21 #endif 21 #endif
22 22
23 namespace base { 23 namespace base {
24 namespace trace_event { 24 namespace trace_event {
25 25
26 class AllocationRegister;
27
28 // Dump provider which collects process-wide memory stats. 26 // Dump provider which collects process-wide memory stats.
29 class BASE_EXPORT MallocDumpProvider : public MemoryDumpProvider { 27 class BASE_EXPORT MallocDumpProvider : public MemoryDumpProvider {
30 public: 28 public:
31 // Name of the allocated_objects dump. Use this to declare suballocator dumps 29 // Name of the allocated_objects dump. Use this to declare suballocator dumps
32 // from other dump providers. 30 // from other dump providers.
33 static const char kAllocatedObjects[]; 31 static const char kAllocatedObjects[];
34 32
35 static MallocDumpProvider* GetInstance(); 33 static MallocDumpProvider* GetInstance();
36 34
37 // MemoryDumpProvider implementation. 35 // MemoryDumpProvider implementation.
38 bool OnMemoryDump(const MemoryDumpArgs& args, 36 bool OnMemoryDump(const MemoryDumpArgs& args,
39 ProcessMemoryDump* pmd) override; 37 ProcessMemoryDump* pmd) override;
40 38
41 void OnHeapProfilingEnabled(bool enabled) override; 39 void OnHeapProfilingEnabled(bool enabled) override;
42 40
43 // For heap profiling. 41 // For heap profiling.
44 void InsertAllocation(void* address, size_t size); 42 void InsertAllocation(void* address, size_t size);
45 void RemoveAllocation(void* address); 43 void RemoveAllocation(void* address);
46 44
47 private: 45 private:
48 friend struct DefaultSingletonTraits<MallocDumpProvider>; 46 friend struct DefaultSingletonTraits<MallocDumpProvider>;
49 47
50 MallocDumpProvider(); 48 MallocDumpProvider();
51 ~MallocDumpProvider() override; 49 ~MallocDumpProvider() override;
52 50
53 // For heap profiling. 51 // For heap profiling.
54 bool heap_profiler_enabled_; 52 ShardedAllocationRegister allocation_register_;
55 std::unique_ptr<AllocationRegister> allocation_register_;
56 Lock allocation_register_lock_;
57 53
58 // When in OnMemoryDump(), this contains the current thread ID. 54 // When in OnMemoryDump(), this contains the current thread ID.
59 // This is to prevent re-entrancy in the heap profiler when the heap dump 55 // This is to prevent re-entrancy in the heap profiler when the heap dump
60 // generation is malloc/new-ing for its own bookeeping data structures. 56 // generation is malloc/new-ing for its own bookeeping data structures.
61 PlatformThreadId tid_dumping_heap_; 57 PlatformThreadId tid_dumping_heap_;
62 58
63 DISALLOW_COPY_AND_ASSIGN(MallocDumpProvider); 59 DISALLOW_COPY_AND_ASSIGN(MallocDumpProvider);
64 }; 60 };
65 61
66 } // namespace trace_event 62 } // namespace trace_event
67 } // namespace base 63 } // namespace base
68 64
69 #endif // BASE_TRACE_EVENT_MALLOC_DUMP_PROVIDER_H_ 65 #endif // BASE_TRACE_EVENT_MALLOC_DUMP_PROVIDER_H_
OLDNEW
« no previous file with comments | « base/trace_event/heap_profiler_allocation_register.cc ('k') | base/trace_event/malloc_dump_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698