[tracing] Adding class-wise memory statistics to blink gc memory dumps

Source/platform/heap/Heap.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 242 matching lines @@
 
     ASSERT(!m_firstUnsweptPage);
     // Add the BaseHeap's pages to the orphanedPagePool.
     for (BasePage* page = m_firstPage; page; page = page->next()) {
         Heap::decreaseAllocatedSpace(page->size());
         Heap::orphanedPagePool()->addOrphanedPage(heapIndex(), page);
     }
     m_firstPage = nullptr;
 }
 
-void BaseHeap::takeSnapshot(const String& dumpBaseName)
+void BaseHeap::takeSnapshot(const String& dumpBaseName, ThreadState::GCSnapshotInfo& info)
 {
     WebMemoryAllocatorDump* allocatorDump = BlinkGCMemoryDumpProvider::instance()->createMemoryAllocatorDumpForCurrentGC(dumpBaseName);
     size_t pageIndex = 0;
     for (BasePage* page = m_firstUnsweptPage; page; page = page->next()) {
-        page->takeSnapshot(dumpBaseName, pageIndex);
+        page->takeSnapshot(dumpBaseName, pageIndex, info);
         pageIndex++;
     }
     allocatorDump->AddScalar("blink_page_count", "objects", pageIndex);
 }
 
 #if ENABLE(ASSERT) || ENABLE(GC_PROFILING)
 BasePage* BaseHeap::findPageFromAddress(Address address)
 {
     for (BasePage* page = m_firstPage; page; page = page->next()) {
         if (page->contains(address))
@@ skipping 1202 matching lines @@
     // cross thread pointer usage.
 #if defined(ADDRESS_SANITIZER)
     // This needs to zap poisoned memory as well.
     // Force unpoison memory before memset.
     ASAN_UNPOISON_MEMORY_REGION(payload(), payloadSize());
 #endif
     memset(payload(), orphanedZapValue, payloadSize());
     BasePage::markOrphaned();
 }
 
-void NormalPage::takeSnapshot(String dumpName, size_t pageIndex)
+void NormalPage::takeSnapshot(String dumpName, size_t pageIndex, ThreadState::GCSnapshotInfo& info)
 {
     dumpName.append(String::format("/pages/page_%lu", static_cast<unsigned long>(pageIndex)));
     WebMemoryAllocatorDump* pageDump = BlinkGCMemoryDumpProvider::instance()->createMemoryAllocatorDumpForCurrentGC(dumpName);
 
     HeapObjectHeader* header = nullptr;
     size_t liveCount = 0;
     size_t deadCount = 0;
     size_t freeCount = 0;
     size_t liveSize = 0;
     size_t deadSize = 0;
     size_t freeSize = 0;
     for (Address headerAddress = payload(); headerAddress < payloadEnd(); headerAddress += header->size()) {
         header = reinterpret_cast<HeapObjectHeader*>(headerAddress);
         if (header->isFree()) {
             freeCount++;
             freeSize += header->size();
         } else if (header->isMarked()) {
             liveCount++;
             liveSize += header->size();
+
+            size_t tag = info.getClassTag(Heap::gcInfo(header->gcInfoIndex()));
+            info.liveCount[tag]++;
+            info.liveSize[tag] += header->size();
         } else {
             deadCount++;
             deadSize += header->size();
+
+            size_t tag = info.getClassTag(Heap::gcInfo(header->gcInfoIndex()));
+            info.deadCount[tag]++;
+            info.deadSize[tag] += header->size();
         }
     }
 
     pageDump->AddScalar("live_count", "objects", liveCount);
     pageDump->AddScalar("dead_count", "objects", deadCount);
     pageDump->AddScalar("free_count", "objects", freeCount);
     pageDump->AddScalar("live_size", "bytes", liveSize);
     pageDump->AddScalar("dead_size", "bytes", deadSize);
     pageDump->AddScalar("free_size", "bytes", freeSize);
 }
@@ skipping 166 matching lines @@
 }
 
 void LargeObjectPage::markOrphaned()
 {
     // Zap the payload with a recognizable value to detect any incorrect
     // cross thread pointer usage.
     memset(payload(), orphanedZapValue, payloadSize());
     BasePage::markOrphaned();
 }
 
-void LargeObjectPage::takeSnapshot(String dumpName, size_t pageIndex)
+void LargeObjectPage::takeSnapshot(String dumpName, size_t pageIndex, ThreadState::GCSnapshotInfo& info)
 {
     dumpName.append(String::format("/pages/page_%lu", static_cast<unsigned long>(pageIndex)));
     WebMemoryAllocatorDump* pageDump = BlinkGCMemoryDumpProvider::instance()->createMemoryAllocatorDumpForCurrentGC(dumpName);
 
     size_t liveSize = 0;
     size_t deadSize = 0;
     size_t liveCount = 0;
     size_t deadCount = 0;
     HeapObjectHeader* header = heapObjectHeader();
+    size_t tag = info.getClassTag(Heap::gcInfo(header->gcInfoIndex()));
     if (header->isMarked()) {
         liveCount = 1;
         liveSize += header->size();
+        info.liveCount[tag]++;
+        info.liveSize[tag] += header->size();

[haraken, 2015/06/26 05:35:28]

header->size() => header->payloadSize()

header->size() is not valid for large objects.

[ssid, 2015/06/26 10:10:28]

Done.

     } else {
         deadCount = 1;
         deadSize += header->size();
+        info.deadCount[tag]++;
+        info.deadSize[tag] += header->size();

[haraken, 2015/06/26 05:35:28]

Ditto.

     }
 
     pageDump->AddScalar("live_count", "objects", liveCount);
     pageDump->AddScalar("dead_count", "objects", deadCount);
     pageDump->AddScalar("live_size", "bytes", liveSize);
     pageDump->AddScalar("dead_size", "bytes", deadSize);
 }
 
 #if ENABLE(GC_PROFILING)
 const GCInfo* LargeObjectPage::findGCInfo(Address address)
@@ skipping 718 matching lines @@
 size_t Heap::s_allocatedObjectSize = 0;
 size_t Heap::s_allocatedSpace = 0;
 size_t Heap::s_markedObjectSize = 0;
 // We don't want to use 0 KB for the initial value because it may end up
 // triggering the first GC of some thread too prematurely.
 size_t Heap::s_estimatedLiveObjectSize = 512 * 1024;
 size_t Heap::s_externalObjectSizeAtLastGC = 0;
 double Heap::s_estimatedMarkingTimePerByte = 0.0;
 
 } // namespace blink