Commit 5d22d7c8 authored by Siddhartha's avatar Siddhartha Committed by Commit Bot

MemoryInfra: Group site_storage dumps and enable missing providers in background mode.

The site_storage dumps do not have child categories and the graph
processor is unable to group them by type of storage. So, group the
dumps under correct child dumps to get metrics.
Also enable missing MDP in background mode: FontCaches, BlobStorage.

BUG=730783

Change-Id: I07d0cf8a98c53c4eaaceda3c05610bd765df6222
Reviewed-on: https://chromium-review.googlesource.com/961530
Commit-Queue: Siddhartha S <ssid@chromium.org>
Reviewed-by: default avatarMarijn Kruisselbrink <mek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#543109}
parent b4927e75
......@@ -23,6 +23,7 @@ const char* const kDumpProviderWhitelist[] = {
"AutocompleteController",
"BlinkGC",
"BlinkObjectCounters",
"BlobStorageContext",
"ClientDiscardableSharedMemoryManager",
"DOMStorage",
"DownloadService",
......@@ -30,6 +31,7 @@ const char* const kDumpProviderWhitelist[] = {
"gpu::BufferManager",
"gpu::RenderbufferManager",
"gpu::TextureManager",
"FontCaches",
"HistoryReport",
"IndexedDBBackingStore",
"InMemoryURLIndex",
......@@ -117,6 +119,8 @@ const char* const kAllocatorDumpNameWhitelist[] = {
"extensions/value_store/Extensions.Database.Open/0x?",
"extensions/value_store/Extensions.Database.Restore/0x?",
"extensions/value_store/Extensions.Database.Value.Restore/0x?",
"font_caches/font_platform_data_cache",
"font_caches/shape_caches",
"gpu/gl/buffers/share_group_0x?",
"gpu/gl/renderbuffers/share_group_0x?",
"gpu/gl/textures/share_group_0x?",
......@@ -235,11 +239,12 @@ const char* const kAllocatorDumpNameWhitelist[] = {
"v8/isolate_0x?/zapped_for_debug",
"winheap",
"winheap/allocated_objects",
"site_storage/blob_storage/0x?",
"site_storage/index_db/0x?",
"site_storage/localstorage_0x?/cache_size",
"site_storage/localstorage_0x?/leveldb",
"site_storage/session_storage_0x?",
"site_storage/session_storage_0x?/cache_size",
"site_storage/localstorage/0x?/cache_size",
"site_storage/localstorage/0x?/leveldb",
"site_storage/session_storage/0x?",
"site_storage/session_storage/0x?/cache_size",
"sync/0x?/kernel",
"sync/0x?/store",
"sync/0x?/model_type/APP",
......
......@@ -414,7 +414,7 @@ bool DOMStorageContextImpl::OnMemoryDump(
DOMStorageNamespace::UsageStatistics total_stats =
GetTotalNamespaceStatistics(namespaces_);
auto* mad = pmd->CreateAllocatorDump(base::StringPrintf(
"site_storage/session_storage_0x%" PRIXPTR "/cache_size",
"site_storage/session_storage/0x%" PRIXPTR "/cache_size",
reinterpret_cast<uintptr_t>(this)));
mad->AddScalar(base::trace_event::MemoryAllocatorDump::kNameSize,
base::trace_event::MemoryAllocatorDump::kUnitsBytes,
......
......@@ -570,7 +570,7 @@ bool LocalStorageContextMojo::OnMemoryDump(
return true;
std::string context_name =
base::StringPrintf("site_storage/localstorage_0x%" PRIXPTR,
base::StringPrintf("site_storage/localstorage/0x%" PRIXPTR,
reinterpret_cast<uintptr_t>(this));
// Account for leveldb memory usage, which actually lives in the file service.
......
......@@ -390,7 +390,7 @@ void SessionStorageDatabase::OnMemoryDump(
return;
auto* mad = pmd->CreateAllocatorDump(
base::StringPrintf("site_storage/session_storage_0x%" PRIXPTR,
base::StringPrintf("site_storage/session_storage/0x%" PRIXPTR,
reinterpret_cast<uintptr_t>(this)));
pmd->AddOwnershipEdge(mad->guid(), tracker_dump->guid());
mad->AddScalar(base::trace_event::MemoryAllocatorDump::kNameSize,
......
......@@ -666,7 +666,7 @@ bool BlobStorageContext::OnMemoryDump(
->system_allocator_pool_name();
auto* mad = pmd->CreateAllocatorDump(
base::StringPrintf("site_storage/blob_storage_0x%" PRIXPTR,
base::StringPrintf("site_storage/blob_storage/0x%" PRIXPTR,
reinterpret_cast<uintptr_t>(this)));
mad->AddScalar(base::trace_event::MemoryAllocatorDump::kNameSize,
base::trace_event::MemoryAllocatorDump::kUnitsBytes,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment