Heap Profiler: Avoid splitting PartitionAlloc / BlinkGC type names by comma

base/trace_event/heap_profiler_type_name_deduplicator.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/heap_profiler_type_name_deduplicator.h"
 
 #include <stddef.h>
 #include <stdlib.h>
 #include <string>
 #include <utility>
 
 #include "base/json/string_escape.h"
 #include "base/strings/string_split.h"
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/memory_usage_estimator.h"
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_memory_overhead.h"
 
 namespace base {
 namespace trace_event {
 
 namespace {
 
 // If |type_name| is file name then extract directory name. Or if |type_name| is
 // category name, then disambiguate multple categories and remove
 // "disabled-by-default" prefix if present.
 StringPiece ExtractCategoryFromTypeName(const char* type_name) {
   StringPiece result(type_name);
-  size_t last_seperator = result.find_last_of("\\/");

[Primiano Tucci (use gerrit), 2017/05/09 09:04:12]

LOL, how much damage did a typo + code/paste :)

+  size_t last_separator = result.find_last_of("\\/");
 
-  // If |type_name| was a not a file path, the seperator will not be found, so
+  // If |type_name| was a not a file path, the separator will not be found, so
   // the whole type name is returned.
-  if (last_seperator == StringPiece::npos) {
+  if (last_separator == StringPiece::npos) {
+    // |type_name| is C++ typename if its reporting allocator is
+    // partition_alloc or blink_gc. In this case, we should not split
+    // |type_name| by ',', because of function types and template types.
+    // e.g. WTF::HashMap<WTF::AtomicString, WTF::AtomicString>,
+    // void (*)(void*, void*), and so on. So if |type_name| contains
+    if (result.find_last_of(")>") != StringPiece::npos)
+      return result;
+
     // Use the first the category name if it has ",".
     size_t first_comma_position = result.find(',');
     if (first_comma_position != StringPiece::npos)
       result = result.substr(0, first_comma_position);
     if (result.starts_with(TRACE_DISABLED_BY_DEFAULT("")))
       result.remove_prefix(sizeof(TRACE_DISABLED_BY_DEFAULT("")) - 1);
     return result;
   }
 
   // Remove the file name from the path.
-  result.remove_suffix(result.length() - last_seperator);
+  result.remove_suffix(result.length() - last_separator);
 
   // Remove the parent directory references.
   const char kParentDirectory[] = "..";
   const size_t kParentDirectoryLength = 3; // '../' or '..\'.
   while (result.starts_with(kParentDirectory)) {
     result.remove_prefix(kParentDirectoryLength);
   }
   return result;
 }
 
@@ skipping 51 matching lines @@
 
 void TypeNameDeduplicator::EstimateTraceMemoryOverhead(
     TraceEventMemoryOverhead* overhead) {
   size_t memory_usage = EstimateMemoryUsage(type_ids_);
   overhead->Add(TraceEventMemoryOverhead::kHeapProfilerTypeNameDeduplicator,
                 sizeof(TypeNameDeduplicator) + memory_usage);
 }
 
 }  // namespace trace_event
 }  // namespace base