[tracing] Add SkResourceCache as suballocation to avoid double counting.

content/common/discardable_shared_memory_heap.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/discardable_shared_memory_heap.h"
 
 #include <algorithm>
 
 #include "base/format_macros.h"
 #include "base/memory/discardable_shared_memory.h"
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/memory_dump_manager.h"
 
 namespace content {
 namespace {
 
 bool IsPowerOfTwo(size_t x) {
   return (x & (x - 1)) == 0;
 }
 
 bool IsInFreeList(DiscardableSharedMemoryHeap::Span* span) {
   return span->previous() || span->next();
 }
 
+const char kDiscardableSegmentsDumpName[] = "discardable/segments";

[reveman, 2015/07/30 16:00:59]

We've been avoiding explicit constants for dump name strings. Is this different
or should we just use 'base::StringPrintf("discardable/segments/segment_%d",
...' below instead?

Btw, it would be a bit more appropriate if the DiscardableMemoryAllocator
controlled this prefix and just passed it to
DiscardableSharedMemoryHeap::OnMemoryDump but no need to fix that in this CL.

[ssid, 2015/07/30 20:05:15]

Done.

+
 }  // namespace
 
 DiscardableSharedMemoryHeap::Span::Span(
     base::DiscardableSharedMemory* shared_memory,
     size_t start,
     size_t length)
     : shared_memory_(shared_memory), start_(start), length_(length) {
 }
 
 DiscardableSharedMemoryHeap::Span::~Span() {
@@ skipping 183 matching lines @@
 size_t DiscardableSharedMemoryHeap::GetSize() const {
   return num_blocks_ * block_size_;
 }
 
 size_t DiscardableSharedMemoryHeap::GetSizeOfFreeLists() const {
   return num_free_blocks_ * block_size_;
 }
 
 bool DiscardableSharedMemoryHeap::OnMemoryDump(
     base::trace_event::ProcessMemoryDump* pmd) {
+  CreateAllocatedObjectsDump(pmd);

[reveman, 2015/07/30 16:00:59]

I think it should be the responsibility of the DiscardableMemoryAllocator to
create this node.

[ssid, 2015/07/30 20:05:15]

Yes, But then since i placed the method in this class, i called it here. Moved
the method and the calls to allocator.

   std::for_each(
       memory_segments_.begin(), memory_segments_.end(),
       [pmd](const ScopedMemorySegment* segment) {
         segment->OnMemoryDump(pmd);
       });
   return true;
 }
 
 void DiscardableSharedMemoryHeap::InsertIntoFreeList(
     scoped_ptr<DiscardableSharedMemoryHeap::Span> span) {
@@ skipping 111 matching lines @@
   size_t end = offset + size / block_size_;
   while (offset < end) {
     Span* span = spans_[offset];
     if (!IsInFreeList(span)) {
       allocated_objects_count++;
       allocated_objects_size_in_bytes += span->length_ * block_size_;
     }
     offset += span->length_;
   }
 
-  std::string segment_dump_name =
-      base::StringPrintf("discardable/segment_%d", segment_id);
+  std::string segment_dump_name = base::StringPrintf(
+      "%s/segment_%d", kDiscardableSegmentsDumpName, segment_id);
   base::trace_event::MemoryAllocatorDump* segment_dump =
       pmd->CreateAllocatorDump(segment_dump_name);
   segment_dump->AddScalar(base::trace_event::MemoryAllocatorDump::kNameSize,
                           base::trace_event::MemoryAllocatorDump::kUnitsBytes,
                           static_cast<uint64_t>(size));
 
   base::trace_event::MemoryAllocatorDump* obj_dump =
       pmd->CreateAllocatorDump(segment_dump_name + "/allocated_objects");
   obj_dump->AddScalar(base::trace_event::MemoryAllocatorDump::kNameObjectsCount,
                       base::trace_event::MemoryAllocatorDump::kUnitsObjects,
@@ skipping 13 matching lines @@
       GetSegmentGUIDForTracing(tracing_process_id, segment_id);
   pmd->CreateSharedGlobalAllocatorDump(shared_segment_guid);
 
   // By creating an edge with a higher |importance| (w.r.t. browser-side dumps)
   // the tracing UI will account the effective size of the segment to the child.
   const int kImportance = 2;
   pmd->AddOwnershipEdge(segment_dump->guid(), shared_segment_guid, kImportance);
 }
 
 // static
+void DiscardableSharedMemoryHeap::CreateAllocatedObjectsDump(
+    base::trace_event::ProcessMemoryDump* pmd) {
+  base::trace_event::MemoryAllocatorDump* objects_dump =
+      pmd->CreateAllocatorDump(
+          base::DiscardableSharedMemory::kAllocatedObjectsDumpName);
+  base::trace_event::MemoryAllocatorDump* discardable_segments_dump =
+      pmd->CreateAllocatorDump(kDiscardableSegmentsDumpName);
+
+  // The discardable memory segments will be dumped with
+  // kDiscardableSegmentsDumpName as the parent and will be owned by
+  // sub-allocations dumped with kAllocatedObjectsDumpName as their parent.
+  pmd->AddOwnershipEdge(objects_dump->guid(),
+                        discardable_segments_dump->guid());
+}
+
+// static
 base::trace_event::MemoryAllocatorDumpGuid
 DiscardableSharedMemoryHeap::GetSegmentGUIDForTracing(uint64 tracing_process_id,
                                                       int32 segment_id) {
   return base::trace_event::MemoryAllocatorDumpGuid(base::StringPrintf(
       "discardable-x-process/%" PRIx64 "/%d", tracing_process_id, segment_id));
 }
 
 }  // namespace content