cros: Add UMA stat for graphics driver memory on tab discard

chrome/browser/chromeos/memory/oom_priority_manager.cc

 // Copyright (c) 2012 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/chromeos/memory/oom_priority_manager.h"
 
 #include <algorithm>
 #include <set>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/process.h"
 #include "base/process_util.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
+#include "base/stringprintf.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/memory/low_memory_observer.h"
 #include "chrome/browser/memory_details.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
@@ skipping 73 matching lines @@
 
 OomMemoryDetails::OomMemoryDetails() {
   AddRef();  // Released in OnDetailsAvailable().
   start_time_ = TimeTicks::Now();
 }
 
 void OomMemoryDetails::OnDetailsAvailable() {
   TimeDelta delta = TimeTicks::Now() - start_time_;
   // These logs are collected by user feedback reports.  We want them to help
   // diagnose user-reported problems with frequently discarded tabs.
+  std::string log_string = ToLogString();
+  base::SystemMemoryInfoKB memory;
+  if (base::GetSystemMemoryInfo(&memory) && memory.gem_size != -1) {
+    log_string += StringPrintf("Graphics %lld MB",
+                               memory.gem_size / 1024 / 1024);

[DaveMoore, 2012/12/07 18:52:48]

Use ui::FormatBytes() instead. You can find it in
ui/base/text/bytes_formatting.h

[James Cook, 2012/12/07 19:41:22]

Done.

+  }
   LOG(WARNING) << "OOM details (" << delta.InMilliseconds() << " ms):\n"
-      << ToLogString();
+      << log_string;
   if (g_browser_process && g_browser_process->oom_priority_manager())
     g_browser_process->oom_priority_manager()->DiscardTab();
   // Delete ourselves so we don't have to worry about OomPriorityManager
   // deleting us when we're still working.
   Release();
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 149 matching lines @@
     int interval_ms = static_cast<int>(interval.InMilliseconds());
     // Record time in milliseconds over an interval of approximately 1 day.
     // Start at 100 ms to get extra resolution in the target 750 ms range.
     EXPERIMENT_CUSTOM_COUNTS(
         "Tabs.Discard.IntervalTime2", interval_ms, 100, 100000 * 1000, 50);
   }
   // Record Chrome's concept of system memory usage at the time of the discard.
   base::SystemMemoryInfoKB memory;
   if (base::GetSystemMemoryInfo(&memory)) {
     int mem_anonymous_mb = (memory.active_anon + memory.inactive_anon) / 1024;
+    // TODO(jamescook): Remove this after R25 is deployed to stable. It does
+    // not have sufficient resolution in the 2-4 GB range and has been replaced
+    // by Tabs.Discard.MemAnonymousMB2 below.
     EXPERIMENT_HISTOGRAM_MEGABYTES("Tabs.Discard.MemAnonymousMB",
                                    mem_anonymous_mb);
+    EXPERIMENT_CUSTOM_COUNTS("Tabs.Discard.MemAnonymousMB2", mem_anonymous_mb,
+                             256, 32768, 50)
 
     int mem_available_mb =
         (memory.active_file + memory.inactive_file + memory.free) / 1024;
     EXPERIMENT_HISTOGRAM_MEGABYTES("Tabs.Discard.MemAvailableMB",
                                    mem_available_mb);
+
+    if (memory.gem_size != -1) {

[DaveMoore, 2012/12/07 18:52:48]

If you do this on Intel you will double count memory. On ARM that's not the
case. I don't know why, but the drivers appear to allocate the memory
differently

[James Cook, 2012/12/07 19:41:22]

Replaced with a MemAllocatedMB stat that tracks both anonymous pages from
malloc() and non-anonymous graphics driver pages on ARM.

+      int mem_graphics_mb = memory.gem_size / 1024 / 1024;
+      EXPERIMENT_HISTOGRAM_MEGABYTES("Tabs.Discard.MemGraphicsMB",
+                                     mem_graphics_mb);
+    }
   }
   // Set up to record the next interval.
   last_discard_time_ = TimeTicks::Now();
 }
 
 int OomPriorityManager::GetTabCount() const {
   int tab_count = 0;
   for (BrowserList::const_iterator browser_it = BrowserList::begin();
       browser_it != BrowserList::end(); ++browser_it) {
     Browser* browser = *browser_it;
@@ skipping 210 matching lines @@
         content::ZygoteHost::GetInstance()->AdjustRendererOOMScore(
             iterator->renderer_handle, score);
         pid_to_oom_score_[iterator->renderer_handle] = score;
       }
       priority += priority_increment;
     }
   }
 }
 
 }  // namespace chromeos