Provide access to process private and shared memory size from WebKit code

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
 
@@ skipping 651 matching lines @@
   return 0;
 }
 
 WebKit::WebString WebKitPlatformSupportImpl::signedPublicKeyAndChallengeString(
     unsigned key_size_index,
     const WebKit::WebString& challenge,
     const WebKit::WebURL& url) {
   return WebKit::WebString("");
 }
 
+static base::ProcessMetrics* CurrentProcessMetrics() {
+  using base::ProcessMetrics;
+#if defined(OS_MACOSX)
+  static ProcessMetrics* process_metrics =
+      // The default port provider is sufficient to get data for the current
+      // process.
+      ProcessMetrics::CreateProcessMetrics(base::GetCurrentProcessHandle(),
+                                           NULL);
+#else
+  static ProcessMetrics* process_metrics =
+      ProcessMetrics::CreateProcessMetrics(base::GetCurrentProcessHandle());
+#endif
+  DCHECK(process_metrics);
+  return process_metrics;
+}
+
 #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() {
-  using base::ProcessMetrics;
-  static ProcessMetrics* process_metrics =
-      // The default port provider is sufficient to get data for the current
-      // process.
-      ProcessMetrics::CreateProcessMetrics(base::GetCurrentProcessHandle(),
-                                           NULL);
-  DCHECK(process_metrics);
-  return process_metrics->GetWorkingSetSize() >> 20;

[ulan, 2012/09/21 13:30:08]

Just noticed that this is missing in the current ToT.

Was this removed intentionally? 

GetPagefileUsage() returns virtual memory size and therefore greatly
overestimates real memory usage. This causes WebKit to send bogus low memory
notifications to V8 and leads to big GC pauses. It is better to use
GetWorkingSetSize(). 

[yurys, 2012/09/21 13:52:12]

Looks like GetWorkingSetSize was deleted by mistake when I extracted
CurrentProcessMetrics function. We should return it back.

-}
 #else
 static size_t memoryUsageMB() {
-  using base::ProcessMetrics;
-  static ProcessMetrics* process_metrics =
-      ProcessMetrics::CreateProcessMetrics(base::GetCurrentProcessHandle());
-  DCHECK(process_metrics);
-  return process_metrics->GetPagefileUsage() >> 20;
+  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;
 
@@ skipping 26 matching lines @@
 size_t WebKitPlatformSupportImpl::highUsageDeltaMB() {
   // If memory usage is above highMemoryUsageMB() and memory usage increased by
   // more than highUsageDeltaMB() since the last GC, then force GC.
   // Note that this limit should be greater than the amount of memory for V8
   // internal data structures that are released on GC and reallocated during JS
   // execution (about 8MB). Otherwise, it will cause too aggressive GCs.
   return base::SysInfo::DalvikHeapSizeMB() / 8;
 }
 #endif
 
+bool WebKitPlatformSupportImpl::processMemorySizesInBytes(
+    size_t* private_bytes,
+    size_t* shared_bytes) {
+  return CurrentProcessMetrics()->GetMemoryBytes(private_bytes, shared_bytes);
+}
+
 void WebKitPlatformSupportImpl::SuspendSharedTimer() {
   ++shared_timer_suspended_;
 }
 
 void WebKitPlatformSupportImpl::ResumeSharedTimer() {
   // The shared timer may have fired or been adjusted while we were suspended.
   if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning()) {
     setSharedTimerFireInterval(
         shared_timer_fire_time_ - monotonicallyIncreasingTime());
   }
@@ skipping 12 matching lines @@
   worker_task_runner->OnWorkerRunLoopStarted(runLoop);
 }
 
 void WebKitPlatformSupportImpl::didStopWorkerRunLoop(
     const WebKit::WebWorkerRunLoop& runLoop) {
   WorkerTaskRunner* worker_task_runner = WorkerTaskRunner::Instance();
   worker_task_runner->OnWorkerRunLoopStopped(runLoop);
 }
 
 }  // namespace webkit_glue