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

skia/ext/skia_memory_dump_provider.cc

 // Copyright 2015 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 "skia_memory_dump_provider.h"
 
 #include "base/trace_event/memory_allocator_dump.h"
 #include "base/trace_event/memory_dump_manager.h"
 #include "base/trace_event/process_memory_dump.h"
 #include "third_party/skia/include/core/SkGraphics.h"
 #include "third_party/skia/src/core/SkResourceCache.h"
 
 namespace skia {
 
 // static
 SkiaMemoryDumpProvider* SkiaMemoryDumpProvider::GetInstance() {
   return Singleton<SkiaMemoryDumpProvider,
                    LeakySingletonTraits<SkiaMemoryDumpProvider>>::get();
 }
 
 SkiaMemoryDumpProvider::SkiaMemoryDumpProvider() {}
 
 SkiaMemoryDumpProvider::~SkiaMemoryDumpProvider() {}
 
 bool SkiaMemoryDumpProvider::OnMemoryDump(
     base::trace_event::ProcessMemoryDump* process_memory_dump) {
   auto font_mad =
       process_memory_dump->CreateAllocatorDump("skia/sk_font_cache");
-  font_mad->AddScalar("size", "bytes", SkGraphics::GetFontCacheUsed());
-  font_mad->AddScalar("count", "objects", SkGraphics::GetFontCacheCountUsed());
+  font_mad->AddScalar(base::trace_event::MemoryAllocatorDump::kNameSize,
+                      base::trace_event::MemoryAllocatorDump::kUnitsBytes,
+                      SkGraphics::GetFontCacheUsed());
+  font_mad->AddScalar(base::trace_event::MemoryAllocatorDump::kNameObjectsCount,
+                      base::trace_event::MemoryAllocatorDump::kUnitsObjects,
+                      SkGraphics::GetFontCacheCountUsed());
 
-  auto resource_mad =
-      process_memory_dump->CreateAllocatorDump("skia/sk_resource_cache");
-  resource_mad->AddScalar("size", "bytes",
-                          SkResourceCache::GetTotalBytesUsed());
-  // TODO(ssid): crbug.com/503168. Add sub-allocation edges from discardable or
-  // malloc memory dumps to avoid double counting.
-
+  size_t skia_resource_cache_size = SkResourceCache::GetTotalBytesUsed();
+  if (skia_resource_cache_size > 0) {

[petrcermak, 2015/07/29 11:53:34]

Shouldn't we report zero explicitly as well?

[ssid, 2015/07/29 16:20:51]

Yea i think it makes more sense to dump 0

+    auto resource_mad =
+        process_memory_dump->CreateAllocatorDump("skia/sk_resource_cache");
+    resource_mad->AddScalar(base::trace_event::MemoryAllocatorDump::kNameSize,
+                            base::trace_event::MemoryAllocatorDump::kUnitsBytes,
+                            skia_resource_cache_size);
+    if (SkResourceCache::GetDiscardableFactory()) {
+      process_memory_dump->AddSuballocation(resource_mad->guid(),

[petrcermak, 2015/07/29 11:53:34]

You could use a ternary operator or factor out the name to reduce code
duplication.

+                                            "discardable/allocated_objects");
+    } else {
+      process_memory_dump->AddSuballocation(resource_mad->guid(),
+                                            "malloc/allocated_objects");

[petrcermak, 2015/07/29 11:53:34]

Please use the base::trace_event::MallocDumpProvider::kAllocatedObjects constant
instead.

[ssid, 2015/07/29 16:20:51]

Done.

+    }
+  }
   return true;
 }
 
 }  // namespace skia