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

Side by Side Diff: Source/platform/PartitionAllocMemoryDumpProvider.cpp

Issue 1189173003: Adding thread id to PartitionAlloc memory dumps dumps for single process mode and bug fix. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@test
Patch Set: Created 5 years, 6 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 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 #include "config.h" 5 #include "config.h"
6 #include "Source/platform/PartitionAllocMemoryDumpProvider.h" 6 #include "Source/platform/PartitionAllocMemoryDumpProvider.h"
7 7
8 #include "public/platform/WebMemoryAllocatorDump.h" 8 #include "public/platform/WebMemoryAllocatorDump.h"
9 #include "public/platform/WebProcessMemoryDump.h" 9 #include "public/platform/WebProcessMemoryDump.h"
10 #include "wtf/Partitions.h" 10 #include "wtf/Partitions.h"
11 #include "wtf/Threading.h"
11 12
12 namespace blink { 13 namespace blink {
13 14
14 namespace { 15 namespace {
15 16
16 using namespace WTF; 17 using namespace WTF;
17 18
18 // This class is used to invert the dependency of PartitionAlloc on the 19 // This class is used to invert the dependency of PartitionAlloc on the
19 // PartitionAllocMemoryDumpProvider. This implements an interface that will 20 // PartitionAllocMemoryDumpProvider. This implements an interface that will
20 // be called with memory statistics for each bucket in the allocator. 21 // be called with memory statistics for each bucket in the allocator.
21 class PartitionStatsDumperImpl final : public PartitionStatsDumper { 22 class PartitionStatsDumperImpl final : public PartitionStatsDumper {
22 public: 23 public:
23 explicit PartitionStatsDumperImpl(WebProcessMemoryDump* memoryDump) 24 explicit PartitionStatsDumperImpl(WebProcessMemoryDump* memoryDump)
24 : m_memoryDump(memoryDump), m_uid(0) { } 25 : m_memoryDump(memoryDump), m_uid(0) { }
25 26
26 // PartitionStatsDumper implementation. 27 // PartitionStatsDumper implementation.
27 void partitionsDumpBucketStats(const char* partitionName, const PartitionBuc ketMemoryStats*) override; 28 void partitionsDumpBucketStats(const char* partitionName, const PartitionBuc ketMemoryStats*) override;
28 29
29 private: 30 private:
30 WebProcessMemoryDump* m_memoryDump; 31 WebProcessMemoryDump* m_memoryDump;
31 size_t m_uid; 32 size_t m_uid;
32 }; 33 };
33 34
34 void PartitionStatsDumperImpl::partitionsDumpBucketStats(const char* partitionNa me, const PartitionBucketMemoryStats* memoryStats) 35 void PartitionStatsDumperImpl::partitionsDumpBucketStats(const char* partitionNa me, const PartitionBucketMemoryStats* memoryStats)
35 { 36 {
36 ASSERT(memoryStats->isValid); 37 ASSERT(memoryStats->isValid);
37 String dumpName; 38 String dumpName;
38 if (memoryStats->isDirectMap) 39 if (memoryStats->isDirectMap)
39 dumpName = String::format("partition_alloc/%s/directMap_%zu", partitionN ame, ++m_uid); 40 dumpName = String::format("partition_alloc/thread_%lu/%s/directMap_%lu", static_cast<unsigned long>(WTF::currentThread()), partitionName, ++m_uid);
haraken 2015/06/18 17:55:30 Instead of calling WTF::currentThread() here, can
ssid 2015/06/18 20:55:24 This module depends on Partitions.h, and Partition
40 else 41 else
41 dumpName = String::format("partition_alloc/%s/bucket_%zu", partitionName , static_cast<size_t>(memoryStats->bucketSlotSize)); 42 dumpName = String::format("partition_alloc/thread_%lu/%s/bucket_%u", sta tic_cast<unsigned long>(WTF::currentThread()), partitionName, static_cast<unsign ed>(memoryStats->bucketSlotSize));
42 43
43 WebMemoryAllocatorDump* allocatorDump = m_memoryDump->createMemoryAllocatorD ump(dumpName); 44 WebMemoryAllocatorDump* allocatorDump = m_memoryDump->createMemoryAllocatorD ump(dumpName);
44 allocatorDump->AddScalar("size", "bytes", memoryStats->residentBytes); 45 allocatorDump->AddScalar("size", "bytes", memoryStats->residentBytes);
45 allocatorDump->AddScalar("slot_size", "bytes", memoryStats->bucketSlotSize); 46 allocatorDump->AddScalar("slot_size", "bytes", memoryStats->bucketSlotSize);
46 allocatorDump->AddScalar("active_size", "bytes", memoryStats->activeBytes); 47 allocatorDump->AddScalar("active_size", "bytes", memoryStats->activeBytes);
47 allocatorDump->AddScalar("resident_size", "bytes", memoryStats->residentByte s); 48 allocatorDump->AddScalar("resident_size", "bytes", memoryStats->residentByte s);
48 allocatorDump->AddScalar("freeable_size", "bytes", memoryStats->freeableByte s); 49 allocatorDump->AddScalar("freeable_size", "bytes", memoryStats->freeableByte s);
49 allocatorDump->AddScalar("num_active", "objects", memoryStats->numActivePage s); 50 allocatorDump->AddScalar("num_active", "objects", memoryStats->numActivePage s);
50 allocatorDump->AddScalar("num_full", "objects", memoryStats->numFullPages); 51 allocatorDump->AddScalar("num_full", "objects", memoryStats->numFullPages);
51 allocatorDump->AddScalar("num_empty", "objects", memoryStats->numEmptyPages) ; 52 allocatorDump->AddScalar("num_empty", "objects", memoryStats->numEmptyPages) ;
(...skipping 24 matching lines...) Expand all
76 77
77 PartitionAllocMemoryDumpProvider::PartitionAllocMemoryDumpProvider() 78 PartitionAllocMemoryDumpProvider::PartitionAllocMemoryDumpProvider()
78 { 79 {
79 } 80 }
80 81
81 PartitionAllocMemoryDumpProvider::~PartitionAllocMemoryDumpProvider() 82 PartitionAllocMemoryDumpProvider::~PartitionAllocMemoryDumpProvider()
82 { 83 {
83 } 84 }
84 85
85 } // namespace blink 86 } // namespace blink
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