Add Memory.RenderAll metrics to track renderers at a higher level.

chrome/browser/metrics/metrics_memory_details.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 "chrome/browser/metrics/metrics_memory_details.h"
 
 #include <stddef.h>
 
 #include <vector>
 
@@ skipping 54 matching lines @@
 MetricsMemoryDetails::~MetricsMemoryDetails() {
 }
 
 void MetricsMemoryDetails::OnDetailsAvailable() {
   UpdateHistograms();
   base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, callback_);
 }
 
 void MetricsMemoryDetails::UpdateHistograms() {
   // Reports a set of memory metrics to UMA.
-  // Memory is measured in KB.
 
   const ProcessData& browser = *ChromeBrowser();
   size_t aggregate_memory = 0;
   int chrome_count = 0;
   int extension_count = 0;
   int pepper_plugin_count = 0;
   int pepper_plugin_broker_count = 0;
   int renderer_count = 0;
   int other_count = 0;
   int worker_count = 0;
   int process_limit = content::RenderProcessHost::GetMaxRendererProcessCount();
   for (size_t index = 0; index < browser.processes.size(); index++) {
     int sample = static_cast<int>(browser.processes[index].working_set.priv);
     size_t committed = browser.processes[index].committed.priv +
                        browser.processes[index].committed.mapped +
                        browser.processes[index].committed.image;
     aggregate_memory += sample;
     switch (browser.processes[index].process_type) {
       case content::PROCESS_TYPE_BROWSER:
         UMA_HISTOGRAM_MEMORY_LARGE_MB("Memory.Browser.Large2", sample / 1024);
         UMA_HISTOGRAM_MEMORY_LARGE_MB("Memory.Browser.Committed",
                                       committed / 1024);
         continue;
       case content::PROCESS_TYPE_RENDERER: {
+        UMA_HISTOGRAM_MEMORY_LARGE_MB("Memory.RendererAll", sample / 1024);
+        UMA_HISTOGRAM_MEMORY_LARGE_MB("Memory.RendererAll.Committed",
+                                      committed / 1024);
         ProcessMemoryInformation::RendererProcessType renderer_type =
             browser.processes[index].renderer_type;
         switch (renderer_type) {
           case ProcessMemoryInformation::RENDERER_EXTENSION:
             UMA_HISTOGRAM_MEMORY_KB("Memory.Extension", sample);
             extension_count++;
             continue;
           case ProcessMemoryInformation::RENDERER_CHROME:
             UMA_HISTOGRAM_MEMORY_KB("Memory.Chrome", sample);
             chrome_count++;
@@ skipping 83 matching lines @@
   UMA_HISTOGRAM_COUNTS_100("Memory.OtherProcessCount", other_count);
   UMA_HISTOGRAM_COUNTS_100("Memory.PepperPluginProcessCount",
                            pepper_plugin_count);
   UMA_HISTOGRAM_COUNTS_100("Memory.PepperPluginBrokerProcessCount",
                            pepper_plugin_broker_count);
   UMA_HISTOGRAM_COUNTS_100("Memory.RendererProcessCount", renderer_count);
   UMA_HISTOGRAM_COUNTS_100("Memory.WorkerProcessCount", worker_count);
   // TODO(viettrungluu): Do we want separate counts for the other
   // (platform-specific) process types?
 
-  // TODO(rkaplow): Remove once we've verified Memory.Total2 is ok.
-  int total_sample_old = static_cast<int>(aggregate_memory / 1000);
-  UMA_HISTOGRAM_MEMORY_MB("Memory.Total", total_sample_old);
   int total_sample = static_cast<int>(aggregate_memory / 1024);
   UMA_HISTOGRAM_MEMORY_LARGE_MB("Memory.Total2", total_sample);
 
   // Predict the number of processes needed when isolating all sites and when
   // isolating only HTTPS sites.
   int all_renderer_count = renderer_count + chrome_count + extension_count;
   int non_renderer_count = browser.processes.size() - all_renderer_count;
   DCHECK_GE(non_renderer_count, 1);
   SiteDetails::UpdateHistograms(browser.site_data, all_renderer_count,
                                 non_renderer_count);
@@ skipping 89 matching lines @@
   UMA_HISTOGRAM_CUSTOM_COUNTS("Memory.Swap.NumWrites", swap_info().num_writes,
                               1, 100000000, 100);
 
   if (swap_info().orig_data_size > 0 && swap_info().compr_data_size > 0) {
     UMA_HISTOGRAM_CUSTOM_COUNTS(
         "Memory.Swap.CompressionRatio",
         swap_info().orig_data_size / swap_info().compr_data_size, 1, 20, 20);
   }
 }
 #endif  // defined(OS_CHROMEOS)