Adding freelist statistics to blink gc 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 501 matching lines @@
         sweepUnsweptPage();
     }
 }
 
 NormalPageHeap::NormalPageHeap(ThreadState* state, int index)
     : BaseHeap(state, index)
     , m_currentAllocationPoint(nullptr)
     , m_remainingAllocationSize(0)
     , m_lastRemainingAllocationSize(0)
     , m_promptlyFreedSize(0)
-#if ENABLE(GC_PROFILING)
     , m_cumulativeAllocationSize(0)
     , m_allocationCount(0)
     , m_inlineAllocationCount(0)
-#endif
 {
     clearFreeLists();
 }
 
 void NormalPageHeap::clearFreeLists()
 {
     setAllocationPoint(nullptr, 0);
     m_freeList.clear();
 }
 
@@ skipping 18 matching lines @@
 bool NormalPageHeap::pagesToBeSweptContains(Address address)
 {
     for (BasePage* page = m_firstUnsweptPage; page; page = page->next()) {
         if (page->contains(address))
             return true;
     }
     return false;
 }
 #endif
 
+void NormalPageHeap::takeFreelistSnapshot(String dumpName)
+{
+    dumpName.append("/buckets");
+    WebMemoryAllocatorDump* allocatorDump = BlinkGCMemoryDumpProvider::instance()->createMemoryAllocatorDumpForCurrentGC(dumpName);
+    allocatorDump->AddScalar("cumulative_allocation_size", "bytes", m_cumulativeAllocationSize);
+    allocatorDump->AddScalarF("inline_allocation_rate", static_cast<double>(m_inlineAllocationCount) / m_allocationCount);
+    allocatorDump->AddScalar("inline_allocation_count", "objects", m_inlineAllocationCount);
+    allocatorDump->AddScalar("allocation_count", "objects", m_allocationCount);
+
+    m_freeList.takeSnapshot(dumpName);
+}
+
 #if ENABLE(GC_PROFILING)
 void NormalPageHeap::snapshotFreeList(TracedValue& json)
 {
     json.setInteger("cumulativeAllocationSize", m_cumulativeAllocationSize);
     json.setDouble("inlineAllocationRate", static_cast<double>(m_inlineAllocationCount) / m_allocationCount);
     json.setInteger("inlineAllocationCount", m_inlineAllocationCount);
     json.setInteger("allocationCount", m_allocationCount);
     size_t pageCount = 0;
     size_t totalPageSize = 0;
     for (NormalPage* page = static_cast<NormalPage*>(m_firstPage); page; page = static_cast<NormalPage*>(page->next())) {
@@ skipping 538 matching lines @@
 {
     ASSERT(size > 0);
     int index = -1;
     while (size) {
         size >>= 1;
         index++;
     }
     return index;
 }
 
+void FreeList::takeSnapshot(const String& dumpBaseName)
+{
+    for (size_t i = 0; i < blinkPageSizeLog2; ++i) {
+        size_t entryCount = 0;
+        size_t freeSize = 0;
+        for (FreeListEntry* entry = m_freeLists[i]; entry; entry = entry->next()) {
+            ++entryCount;
+            freeSize += entry->size();
+        }
+
+        String dumpName = dumpBaseName.isolatedCopy();

[haraken, 2015/06/23 05:38:58]

Shall we pass in a String to takeSnapshot and avoid calling isolatedCopy?

[ssid, 2015/06/23 06:03:39]

hm, This is inside the for loop. I can't find a better way to do string append.
Do you have any other suggestions?

[haraken, 2015/06/23 06:24:24]

For string append, we're encouraged to use StringBuilder.

[ssid, 2015/06/23 07:39:56]

Sorry, i just realized it has a + operator, thought it looks cleaner. If you
still feel I should use StringBuilder, I will change it.

+        dumpName.append(String::format("/bucket_%lu", static_cast<unsigned long>(i)));

[haraken, 2015/06/23 05:38:58]

It would be more informative to use 2^i instead of i, since the bucket i
contains free slots of size [2^i, 2^(i+1)).

[ssid, 2015/06/23 07:39:56]

Done.

+        WebMemoryAllocatorDump* bucketDump = BlinkGCMemoryDumpProvider::instance()->createMemoryAllocatorDumpForCurrentGC(dumpName);
+        bucketDump->AddScalar("freelist_entry_count", "objects", entryCount);
+        bucketDump->AddScalar("free_size", "bytes", freeSize);
+    }
+}
+
 #if ENABLE(GC_PROFILING)
 void FreeList::getFreeSizeStats(PerBucketFreeListStats bucketStats[], size_t& totalFreeSize) const
 {
     totalFreeSize = 0;
     for (size_t i = 0; i < blinkPageSizeLog2; i++) {
         size_t& entryCount = bucketStats[i].entryCount;
         size_t& freeSize = bucketStats[i].freeSize;
         for (FreeListEntry* entry = m_freeLists[i]; entry; entry = entry->next()) {
             ++entryCount;
             freeSize += entry->size();
@@ skipping 313 matching lines @@
     // 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)
 {
-    dumpName.append(String::format("/page_%lu", static_cast<unsigned long>(pageIndex)));
+    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()) {
@@ skipping 188 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)
 {
-    dumpName.append(String::format("/page_%lu", static_cast<unsigned long>(pageIndex)));
+    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();
     if (header->isMarked()) {
         liveCount = 1;
         liveSize += header->size();
@@ 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