Record Chrome trace events in tcmalloc heap profiles

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 0b07a5e8662da230e481839dcb5f62b521f9359d..e5f974aef383ee3323b1e60f06bf589ec4c725e7 100644
--- a/third_party/tcmalloc/chromium/src/heap-profiler.cc
+++ b/third_party/tcmalloc/chromium/src/heap-profiler.cc
@@ -222,6 +222,11 @@ 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
 
+// Callback to generate a stack trace for an allocation. May be overriden
+// by an application to provide its own pseudo-stacks.
+static StackGeneratorFunction stack_generator_function =
+    &HeapProfileTable::GetCallerStackTrace;
+
 //----------------------------------------------------------------------
 // Profile generation
 //----------------------------------------------------------------------
@@ -374,7 +379,7 @@ static void MaybeDumpProfileLocked() {
 static void RecordAlloc(const void* ptr, size_t bytes, int skip_count) {
   // Take the stack trace outside the critical section.
   void* stack[HeapProfileTable::kMaxStackDepth];
-  int depth = HeapProfileTable::GetCallerStackTrace(skip_count + 1, stack);
+  int depth = (*stack_generator_function)(skip_count + 1, stack);

[James Cook, 2013/07/02 21:20:41]

FYI - I manually tested both pseudo-stack profiles and normal stack unwind
profiles.  Both work OK with this patch.

   SpinLockHolder l(&heap_lock);
   if (is_on) {
     heap_profile->RecordAlloc(ptr, bytes, depth, stack);
@@ -542,12 +547,25 @@ extern "C" void HeapProfilerStart(const char* prefix) {
     RAW_CHECK(MallocHook::AddDeleteHook(&DeleteHook), "");
   }
 
-  // Copy filename prefix
-  RAW_DCHECK(filename_prefix == NULL, "");
-  const int prefix_length = strlen(prefix);
-  filename_prefix = reinterpret_cast<char*>(ProfilerMalloc(prefix_length + 1));
-  memcpy(filename_prefix, prefix, prefix_length);
-  filename_prefix[prefix_length] = '\0';
+  // Copy filename prefix if provided.
+  if (prefix) {

[jar (doing other things), 2013/07/04 02:18:30]

nit: (personal?): Early return?

[James Cook, 2013/07/08 23:21:34]

Done.

+    RAW_DCHECK(filename_prefix == NULL, "");
+    const int prefix_length = strlen(prefix);
+    filename_prefix =
+        reinterpret_cast<char*>(ProfilerMalloc(prefix_length + 1));
+    memcpy(filename_prefix, prefix, prefix_length);
+    filename_prefix[prefix_length] = '\0';
+  }
+}
+
+extern "C" void HeapProfilerWithPseudoStackStart(
+    StackGeneratorFunction callback) {
+  {
+    // Ensure the callback is set before allocations can be recorded.
+    SpinLockHolder l(&heap_lock);
+    stack_generator_function = callback;
+  }
+  HeapProfilerStart(NULL);
 }
 
 extern "C" void IterateAllocatedObjects(AddressVisitor visitor, void* data) {