Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(312)

Unified Diff: content/renderer/renderer_main.cc

Issue 11829032: Add a histogram for renderer memory usage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: moar build fixes Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/public/common/content_switches.cc ('k') | webkit/glue/webkit_glue.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/renderer_main.cc
diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc
index 0909aacc0ec7e35a63710a0e8529f7fe45524f20..f5bc21b895225e5c999f3a6feee8f910224dc34e 100644
--- a/content/renderer/renderer_main.cc
+++ b/content/renderer/renderer_main.cc
@@ -30,6 +30,7 @@
#include "content/renderer/render_thread_impl.h"
#include "content/renderer/renderer_main_platform_delegate.h"
#include "ui/base/ui_base_switches.h"
+#include "webkit/glue/webkit_glue.h"
#include "webkit/plugins/ppapi/ppapi_interface_factory.h"
#if defined(OS_MACOSX)
@@ -84,6 +85,20 @@ class RendererMessageLoopObserver : public MessageLoop::TaskObserver {
DISALLOW_COPY_AND_ASSIGN(RendererMessageLoopObserver);
};
+// For measuring memory usage after each task. Behind a command line flag.
+class MemoryObserver : public MessageLoop::TaskObserver {
+ public:
+ MemoryObserver() {}
+
+ virtual void WillProcessTask(base::TimeTicks time_posted) OVERRIDE {}
+
+ virtual void DidProcessTask(base::TimeTicks time_posted) OVERRIDE {
+ HISTOGRAM_MEMORY_KB("Memory.RendererUsed", webkit_glue::MemoryUsageKB());
+ }
+ private:
+ DISALLOW_COPY_AND_ASSIGN(MemoryObserver);
+};
+
// mainline routine for running as the Renderer process
int RendererMain(const MainFunctionParams& parameters) {
TRACE_EVENT_BEGIN_ETW("RendererMain", 0, "");
@@ -135,6 +150,12 @@ int RendererMain(const MainFunctionParams& parameters) {
#endif
main_message_loop.AddTaskObserver(&task_observer);
+ scoped_ptr<MemoryObserver> memory_observer;
+ if (parsed_command_line.HasSwitch(switches::kMemoryMetrics)) {
+ memory_observer.reset(new MemoryObserver());
+ main_message_loop.AddTaskObserver(memory_observer.get());
+ }
+
base::PlatformThread::SetName("CrRendererMain");
base::SystemMonitor system_monitor;
« no previous file with comments | « content/public/common/content_switches.cc ('k') | webkit/glue/webkit_glue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698