Record renderer's memory growth 30min, 60min and 90min after purging separately.

content/renderer/render_thread_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 "content/renderer/render_thread_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <utility>
@@ skipping 229 matching lines @@
 #if defined(OS_ANDROID)
 // On Android, resource messages can each take ~1.5ms to dispatch on the browser
 // IO thread. Limiting the message rate to 3/frame at 60hz ensures that the
 // induced work takes but a fraction (~1/4) of the overall frame budget.
 const int kMaxResourceRequestsPerFlushWhenThrottled = 3;
 #else
 const int kMaxResourceRequestsPerFlushWhenThrottled = 8;
 #endif
 const double kThrottledResourceRequestFlushPeriodS = 1. / 60.;
 
+// Max count of reporting PurgeAndSuspend.Experimental.MemoryGrowth.*.
+const int kMaxCountOfReportMemoryGrowthMetrics = 2;
+
 // Maximum allocation size allowed for image scaling filters that
 // require pre-scaling. Skia will fallback to a filter that doesn't
 // require pre-scaling if the default filter would require an
 // allocation that exceeds this limit.
 const size_t kImageCacheSingleAllocationByteLimit = 64 * 1024 * 1024;
 
 #if defined(OS_ANDROID)
 // Unique identifier for each output surface created.
 uint32_t g_next_compositor_frame_sink_id = 1;
 #endif
@@ skipping 637 matching lines @@
 #if defined(OS_LINUX)
   ChildProcess::current()->SetIOThreadPriority(base::ThreadPriority::DISPLAY);
   ChildThreadImpl::current()->SetThreadPriority(
       categorized_worker_pool_->background_worker_thread_id(),
       base::ThreadPriority::BACKGROUND);
 #endif
 
   record_purge_suspend_growth_metric_closure_.Reset(
       base::Bind(&RenderThreadImpl::RecordPurgeAndSuspendMemoryGrowthMetrics,
                  base::Unretained(this)));
+  memory_growth_report_count_ = 0;
   needs_to_record_first_active_paint_ = false;
 
   base::MemoryCoordinatorClientRegistry::GetInstance()->Register(this);
 
   // If this renderer doesn't run inside the browser process, enable
   // SequencedWorkerPool. Otherwise, it should already have been enabled.
   // TODO(fdoray): Remove this once the SequencedWorkerPool to TaskScheduler
   // redirection experiment concludes https://crbug.com/622400.
   if (!command_line.HasSwitch(switches::kSingleProcess))
     base::SequencedWorkerPool::EnableForProcess();
@@ skipping 759 matching lines @@
 
   base::MemoryCoordinatorClientRegistry::GetInstance()->PurgeMemory();
   needs_to_record_first_active_paint_ = true;
 
   RendererMemoryMetrics memory_metrics;
   if (!GetRendererMemoryMetrics(&memory_metrics))
     return;
 
   purge_and_suspend_memory_metrics_ = memory_metrics;
   // record how many memory usage increases after purged.
+  memory_growth_report_count_ = 0;
   GetRendererScheduler()->DefaultTaskRunner()->PostDelayedTask(
       FROM_HERE, record_purge_suspend_growth_metric_closure_.callback(),
-      base::TimeDelta::FromMinutes(5));
-  GetRendererScheduler()->DefaultTaskRunner()->PostDelayedTask(
-      FROM_HERE, record_purge_suspend_growth_metric_closure_.callback(),
-      base::TimeDelta::FromMinutes(10));
-  GetRendererScheduler()->DefaultTaskRunner()->PostDelayedTask(
-      FROM_HERE, record_purge_suspend_growth_metric_closure_.callback(),
-      base::TimeDelta::FromMinutes(15));

[Ilya Sherman, 2017/05/09 03:58:58]

I think this previous structure was both simpler and clearer.  Why did you
decide to move away from it?  IMO it would be much nicer to simply bind the
strings "30min" etc. here.

[tasak, 2017/05/10 09:57:02]

Done.

+      base::TimeDelta::FromMinutes(30));
 }
 
 // TODO(tasak): Replace the following GetMallocUsage() with memory-infra
 // when it is possible to run memory-infra without tracing.
 #if defined(OS_WIN)
 namespace {
 
 static size_t GetMallocUsage() {
   // Iterate through whichever heap the CRT is using.
   HANDLE crt_heap = reinterpret_cast<HANDLE>(_get_heap_handle());
@@ skipping 81 matching lines @@
       total_allocated / render_view_count / 1024 / 1024;
 
   return true;
 }
 
 #define GET_MEMORY_GROWTH(current, previous, allocator) \
   (current.allocator > previous.allocator               \
        ? current.allocator - previous.allocator         \
        : 0)
 
-void RenderThreadImpl::RecordPurgeAndSuspendMemoryGrowthMetrics() const {
+#define UMA_HISTOGRAM_MEMORY_GROWTH(name)                                     \
+  UMA_HISTOGRAM_MEMORY_KB(                                                    \
+      "PurgeAndSuspend.Experimental.MemoryGrowth.PartitionAllocKB" name,      \
+      GET_MEMORY_GROWTH(memory_metrics, purge_and_suspend_memory_metrics_,    \
+                        partition_alloc_kb));                                 \
+  UMA_HISTOGRAM_MEMORY_KB(                                                    \
+      "PurgeAndSuspend.Experimental.MemoryGrowth.BlinkGCKB" name,             \
+      GET_MEMORY_GROWTH(memory_metrics, purge_and_suspend_memory_metrics_,    \
+                        blink_gc_kb));                                        \
+  UMA_HISTOGRAM_MEMORY_KB(                                                    \
+      "PurgeAndSuspend.Experimental.MemoryGrowth.MallocKB" name,              \
+      GET_MEMORY_GROWTH(memory_metrics, purge_and_suspend_memory_metrics_,    \
+                        malloc_mb) *                                          \
+          1024);                                                              \
+  UMA_HISTOGRAM_MEMORY_KB(                                                    \
+      "PurgeAndSuspend.Experimental.MemoryGrowth.DiscardableKB" name,         \
+      GET_MEMORY_GROWTH(memory_metrics, purge_and_suspend_memory_metrics_,    \
+                        discardable_kb));                                     \
+  UMA_HISTOGRAM_MEMORY_KB(                                                    \
+      "PurgeAndSuspend.Experimental.MemoryGrowth.V8MainThreadIsolateKB" name, \
+      GET_MEMORY_GROWTH(memory_metrics, purge_and_suspend_memory_metrics_,    \
+                        v8_main_thread_isolate_mb) *                          \
+          1024);                                                              \
+  UMA_HISTOGRAM_MEMORY_KB(                                                    \
+      "PurgeAndSuspend.Experimental.MemoryGrowth.TotalAllocatedKB" name,      \
+      GET_MEMORY_GROWTH(memory_metrics, purge_and_suspend_memory_metrics_,    \
+                        total_allocated_mb) *                                 \
+          1024);
+
+void RenderThreadImpl::RecordPurgeAndSuspendMemoryGrowthMetrics() {
   // If this renderer is resumed, we should not update UMA.
   if (!RendererIsHidden())
     return;
+  if (memory_growth_report_count_ > kMaxCountOfReportMemoryGrowthMetrics)
+    return;
 
   RendererMemoryMetrics memory_metrics;
   if (!GetRendererMemoryMetrics(&memory_metrics))
     return;
 
-  UMA_HISTOGRAM_MEMORY_KB(
-      "PurgeAndSuspend.Experimental.MemoryGrowth.PartitionAllocKB",
-      GET_MEMORY_GROWTH(memory_metrics, purge_and_suspend_memory_metrics_,
-                        partition_alloc_kb));
-  UMA_HISTOGRAM_MEMORY_KB(
-      "PurgeAndSuspend.Experimental.MemoryGrowth.BlinkGCKB",
-      GET_MEMORY_GROWTH(memory_metrics, purge_and_suspend_memory_metrics_,
-                        blink_gc_kb));
-  UMA_HISTOGRAM_MEMORY_KB(
-      "PurgeAndSuspend.Experimental.MemoryGrowth.MallocKB",
-      GET_MEMORY_GROWTH(memory_metrics, purge_and_suspend_memory_metrics_,
-                        malloc_mb) * 1024);
-  UMA_HISTOGRAM_MEMORY_KB(
-      "PurgeAndSuspend.Experimental.MemoryGrowth.DiscardableKB",
-      GET_MEMORY_GROWTH(memory_metrics, purge_and_suspend_memory_metrics_,
-                        discardable_kb));
-  UMA_HISTOGRAM_MEMORY_KB(
-      "PurgeAndSuspend.Experimental.MemoryGrowth.V8MainThreadIsolateKB",
-      GET_MEMORY_GROWTH(memory_metrics, purge_and_suspend_memory_metrics_,
-                        v8_main_thread_isolate_mb) * 1024);
-  UMA_HISTOGRAM_MEMORY_KB(
-      "PurgeAndSuspend.Experimental.MemoryGrowth.TotalAllocatedKB",
-      GET_MEMORY_GROWTH(memory_metrics, purge_and_suspend_memory_metrics_,
-                        total_allocated_mb) * 1024);
+  switch (memory_growth_report_count_) {
+    case 0:
+      UMA_HISTOGRAM_MEMORY_GROWTH(".30min");
+      ++memory_growth_report_count_;
+      break;
+    case 1:
+      UMA_HISTOGRAM_MEMORY_GROWTH(".60min");
+      ++memory_growth_report_count_;
+      break;
+    case 2:
+      UMA_HISTOGRAM_MEMORY_GROWTH(".90min");

[Ilya Sherman, 2017/05/09 03:58:58]

Optional nit: I think it'd be a bit cleaner to have the dot included in the
macro.

[tasak, 2017/05/10 09:57:02]

Done.

+      ++memory_growth_report_count_;
+      break;
+  }
+  GetRendererScheduler()->DefaultTaskRunner()->PostDelayedTask(
+      FROM_HERE, record_purge_suspend_growth_metric_closure_.callback(),
+      base::TimeDelta::FromMinutes(30));
 }
 
 scoped_refptr<gpu::GpuChannelHost> RenderThreadImpl::EstablishGpuChannelSync() {
   TRACE_EVENT0("gpu", "RenderThreadImpl::EstablishGpuChannelSync");
 
   if (gpu_channel_) {
     // Do nothing if we already have a GPU channel or are already
     // establishing one.
     if (!gpu_channel_->IsLost())
       return gpu_channel_;
@@ skipping 602 matching lines @@
   }
 }
 
 void RenderThreadImpl::OnRendererInterfaceRequest(
     mojom::RendererAssociatedRequest request) {
   DCHECK(!renderer_binding_.is_bound());
   renderer_binding_.Bind(std::move(request));
 }
 
 }  // namespace content