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

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

Issue 1149673002: Adding blink gc memory dump infrastructure for thread specific dumps. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase and replacing main thread with thread id. 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/platform/heap/BlinkGCMemoryDumpProvider.h ('k') | Source/platform/heap/Heap.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/heap/BlinkGCMemoryDumpProvider.cpp
diff --git a/Source/platform/heap/BlinkGCMemoryDumpProvider.cpp b/Source/platform/heap/BlinkGCMemoryDumpProvider.cpp
index af8dbfe9d6e6fd2d9169c176875989545416ff3c..5e7f8a9d659515038abc905a344e7987eec3100c 100644
--- a/Source/platform/heap/BlinkGCMemoryDumpProvider.cpp
+++ b/Source/platform/heap/BlinkGCMemoryDumpProvider.cpp
@@ -6,6 +6,7 @@
#include "Source/platform/heap/BlinkGCMemoryDumpProvider.h"
#include "platform/heap/Handle.h"
+#include "public/platform/Platform.h"
#include "public/platform/WebMemoryAllocatorDump.h"
#include "public/platform/WebProcessMemoryDump.h"
#include "wtf/StdLibExtras.h"
@@ -19,8 +20,13 @@ BlinkGCMemoryDumpProvider* BlinkGCMemoryDumpProvider::instance()
return &instance;
}
+BlinkGCMemoryDumpProvider::~BlinkGCMemoryDumpProvider()
+{
+}
+
bool BlinkGCMemoryDumpProvider::onMemoryDump(blink::WebProcessMemoryDump* memoryDump)
{
+ Heap::collectGarbage(ThreadState::NoHeapPointersOnStack, ThreadState::TakeSnapshot, Heap::ForcedGC);
String dumpName = String::format("blink_gc/thread_%lu", static_cast<unsigned long>(WTF::currentThread()));
WebMemoryAllocatorDump* allocatorDump = memoryDump->createMemoryAllocatorDump(dumpName);
allocatorDump->AddScalar("size", "bytes", Heap::allocatedSpace());
@@ -30,15 +36,25 @@ bool BlinkGCMemoryDumpProvider::onMemoryDump(blink::WebProcessMemoryDump* memory
objectsDump->AddScalar("size", "bytes", Heap::allocatedObjectSize() + Heap::markedObjectSize());
objectsDump->AddScalar("estimated_live_object_size", "bytes", Heap::estimatedLiveObjectSize());
+ // Merge all dumps collected by Heap::collectGarbage.
+ memoryDump->takeAllDumpsFrom(m_currentProcessMemoryDump.get());
return true;
}
-BlinkGCMemoryDumpProvider::BlinkGCMemoryDumpProvider()
+WebMemoryAllocatorDump* BlinkGCMemoryDumpProvider::createMemoryAllocatorDumpForCurrentGC(const String& absoluteName)
{
+ return m_currentProcessMemoryDump->createMemoryAllocatorDump(absoluteName);
}
-BlinkGCMemoryDumpProvider::~BlinkGCMemoryDumpProvider()
+void BlinkGCMemoryDumpProvider::clearProcessDumpForCurrentGC()
+{
+ m_currentProcessMemoryDump->clear();
+}
+
+BlinkGCMemoryDumpProvider::BlinkGCMemoryDumpProvider()
+ : m_currentProcessMemoryDump(adoptPtr(Platform::current()->createProcessMemoryDump()))
{
+ ASSERT(m_currentProcessMemoryDump);
}
} // namespace blink
« no previous file with comments | « Source/platform/heap/BlinkGCMemoryDumpProvider.h ('k') | Source/platform/heap/Heap.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698