Native memory histograms for the browser.

content/browser/browser_main_loop.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 "content/browser/browser_main_loop.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/hi_res_timer_manager.h"
@@ skipping 28 matching lines @@
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 #include "content/public/common/result_codes.h"
 #include "crypto/nss_util.h"
 #include "media/audio/audio_manager.h"
 #include "net/base/network_change_notifier.h"
 #include "net/base/ssl_config_service.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/socket/tcp_client_socket.h"
 #include "ui/base/clipboard/clipboard.h"
+#include "webkit/glue/webkit_glue.h"
 
 #if defined(USE_AURA)
 #include "content/browser/renderer_host/image_transport_factory.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"
 #include "content/browser/android/surface_texture_peer_browser_impl.h"
 #include "content/browser/device_orientation/data_fetcher_impl_android.h"
 #endif
@@ skipping 156 matching lines @@
 #else
     NOTIMPLEMENTED();
 #endif
   }
 };
 
 void ImmediateShutdownAndExitProcess() {
   BrowserShutdownImpl::ImmediateShutdownAndExitProcess();
 }
 
+// For measuring memory usage after each task. Behind a command line flag.
+class BrowserMainLoop::MemoryObserver : public MessageLoop::TaskObserver {
+ public:
+  MemoryObserver() {}

[jochen (gone - plz use gerrit), 2013/01/18 14:03:11]

should have a virtual destructor

[marja, 2013/01/18 15:00:08]

Done.

+
+  virtual void WillProcessTask(base::TimeTicks time_posted) OVERRIDE {}
+
+  virtual void DidProcessTask(base::TimeTicks time_posted) OVERRIDE {
+    LOG(WARNING) << "Adding to browserused " << webkit_glue::MemoryUsageKB();

[jochen (gone - plz use gerrit), 2013/01/18 14:03:11]

remove?

[marja, 2013/01/18 15:00:08]

Oops.

+    HISTOGRAM_MEMORY_KB("Memory.BrowserUsed", webkit_glue::MemoryUsageKB());
+  }
+ private:
+  DISALLOW_COPY_AND_ASSIGN(MemoryObserver);
+};
+
+
 // static
 media::AudioManager* BrowserMainLoop::GetAudioManager() {
   return g_current_browser_main_loop->audio_manager_.get();
 }
 
 // static
 AudioMirroringManager* BrowserMainLoop::GetAudioMirroringManager() {
   return g_current_browser_main_loop->audio_mirroring_manager_.get();
 }
 
@@ skipping 126 matching lines @@
 
   if (parts_.get())
     parts_->PostMainMessageLoopStart();
 
 #if defined(OS_ANDROID)
   SurfaceTexturePeer::InitInstance(new SurfaceTexturePeerBrowserImpl(
       parameters_.command_line.HasSwitch(
           switches::kMediaPlayerInRenderProcess)));
   DataFetcherImplAndroid::Init(base::android::AttachCurrentThread());
 #endif
+
+  if (parsed_command_line_.HasSwitch(switches::kMemoryMetrics)) {
+    memory_observer_.reset(new MemoryObserver());
+    main_message_loop_->AddTaskObserver(memory_observer_.get());
+  }
 }
 
 void BrowserMainLoop::CreateThreads() {
   if (parts_.get())
     result_code_ = parts_->PreCreateThreads();
 
 #if !defined(OS_IOS) && (!defined(GOOGLE_CHROME_BUILD) || defined(OS_ANDROID))
   // Single-process is an unsupported and not fully tested mode, so
   // don't enable it for official Chrome builds (except on Android).
   if (parsed_command_line_.HasSwitch(switches::kSingleProcess))
@@ skipping 362 matching lines @@
   DCHECK_EQ(MessageLoop::TYPE_UI, MessageLoop::current()->type());
   if (parameters_.ui_task)
     MessageLoopForUI::current()->PostTask(FROM_HERE, *parameters_.ui_task);
 
   base::RunLoop run_loop;
   run_loop.Run();
 #endif
 }
 
 }  // namespace content