Reenable Purge+Suspend Memory Growth metrics.

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 1677 matching lines @@
     return;
 
   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;
+  GetRendererScheduler()->DefaultTaskRunner()->PostDelayedTask(
+      FROM_HERE,
+      base::Bind(&RenderThreadImpl::RecordPurgeAndSuspendMemoryGrowthMetrics,
+                 base::Unretained(this), process_foregrounded_count_,
+                 RECORD_30MIN_AFTER_PURGE),
+      base::TimeDelta::FromMinutes(30));
+  GetRendererScheduler()->DefaultTaskRunner()->PostDelayedTask(
+      FROM_HERE,
+      base::Bind(&RenderThreadImpl::RecordPurgeAndSuspendMemoryGrowthMetrics,
+                 base::Unretained(this), process_foregrounded_count_,
+                 RECORD_60MIN_AFTER_PURGE),
+      base::TimeDelta::FromMinutes(60));
+  GetRendererScheduler()->DefaultTaskRunner()->PostDelayedTask(
+      FROM_HERE,
+      base::Bind(&RenderThreadImpl::RecordPurgeAndSuspendMemoryGrowthMetrics,
+                 base::Unretained(this), process_foregrounded_count_,
+                 RECORD_90MIN_AFTER_PURGE),
+      base::TimeDelta::FromMinutes(90));
 }
 
 // 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)
 
-#define UMA_HISTOGRAM_MEMORY_GROWTH_KB(basename, suffix, memory_usage) \
-  {                                                                    \
-    std::string histogram_name =                                       \
-        base::StringPrintf("%s.%s", basename, suffix);                 \
-    UMA_HISTOGRAM_MEMORY_KB(histogram_name, memory_usage);             \
-  }
+#define UMA_PURGE_AND_SUSPEND_MEMORY_GROWTH(suffix, memory_metrics)        \
+  UMA_HISTOGRAM_MEMORY_KB(                                                 \
+      "PurgeAndSuspend.Experimental.MemoryGrowth.PartitionAllocKB" suffix, \
+      GET_MEMORY_GROWTH(memory_metrics, purge_and_suspend_memory_metrics_, \
+                        partition_alloc_kb));                              \
+  UMA_HISTOGRAM_MEMORY_KB(                                                 \
+      "PurgeAndSuspend.Experimental.MemoryGrowth.BlinkGCKB" suffix,        \
+      GET_MEMORY_GROWTH(memory_metrics, purge_and_suspend_memory_metrics_, \
+                        blink_gc_kb));                                     \
+  UMA_HISTOGRAM_MEMORY_KB(                                                 \
+      "PurgeAndSuspend.Experimental.MemoryGrowth.MallocKB" suffix,         \
+      GET_MEMORY_GROWTH(memory_metrics, purge_and_suspend_memory_metrics_, \
+                        malloc_mb) *                                       \
+          1024);                                                           \
+  UMA_HISTOGRAM_MEMORY_KB(                                                 \
+      "PurgeAndSuspend.Experimental.MemoryGrowth.DiscardableKB" suffix,    \
+      GET_MEMORY_GROWTH(memory_metrics, purge_and_suspend_memory_metrics_, \
+                        discardable_kb));                                  \
+  UMA_HISTOGRAM_MEMORY_KB(                                                 \
+      "PurgeAndSuspend.Experimental.MemoryGrowth."                         \
+      "V8MainThreadIsolateKB" suffix,                                      \
+      GET_MEMORY_GROWTH(memory_metrics, purge_and_suspend_memory_metrics_, \
+                        v8_main_thread_isolate_mb) *                       \
+          1024);                                                           \
+  UMA_HISTOGRAM_MEMORY_KB(                                                 \

[Ilya Sherman, 2017/05/22 20:28:01]

Could you use base::UmaHistogramMemoryKB() and avoid the messy macros?

[tasak, 2017/05/23 05:15:16]

Done.

+      "PurgeAndSuspend.Experimental.MemoryGrowth.TotalAllocatedKB" suffix, \
+      GET_MEMORY_GROWTH(memory_metrics, purge_and_suspend_memory_metrics_, \
+                        total_allocated_mb) *                              \
+          1024);
 
 void RenderThreadImpl::RecordPurgeAndSuspendMemoryGrowthMetrics(
-    const char* suffix,
-    int foregrounded_count_when_purged) {
+    int foregrounded_count_when_purged,
+    RenderThreadImpl::RecordMemoryGrowthTiming record_timing) {
   // If this renderer is resumed, we should not update UMA.
   if (!RendererIsHidden())
     return;
   if (foregrounded_count_when_purged != process_foregrounded_count_)
     return;
 
   RendererMemoryMetrics memory_metrics;
   if (!GetRendererMemoryMetrics(&memory_metrics))
     return;
 
-  UMA_HISTOGRAM_MEMORY_GROWTH_KB(
-      "PurgeAndSuspend.Experimental.MemoryGrowth.PartitionAllocKB", suffix,
-      GET_MEMORY_GROWTH(memory_metrics, purge_and_suspend_memory_metrics_,
-                        partition_alloc_kb));
-  UMA_HISTOGRAM_MEMORY_GROWTH_KB(
-      "PurgeAndSuspend.Experimental.MemoryGrowth.BlinkGCKB", suffix,
-      GET_MEMORY_GROWTH(memory_metrics, purge_and_suspend_memory_metrics_,
-                        blink_gc_kb));
-  UMA_HISTOGRAM_MEMORY_GROWTH_KB(
-      "PurgeAndSuspend.Experimental.MemoryGrowth.MallocKB", suffix,
-      GET_MEMORY_GROWTH(memory_metrics, purge_and_suspend_memory_metrics_,
-                        malloc_mb) *
-          1024);
-  UMA_HISTOGRAM_MEMORY_GROWTH_KB(
-      "PurgeAndSuspend.Experimental.MemoryGrowth.DiscardableKB", suffix,
-      GET_MEMORY_GROWTH(memory_metrics, purge_and_suspend_memory_metrics_,
-                        discardable_kb));
-  UMA_HISTOGRAM_MEMORY_GROWTH_KB(
-      "PurgeAndSuspend.Experimental.MemoryGrowth.V8MainThreadIsolateKB", suffix,
-      GET_MEMORY_GROWTH(memory_metrics, purge_and_suspend_memory_metrics_,
-                        v8_main_thread_isolate_mb) *
-          1024);
-  UMA_HISTOGRAM_MEMORY_GROWTH_KB(
-      "PurgeAndSuspend.Experimental.MemoryGrowth.TotalAllocatedKB", suffix,
-      GET_MEMORY_GROWTH(memory_metrics, purge_and_suspend_memory_metrics_,
-                        total_allocated_mb) *
-          1024);
+  switch (record_timing) {
+    case RECORD_30MIN_AFTER_PURGE:
+      UMA_PURGE_AND_SUSPEND_MEMORY_GROWTH("30min", memory_metrics);
+      break;
+    case RECORD_60MIN_AFTER_PURGE:
+      UMA_PURGE_AND_SUSPEND_MEMORY_GROWTH("60min", memory_metrics);
+      break;
+    case RECORD_90MIN_AFTER_PURGE:
+      UMA_PURGE_AND_SUSPEND_MEMORY_GROWTH("90min", memory_metrics);
+      break;
+    default:
+      NOTREACHED();

[Ilya Sherman, 2017/05/22 20:28:01]

nit: In general, it's discouraged to have default cases in switch statements. 
Without a default stmt, the compiler can catch omitted cases and issue a
warning.

[tasak, 2017/05/23 05:15:16]

Done.

+  }
 }
 
 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