Adding heap-page statistics to blink-gc memory dump provider.

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 199 matching lines @@
     // 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)
 {
+    WebMemoryAllocatorDump* allocatorDump = BlinkGCMemoryDumpProvider::instance()->createMemoryAllocatorDumpForCurrentGC(dumpBaseName);
     size_t pageCount = 0;
     for (BasePage* page = m_firstUnsweptPage; page; page = page->next()) {
+        page->takeSnapshot(dumpBaseName, pageCount);
         pageCount++;
     }
-    WebMemoryAllocatorDump* allocatorDump = BlinkGCMemoryDumpProvider::instance()->createMemoryAllocatorDumpForCurrentGC(dumpBaseName);
     allocatorDump->AddScalar("blink_page_count", "objects", pageCount);
 }
 
 #if ENABLE(ASSERT) || ENABLE(GC_PROFILING)
 BasePage* BaseHeap::findPageFromAddress(Address address)
 {
     for (BasePage* page = m_firstPage; page; page = page->next()) {
         if (page->contains(address))
             return page;
     }
@@ skipping 1104 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(const String& dumpBaseName, size_t pageIndex)
+{
+    String pageName = dumpBaseName.isolatedCopy();
+    pageName.append(String::format("/page_%zu", pageIndex));

[Primiano Tucci (use gerrit), 2015/05/28 12:47:00]

maybe this is a bit more clear and efficient if you have
String pageName = String::format("%s/page_%zu", dumpBaseName, pageIndex)

[ssid, 2015/05/28 13:06:10]

With offline discussion, this seems better.

+    WebMemoryAllocatorDump* pageDump = BlinkGCMemoryDumpProvider::instance()->createMemoryAllocatorDumpForCurrentGC(pageName);
+
+    HeapObjectHeader* header = nullptr;
+    size_t objectCount = 0;
+    size_t liveCount = 0;
+    size_t deadCount = 0;
+    size_t freeCount = 0;
+    size_t liveSize = 0;
+    size_t deadSize = 0;
+    size_t freeSize = 0;
+    size_t encodedSize = 0;
+    for (Address addr = payload(); addr < payloadEnd(); addr += header->size()) {
+        header = reinterpret_cast<HeapObjectHeader*>(addr);
+        objectCount++;
+        encodedSize += header->encodedSize();

[Primiano Tucci (use gerrit), 2015/05/28 12:47:00]

as above, let's remove this.

[ssid, 2015/05/28 13:06:10]

Done.

+        if (header->isFree()) {
+            freeCount++;
+            freeSize += header->size();
+        } else if (header->isMarked()) {
+            liveCount++;
+            liveSize += header->size();
+        } else {
+            deadCount++;
+            deadSize += header->size();
+        }
+    }
+
+    pageDump->AddScalar("object_count", "objects", objectCount);
+    pageDump->AddScalar("encoded_size", "bytes", encodedSize);
+    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);
+}
+
 #if ENABLE(GC_PROFILING)
 const GCInfo* NormalPage::findGCInfo(Address address)
 {
     if (address < payload())
         return nullptr;
 
     HeapObjectHeader* header = findHeaderFromAddress(address);
     if (!header)
         return nullptr;
 
@@ skipping 147 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(const String& dumpBaseName, size_t pageIndex)
+{
+    String pageName = dumpBaseName.isolatedCopy();
+    pageName.append(String::format("/page_%zu", pageIndex));

[Primiano Tucci (use gerrit), 2015/05/28 12:47:00]

ditto here

[ssid, 2015/05/28 13:06:10]

ditto.

+    WebMemoryAllocatorDump* pageDump = BlinkGCMemoryDumpProvider::instance()->createMemoryAllocatorDumpForCurrentGC(pageName);
+
+    size_t liveSize = 0;
+    size_t deadSize = 0;
+    size_t liveCount = 0;
+    size_t deadCount = 0;
+    HeapObjectHeader* header = heapObjectHeader();
+    if (header->isMarked()) {
+        liveCount = 1;
+        liveSize += header->size();
+    } else {
+        deadCount = 1;
+        deadSize += header->size();
+    }
+
+    pageDump->AddScalar("object_count", "objects", 1u);
+    pageDump->AddScalar("live_count", "objects", liveCount);
+    pageDump->AddScalar("dead_count", "objects", deadCount);
+    pageDump->AddScalar("live_size", "bytes", liveSize);
+    pageDump->AddScalar("dead_size", "bytes", deadSize);
+    pageDump->AddScalar("free_size", "bytes", 0u);

[Primiano Tucci (use gerrit), 2015/05/28 12:47:00]

Don't dump these if you know that they don't apply for large object pages.
The UI should be smart enough to deal with missing values.

[ssid, 2015/05/28 13:06:09]

Done.

+    pageDump->AddScalar("free_count", "objects", 0u);
+}
+
 #if ENABLE(GC_PROFILING)
 const GCInfo* LargeObjectPage::findGCInfo(Address address)
 {
     if (!containedInObjectPayload(address))
         return nullptr;
     HeapObjectHeader* header = heapObjectHeader();
     return Heap::gcInfo(header->gcInfoIndex());
 }
 
 void LargeObjectPage::snapshot(TracedValue* json, ThreadState::SnapshotInfo* info)
@@ skipping 719 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