cros: Log per-process memory use on low memory events

chrome/browser/chromeos/system/syslogs_provider.cc

 // Copyright (c) 2011 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/system/syslogs_provider.h"
 
-#include <functional>
-#include <set>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/string_util.h"
-#include "base/stringprintf.h"
-#include "base/utf_string_conversions.h"
 #include "chrome/browser/memory_details.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace chromeos {
 namespace system {
 namespace {
 
@@ skipping 214 matching lines @@
   SyslogsMemoryHandler(
       scoped_refptr<CancelableRequest<ReadCompleteCallback> > request,
       LogDictionaryType* logs,
       std::string* zip_content)
       : request_(request),
         logs_(logs),
         zip_content_(zip_content) {
   }
 
   virtual void OnDetailsAvailable() OVERRIDE {
-    const ProcessData& chrome = processes()[0];  // Chrome is the first entry.
-    // Process info, sorted by memory used (highest to lowest).
-    typedef std::pair<int, std::string> ProcInfo;
-    typedef std::set<ProcInfo, std::greater<ProcInfo> > ProcInfoSet;
-    ProcInfoSet process_info;
-    for (ProcessMemoryInformationList::const_iterator iter1 =
-             chrome.processes.begin();
-         iter1 != chrome.processes.end(); ++iter1) {
-      std::string process_string(
-          ProcessMemoryInformation::GetFullTypeNameInEnglish(
-              iter1->type, iter1->renderer_type));
-      if (!iter1->titles.empty()) {
-        std::string titles(" [");
-        for (std::vector<string16>::const_iterator iter2 =
-                 iter1->titles.begin();
-             iter2 != iter1->titles.end(); ++iter2) {
-          if (iter2 != iter1->titles.begin())
-            titles += "|";
-          titles += UTF16ToUTF8(*iter2);
-        }
-        titles += "]";
-        process_string += titles;
-      }
-      // Use private working set for memory used calculation.
-      int ws_mbytes = static_cast<int>(iter1->working_set.priv) / 1024;
-      process_info.insert(std::make_pair(ws_mbytes, process_string));
-    }
-    // Add one line for each reverse-sorted entry.
-    std::string mem_string;
-    for (ProcInfoSet::iterator iter = process_info.begin();
-         iter != process_info.end(); ++iter) {
-      mem_string +=
-          iter->second + base::StringPrintf(": %d MB", iter->first) + "\n";
-    }
-    (*logs_)["mem_usage"] = mem_string;
+    // TODO(jamescook): Maybe we don't need to do this?
+    UpdateHistograms();
+
+    (*logs_)["mem_usage"] = ToLogString();
     // This will call the callback on the calling thread.
     request_->ForwardResult(logs_, zip_content_);
   }
 
  private:
   virtual ~SyslogsMemoryHandler() {}
 
   scoped_refptr<CancelableRequest<ReadCompleteCallback> > request_;
   LogDictionaryType* logs_;
   std::string* zip_content_;
@@ skipping 72 matching lines @@
   return Singleton<SyslogsProviderImpl,
                    DefaultSingletonTraits<SyslogsProviderImpl> >::get();
 }
 
 SyslogsProvider* SyslogsProvider::GetInstance() {
   return SyslogsProviderImpl::GetInstance();
 }
 
 }  // namespace system
 }  // namespace chromeos