A deeper heap profile dumper in third_party/tcmalloc/chromium.

third_party/tcmalloc/chromium/src/heap-profiler.cc

Index: third_party/tcmalloc/chromium/src/heap-profiler.cc
diff --git a/third_party/tcmalloc/chromium/src/heap-profiler.cc b/third_party/tcmalloc/chromium/src/heap-profiler.cc
index 4df8321f3943fb5067ffbb6bcf3cb661e6251b29..d663e70862837228ea23181bef91eede2820abe1 100644
--- a/third_party/tcmalloc/chromium/src/heap-profiler.cc
+++ b/third_party/tcmalloc/chromium/src/heap-profiler.cc
@@ -68,6 +68,7 @@
 #include "base/spinlock.h"
 #include "base/low_level_alloc.h"
 #include "base/sysinfo.h"      // for GetUniquePathFromEnv()
+#include "deep-heap-profile.h"
 #include "heap-profile-table.h"
 #include "memory_region_map.h"
 
@@ -121,6 +122,9 @@ DEFINE_bool(only_mmap_profile,
             EnvToBool("HEAP_PROFILE_ONLY_MMAP", false),
             "If heap-profiling is on, only profile mmap, mremap, and sbrk; "
             "do not profile malloc/new/etc");
+DEFINE_bool(deep_heap_profile,
+            EnvToBool("DEEP_HEAP_PROFILE", false),
+            "If heap-profiling is on, profile deeper (only on Linux)");
 
 
 //----------------------------------------------------------------------
@@ -179,6 +183,7 @@ static int64 high_water_mark = 0;     // In-use-bytes at last high-water dump
 static int64 last_dump_time = 0;      // The time of the last dump
 
 static HeapProfileTable* heap_profile = NULL;  // the heap profile table
+static DeepHeapProfile* deep_profile = NULL;  // deep memory profiler
 
 //----------------------------------------------------------------------
 // Profile generation
@@ -197,7 +202,11 @@ static char* DoGetHeapProfileLocked(char* buf, int buflen) {
     if (FLAGS_mmap_profile) {
       heap_profile->RefreshMMapData();
     }
-    bytes_written = heap_profile->FillOrderedProfile(buf, buflen - 1);
+    if (FLAGS_deep_heap_profile) {

[jar (doing other things), 2012/01/27 00:46:58]

nit: IMO, more clearly correct is to test:
if (deep_profile) 
here and on line 523.

I don't like when we have two ways to decide stuff... and it seems nicer to use
the authoritative item that is needed for the code at line 206 (or line 525).

[Dai Mikurube (NOT FULLTIME), 2012/01/30 12:54:53]

Agreed.  Done it.

On 2012/01/27 00:46:58, jar wrote:

+      bytes_written = deep_profile->FillOrderedProfile(buf, buflen - 1);
+    } else {
+      bytes_written = heap_profile->FillOrderedProfile(buf, buflen - 1);
+    }
     if (FLAGS_mmap_profile) {
       heap_profile->ClearMMapData();
     }
@@ -463,6 +472,13 @@ extern "C" void HeapProfilerStart(const char* prefix) {
   high_water_mark = 0;
   last_dump_time = 0;
 
+  if (FLAGS_deep_heap_profile) {
+    // Initialize deep memory profiler
+    RAW_VLOG(0, "[%d] Starting a deep memory profiler", getpid());
+    deep_profile = new(ProfilerMalloc(sizeof(DeepHeapProfile)))
+        DeepHeapProfile(heap_profile, prefix);
+  }
+
   // We do not reset dump_count so if the user does a sequence of
   // HeapProfilerStart/HeapProfileStop, we will get a continuous
   // sequence of profiles.
@@ -504,6 +520,13 @@ extern "C" void HeapProfilerStop() {
     RAW_CHECK(MallocHook::RemoveMunmapHook(&MunmapHook), "");
   }
 
+  if (FLAGS_deep_heap_profile) {
+    // free deep memory profiler
+    deep_profile->~DeepHeapProfile();
+    ProfilerFree(deep_profile);
+    deep_profile = NULL;
+  }
+
   // free profile
   heap_profile->~HeapProfileTable();
   ProfilerFree(heap_profile);