Heap Profiler: Add trace category group names as type names for allocations

base/trace_event/trace_log.cc

 // Copyright 2015 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 "base/trace_event/trace_log.h"
 
 #include <algorithm>
 #include <cmath>
 #include <memory>
 #include <utility>
@@ skipping 133 matching lines @@
   bool FilterTraceEvent(const TraceEvent& trace_event) const override {
     if (AllocationContextTracker::capture_mode() !=
         AllocationContextTracker::CaptureMode::PSEUDO_STACK) {
       return true;
     }
 
     // TODO(primiano): Add support for events with copied name crbug.com/581079.
     if (trace_event.flags() & TRACE_EVENT_FLAG_COPY)
       return true;
 
+    const char* category_name =
+        TraceLog::GetCategoryGroupName(trace_event.category_group_enabled());
     if (trace_event.phase() == TRACE_EVENT_PHASE_BEGIN ||
         trace_event.phase() == TRACE_EVENT_PHASE_COMPLETE) {
       AllocationContextTracker::GetInstanceForCurrentThread()
-          ->PushPseudoStackFrame(trace_event.name());
+          ->PushPseudoStackFrame({category_name, trace_event.name()});
     } else if (trace_event.phase() == TRACE_EVENT_PHASE_END) {
       // The pop for |TRACE_EVENT_PHASE_COMPLETE| events is in |EndEvent|.
       AllocationContextTracker::GetInstanceForCurrentThread()
-          ->PopPseudoStackFrame(trace_event.name());
+          ->PopPseudoStackFrame({category_name, trace_event.name()});
     }
     // Do not filter-out any events and always return true. TraceLog adds the
     // event only if it is enabled for recording.
     return true;
   }
 
   void EndEvent(const char* name, const char* category_group) override {
     if (AllocationContextTracker::capture_mode() ==
         AllocationContextTracker::CaptureMode::PSEUDO_STACK) {
       AllocationContextTracker::GetInstanceForCurrentThread()
-          ->PopPseudoStackFrame(name);
+          ->PopPseudoStackFrame({category_group, name});
     }
   }
 };
 
 TraceLog::TraceEventFilterConstructorForTesting
     g_trace_event_filter_constructor_for_testing = nullptr;
 
 // Indexes here have to match the g_category_groups array indexes above.
 const int kCategoryAlreadyShutdown = 1;
 const int kCategoryCategoriesExhausted = 2;
@@ skipping 1738 matching lines @@
 }
 
 ScopedTraceBinaryEfficient::~ScopedTraceBinaryEfficient() {
   if (*category_group_enabled_) {
     TRACE_EVENT_API_UPDATE_TRACE_EVENT_DURATION(category_group_enabled_, name_,
                                                 event_handle_);
   }
 }
 
 }  // namespace trace_event_internal