[tracing] Avoid double-counting blink_gc free stats in memory-infra

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 244 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)
 {
+    // |dumpBaseName| at this point is "blink_gc/thread_X/heaps/HeapName"
     WebMemoryAllocatorDump* allocatorDump = BlinkGCMemoryDumpProvider::instance()->createMemoryAllocatorDumpForCurrentGC(dumpBaseName);
     size_t pageIndex = 0;
+    size_t heapTotalFreeSize = 0;
+    size_t heapTotalFreeCount = 0;
     for (BasePage* page = m_firstUnsweptPage; page; page = page->next()) {
-        page->takeSnapshot(dumpBaseName, pageIndex);
+        size_t heapPageFreeSize = 0;
+        size_t heapPageFreeCount = 0;
+        page->takeSnapshot(dumpBaseName, pageIndex, &heapPageFreeSize, &heapPageFreeCount);
+        heapTotalFreeSize += heapPageFreeSize;
+        heapTotalFreeCount += heapPageFreeCount;
         pageIndex++;
     }
     allocatorDump->AddScalar("blink_page_count", "objects", pageIndex);
+
+    // When taking a full dump (w/ freelist), both the /buckets and /pages
+    // report their free size but they are not meant to be added together.
+    // Therefore, here we override the free_size of the parent heap to be
+    // eqauel to the free_size of the sum of its heap pages.

[haraken, 2015/06/29 11:55:29]

equal

+    allocatorDump->AddScalar("free_size", "bytes", heapTotalFreeSize);
+    allocatorDump->AddScalar("free_count", "objects", heapTotalFreeCount);
 }
 
 #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;
     }
     for (BasePage* page = m_firstUnsweptPage; page; page = page->next()) {
@@ skipping 861 matching lines @@
     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 + String::format("/buckets/bucket_%lu", static_cast<unsigned long>(1 << i));
         WebMemoryAllocatorDump* bucketDump = BlinkGCMemoryDumpProvider::instance()->createMemoryAllocatorDumpForCurrentGC(dumpName);
-        bucketDump->AddScalar("freelist_entry_count", "objects", entryCount);
+        bucketDump->AddScalar("free_count", "objects", entryCount);
         bucketDump->AddScalar("free_size", "bytes", freeSize);
         didDumpBucketStats = true;
     }
     return didDumpBucketStats;
 }
 
 #if ENABLE(GC_PROFILING)
 void FreeList::getFreeSizeStats(PerBucketFreeListStats bucketStats[], size_t& totalFreeSize) const
 {
     totalFreeSize = 0;
@@ skipping 316 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, size_t* outFreeSize, size_t* outFreeCount)
 {
     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;
@@ skipping 11 matching lines @@
             deadSize += 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);
+    *outFreeSize = freeSize;
+    *outFreeCount = freeCount;
 }
 
 #if ENABLE(GC_PROFILING)
 const GCInfo* NormalPage::findGCInfo(Address address)
 {
     if (address < payload())
         return nullptr;
 
     HeapObjectHeader* header = findHeaderFromAddress(address);
     if (!header)
@@ skipping 157 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, size_t* outFreeSize, size_t* outFreeCount)
 {
     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()) {
@@ skipping 733 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