Commit edcb9adc authored by Siddhartha's avatar Siddhartha Committed by Commit Bot

MemoryInfra: Report all provider metrics to UKM

Most of the metrics were added to UKM in:
https://chromium-review.googlesource.com/c/chromium/src/+/939904
Some metrics were missed due to privacy review being stale.
This CL adds the remaining metrics after updating privacy doc

BUG=730783

Change-Id: Iec4cc7d6cc4f90c7fb57a9bd8cad23eef7e3dce9
Reviewed-on: https://chromium-review.googlesource.com/961538Reviewed-by: default avatarRobert Kaplow <rkaplow@chromium.org>
Commit-Queue: Siddhartha S <ssid@chromium.org>
Cr-Commit-Position: refs/heads/master@{#543497}
parent 9e48d4d4
...@@ -61,15 +61,21 @@ const char* const kDumpProviderWhitelist[] = { ...@@ -61,15 +61,21 @@ const char* const kDumpProviderWhitelist[] = {
// dump. So, the effective size will not be correct. // dump. So, the effective size will not be correct.
const char* const kDumpProviderSummaryWhitelist[] = { const char* const kDumpProviderSummaryWhitelist[] = {
"android::ResourceManagerImpl", "android::ResourceManagerImpl",
"AutocompleteController",
"BlinkGC", "BlinkGC",
"BlinkObjectCounters", "BlinkObjectCounters",
"BlobStorageContext",
"ClientDiscardableSharedMemoryManager", "ClientDiscardableSharedMemoryManager",
"DOMStorage",
"DownloadService",
"DiscardableSharedMemoryManager", "DiscardableSharedMemoryManager",
"gpu::BufferManager", "gpu::BufferManager",
"gpu::RenderbufferManager", "gpu::RenderbufferManager",
"gpu::TextureManager", "gpu::TextureManager",
"FontCaches",
"HistoryReport", "HistoryReport",
"IndexedDBBackingStore", "IndexedDBBackingStore",
"InMemoryURLIndex",
"JavaHeap", "JavaHeap",
"LevelDB", "LevelDB",
"LeveldbValueStore", "LeveldbValueStore",
...@@ -237,8 +243,6 @@ const char* const kAllocatorDumpNameWhitelist[] = { ...@@ -237,8 +243,6 @@ const char* const kAllocatorDumpNameWhitelist[] = {
"v8/isolate_0x?/heap_spaces/other_spaces", "v8/isolate_0x?/heap_spaces/other_spaces",
"v8/isolate_0x?/malloc", "v8/isolate_0x?/malloc",
"v8/isolate_0x?/zapped_for_debug", "v8/isolate_0x?/zapped_for_debug",
"winheap",
"winheap/allocated_objects",
"site_storage/blob_storage/0x?", "site_storage/blob_storage/0x?",
"site_storage/index_db/0x?", "site_storage/index_db/0x?",
"site_storage/localstorage/0x?/cache_size", "site_storage/localstorage/0x?/cache_size",
......
...@@ -57,10 +57,14 @@ const Metric kAllocatorDumpNamesForMetrics[] = { ...@@ -57,10 +57,14 @@ const Metric kAllocatorDumpNamesForMetrics[] = {
{"blink_objects/Node", "NumberOfNodes", {"blink_objects/Node", "NumberOfNodes",
base::trace_event::MemoryAllocatorDump::kNameObjectCount, base::trace_event::MemoryAllocatorDump::kNameObjectCount,
&Memory_Experimental::SetNumberOfNodes}, &Memory_Experimental::SetNumberOfNodes},
{"components/download", "DownloadService", kEffectiveSize,
&Memory_Experimental::SetDownloadService},
{"discardable", "Discardable", kEffectiveSize, {"discardable", "Discardable", kEffectiveSize,
&Memory_Experimental::SetDiscardable}, &Memory_Experimental::SetDiscardable},
{"extensions/value_store", "Extensions.ValueStore", kEffectiveSize, {"extensions/value_store", "Extensions.ValueStore", kEffectiveSize,
&Memory_Experimental::SetExtensions_ValueStore}, &Memory_Experimental::SetExtensions_ValueStore},
{"font_caches", "FontCaches", kEffectiveSize,
&Memory_Experimental::SetFontCaches},
{"gpu/gl", "CommandBuffer", kEffectiveSize, {"gpu/gl", "CommandBuffer", kEffectiveSize,
&Memory_Experimental::SetCommandBuffer}, &Memory_Experimental::SetCommandBuffer},
{"history", "History", kEffectiveSize, &Memory_Experimental::SetHistory}, {"history", "History", kEffectiveSize, &Memory_Experimental::SetHistory},
...@@ -75,6 +79,8 @@ const Metric kAllocatorDumpNamesForMetrics[] = { ...@@ -75,6 +79,8 @@ const Metric kAllocatorDumpNamesForMetrics[] = {
{"net", "Net", kEffectiveSize, &Memory_Experimental::SetNet}, {"net", "Net", kEffectiveSize, &Memory_Experimental::SetNet},
{"net/url_request_context", "Net.UrlRequestContext", kEffectiveSize, {"net/url_request_context", "Net.UrlRequestContext", kEffectiveSize,
&Memory_Experimental::SetNet_UrlRequestContext}, &Memory_Experimental::SetNet_UrlRequestContext},
{"omnibox", "OmniboxSuggestions", kEffectiveSize,
&Memory_Experimental::SetOmniboxSuggestions},
{"partition_alloc", "PartitionAlloc", kEffectiveSize, {"partition_alloc", "PartitionAlloc", kEffectiveSize,
&Memory_Experimental::SetPartitionAlloc}, &Memory_Experimental::SetPartitionAlloc},
{"partition_alloc/allocated_objects", "PartitionAlloc.AllocatedObjects", {"partition_alloc/allocated_objects", "PartitionAlloc.AllocatedObjects",
...@@ -91,9 +97,10 @@ const Metric kAllocatorDumpNamesForMetrics[] = { ...@@ -91,9 +97,10 @@ const Metric kAllocatorDumpNamesForMetrics[] = {
kEffectiveSize, &Memory_Experimental::SetPartitionAlloc_Partitions_Layout}, kEffectiveSize, &Memory_Experimental::SetPartitionAlloc_Partitions_Layout},
{"site_storage", "SiteStorage", kEffectiveSize, {"site_storage", "SiteStorage", kEffectiveSize,
&Memory_Experimental::SetSiteStorage}, &Memory_Experimental::SetSiteStorage},
{"site_storage/blob_storage", "SiteStorage.BlobStorage", kEffectiveSize,
&Memory_Experimental::SetSiteStorage_BlobStorage},
{"site_storage/index_db", "SiteStorage.IndexDB", kEffectiveSize, {"site_storage/index_db", "SiteStorage.IndexDB", kEffectiveSize,
&Memory_Experimental::SetSiteStorage_IndexDB}, &Memory_Experimental::SetSiteStorage_IndexDB},
// TODO(ssid): This metric does not return total value.
{"site_storage/localstorage", "SiteStorage.LocalStorage", kEffectiveSize, {"site_storage/localstorage", "SiteStorage.LocalStorage", kEffectiveSize,
&Memory_Experimental::SetSiteStorage_LocalStorage}, &Memory_Experimental::SetSiteStorage_LocalStorage},
{"site_storage/session_storage", "SiteStorage.SessionStorage", {"site_storage/session_storage", "SiteStorage.SessionStorage",
......
...@@ -1461,11 +1461,22 @@ be describing additional metrics about the same event. ...@@ -1461,11 +1461,22 @@ be describing additional metrics about the same event.
Measure of memory consumed by Discardable memory service. Measure of memory consumed by Discardable memory service.
</summary> </summary>
</metric> </metric>
<metric name="DownloadService">
<summary>
Measure of memory used by download service.
</summary>
</metric>
<metric name="Extensions.ValueStore"> <metric name="Extensions.ValueStore">
<summary> <summary>
Measure of memory consumed by Key Value Store databases of extensions. Measure of memory consumed by Key Value Store databases of extensions.
</summary> </summary>
</metric> </metric>
<metric name="FontCaches">
<summary>
Measure of memory used by font platform and shape caches in renderer
process.
</summary>
</metric>
<metric name="History"> <metric name="History">
<summary> <summary>
Approximate measure of memory consumed by History service. Approximate measure of memory consumed by History service.
...@@ -1534,6 +1545,11 @@ be describing additional metrics about the same event. ...@@ -1534,6 +1545,11 @@ be describing additional metrics about the same event.
The number of nodes that the associated renderer owns. The number of nodes that the associated renderer owns.
</summary> </summary>
</metric> </metric>
<metric name="OmniboxSuggestions">
<summary>
Measure of memory used due to URL indexing and autocomplete suggestions.
</summary>
</metric>
<metric name="PartitionAlloc"> <metric name="PartitionAlloc">
<summary> <summary>
Measure of memory allocated by PartitionAlloc allocator. Measure of memory allocated by PartitionAlloc allocator.
...@@ -1597,6 +1613,11 @@ be describing additional metrics about the same event. ...@@ -1597,6 +1613,11 @@ be describing additional metrics about the same event.
Measure of memory used due to web storage APIs in browser process. Measure of memory used due to web storage APIs in browser process.
</summary> </summary>
</metric> </metric>
<metric name="SiteStorage.BlobStorage">
<summary>
Measure of memory used by in-memory blob file API in browser process.
</summary>
</metric>
<metric name="SiteStorage.IndexDB"> <metric name="SiteStorage.IndexDB">
<summary> <summary>
Measure of memory used due to IndexedDB API in browser process. Measure of memory used due to IndexedDB API in browser process.
......
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