third_party/WebKit/Source/platform/heap/BlinkGCMemoryDumpProvider.cpp - Issue 1477023003: Refactor the Heap into ThreadHeap to prepare for per thread heaps

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/platform/heap/BlinkGCMemoryDumpProvider.cpp

Issue 1477023003: Refactor the Heap into ThreadHeap to prepare for per thread heaps Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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 side-by-side diff with in-line comments

Download patch

« third_party/WebKit/Source/platform/WebThreadSupportingGC.cpp ('K') | « third_party/WebKit/Source/platform/WebThreadSupportingGC.cpp ('k') | third_party/WebKit/Source/platform/heap/Handle.h » ('j') | third_party/WebKit/Source/platform/heap/Handle.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/heap/BlinkGCMemoryDumpProvider.cpp

diff --git a/third_party/WebKit/Source/platform/heap/BlinkGCMemoryDumpProvider.cpp b/third_party/WebKit/Source/platform/heap/BlinkGCMemoryDumpProvider.cpp

index 6f4f4e723f48ab675ab24bb7c2c11af92c8b974a..0cc4ee3ee43fe47390fcf9b68374aadc24df0dea 100644

--- a/third_party/WebKit/Source/platform/heap/BlinkGCMemoryDumpProvider.cpp

+++ b/third_party/WebKit/Source/platform/heap/BlinkGCMemoryDumpProvider.cpp

@@ -18,14 +18,14 @@ void dumpMemoryTotals(blink::WebProcessMemoryDump* memoryDump)

{

String dumpName = String::format("blink_gc");

WebMemoryAllocatorDump* allocatorDump = memoryDump->createMemoryAllocatorDump(dumpName);

- allocatorDump->addScalar("size", "bytes", Heap::allocatedSpace());

+ allocatorDump->addScalar("size", "bytes", ThreadState::totalAllocatedSpace());

dumpName.append("/allocated_objects");

WebMemoryAllocatorDump* objectsDump = memoryDump->createMemoryAllocatorDump(dumpName);

// Heap::markedObjectSize() can be underestimated if we're still in the

// process of lazy sweeping.

- objectsDump->addScalar("size", "bytes", Heap::allocatedObjectSize() + Heap::markedObjectSize());

+ objectsDump->addScalar("size", "bytes", ThreadState::totalAllocatedObjectSize() + ThreadState::totalMarkedObjectSize());

}

} // namespace