Add a histogram for renderer memory usage.

webkit/glue/webkitplatformsupport_impl.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 "webkit/glue/webkitplatformsupport_impl.h"
 
-#if defined(OS_LINUX)
-#include <malloc.h>
-#endif
-
 #include <math.h>
 
 #include <vector>
 
 #include "base/allocator/allocator_extension.h"
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
@@ skipping 17 matching lines @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginListBuilder.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCookie.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebData.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
 #include "ui/base/layout.h"
 #include "webkit/base/file_path_string_conversions.h"
 #include "webkit/compositor_bindings/web_compositor_support_impl.h"
+#include "webkit/glue/memory_usage.h"
 #include "webkit/glue/touch_fling_gesture_curve.h"
 #include "webkit/glue/websocketstreamhandle_impl.h"
 #include "webkit/glue/webthread_impl.h"
 #include "webkit/glue/weburlloader_impl.h"
 #include "webkit/glue/worker_task_runner.h"
 #include "webkit/media/audio_decoder.h"
 #include "webkit/plugins/npapi/plugin_instance.h"
 #include "webkit/plugins/webplugininfo.h"
 #include "webkit/user_agent/user_agent.h"
 
 #if defined(OS_ANDROID)
 #include "webkit/glue/fling_animator_impl_android.h"
 #endif
 
-#if defined(OS_LINUX)
-#include "v8/include/v8.h"
-#endif
-
 using WebKit::WebAudioBus;
 using WebKit::WebCookie;
 using WebKit::WebData;
 using WebKit::WebLocalizedString;
 using WebKit::WebPluginListBuilder;
 using WebKit::WebString;
 using WebKit::WebSocketStreamHandle;
 using WebKit::WebThemeEngine;
 using WebKit::WebURL;
 using WebKit::WebURLLoader;
@@ skipping 673 matching lines @@
       // The default port provider is sufficient to get data for the current
       // process.
       ProcessMetrics::CreateProcessMetrics(base::GetCurrentProcessHandle(),
                                            NULL));
 #else
   return scoped_ptr<ProcessMetrics>(
       ProcessMetrics::CreateProcessMetrics(base::GetCurrentProcessHandle()));
 #endif
 }
 
-#if defined(OS_LINUX) || defined(OS_ANDROID)
-static size_t memoryUsageMB() {
-  struct mallinfo minfo = mallinfo();
-  uint64_t mem_usage =
-#if defined(USE_TCMALLOC)
-      minfo.uordblks
-#else
-      (minfo.hblkhd + minfo.arena)
-#endif
-      >> 20;
-
-  v8::HeapStatistics stat;
-  v8::V8::GetHeapStatistics(&stat);
-  return mem_usage + (static_cast<uint64_t>(stat.total_heap_size()) >> 20);
-}
-#elif defined(OS_MACOSX)
-static size_t memoryUsageMB() {
-  return CurrentProcessMetrics()->GetWorkingSetSize() >> 20;
-}
-#else
-static size_t memoryUsageMB() {
-  return CurrentProcessMetrics()->GetPagefileUsage() >> 20;
-}
-#endif
-
 static size_t getMemoryUsageMB(bool bypass_cache) {
   size_t current_mem_usage = 0;
   MemoryUsageCache* mem_usage_cache_singleton = MemoryUsageCache::GetInstance();
   if (!bypass_cache &&
       mem_usage_cache_singleton->IsCachedValueValid(&current_mem_usage))
     return current_mem_usage;
 
-  current_mem_usage = memoryUsageMB();
+  current_mem_usage = memoryUsageKB() >> 10;
   mem_usage_cache_singleton->SetMemoryValue(current_mem_usage);
   return current_mem_usage;
 }
 
 size_t WebKitPlatformSupportImpl::memoryUsageMB() {
   return getMemoryUsageMB(false);
 }
 
 size_t WebKitPlatformSupportImpl::actualMemoryUsageMB() {
   return getMemoryUsageMB(true);
@@ skipping 74 matching lines @@
 #endif
 
   if (device_source == WebKit::WebGestureEvent::Touchscreen)
     return TouchFlingGestureCurve::CreateForTouchScreen(velocity,
                                                         cumulative_scroll);
 
   return TouchFlingGestureCurve::CreateForTouchPad(velocity, cumulative_scroll);
 }
 
 }  // namespace webkit_glue