[tracing] Switch to new heap dump format.

base/trace_event/heap_profiler_stack_frame_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_stack_frame_deduplicator.h"
 
 #include <inttypes.h>
 #include <stddef.h>
 
 #include <string>
 #include <utility>
 
 #include "base/strings/stringprintf.h"
+#include "base/trace_event/heap_profiler_string_deduplicator.h"
 #include "base/trace_event/memory_usage_estimator.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "base/trace_event/trace_event_memory_overhead.h"
 
 namespace base {
 namespace trace_event {
 
 StackFrameDeduplicator::FrameNode::FrameNode(StackFrame frame,
                                              int parent_frame_index)
     : frame(frame), parent_frame_index(parent_frame_index) {}
 StackFrameDeduplicator::FrameNode::FrameNode(const FrameNode& other) = default;
 StackFrameDeduplicator::FrameNode::~FrameNode() {}
 
 size_t StackFrameDeduplicator::FrameNode::EstimateMemoryUsage() const {
   return base::trace_event::EstimateMemoryUsage(children);
 }
 
-StackFrameDeduplicator::StackFrameDeduplicator() {}
+StackFrameDeduplicator::StackFrameDeduplicator(
+    StringDeduplicator* string_deduplicator)
+    : string_deduplicator_(string_deduplicator), last_exported_index_(0) {
+  // Add implicit entry for id 0 (empty backtraces).
+  frames_.push_back({StackFrame::FromTraceEventName(nullptr), -1});

[Primiano Tucci (use gerrit), 2017/03/09 11:47:44]

you say 0 above but push -1 here? 

[DmitrySkiba, 2017/03/14 22:12:47]

Oh, the joy of unnamed constants :) This -1 means 'no parent'. I replaced it
(and other occurrences) with explicit kInvalidFrameIndex constant.

+}
 StackFrameDeduplicator::~StackFrameDeduplicator() {}
 
 int StackFrameDeduplicator::Insert(const StackFrame* beginFrame,
                                    const StackFrame* endFrame) {
+  if (beginFrame == endFrame) {
+    // Empty backtraces are mapped to id 0.
+    return 0;
+  }
+
   int frame_index = -1;
   std::map<StackFrame, int>* nodes = &roots_;
 
   // Loop through the frames, early out when a frame is null.
   for (const StackFrame* it = beginFrame; it != endFrame; it++) {
     StackFrame frame = *it;
 
     auto node = nodes->find(frame);
     if (node == nodes->end()) {
       // There is no tree node for this frame yet, create it. The parent node
@@ skipping 14 matching lines @@
       // A tree node for this frame exists. Look for the next one.
       frame_index = node->second;
     }
 
     nodes = &frames_[frame_index].children;
   }
 
   return frame_index;
 }
 
-void StackFrameDeduplicator::AppendAsTraceFormat(std::string* out) const {
-  out->append("{");  // Begin the |stackFrames| dictionary.
-
-  int i = 0;
-  auto frame_node = begin();
-  auto it_end = end();
+void StackFrameDeduplicator::ExportIncrementally(TracedValue* traced_value) {
   std::string stringify_buffer;
 
-  while (frame_node != it_end) {
-    // The |stackFrames| format is a dictionary, not an array, so the
-    // keys are stringified indices. Write the index manually, then use
-    // |TracedValue| to format the object. This is to avoid building the
-    // entire dictionary as a |TracedValue| in memory.
-    SStringPrintf(&stringify_buffer, "\"%d\":", i);
-    out->append(stringify_buffer);
+  for (; last_exported_index_ < frames_.size(); ++last_exported_index_) {
+    const auto& frame_node = frames_[last_exported_index_];
+    traced_value->BeginDictionary();
 
-    std::unique_ptr<TracedValue> frame_node_value(new TracedValue);
-    const StackFrame& frame = frame_node->frame;
+    traced_value->SetInteger("id", last_exported_index_);
+
+    int name_string_id = 0;
+    const StackFrame& frame = frame_node.frame;
     switch (frame.type) {
       case StackFrame::Type::TRACE_EVENT_NAME:
-        frame_node_value->SetString(
-            "name", static_cast<const char*>(frame.value));
+        name_string_id =
+            string_deduplicator_->Insert(static_cast<const char*>(frame.value));
         break;
       case StackFrame::Type::THREAD_NAME:
         SStringPrintf(&stringify_buffer,
                       "[Thread: %s]",
                       static_cast<const char*>(frame.value));
-        frame_node_value->SetString("name", stringify_buffer);
+        name_string_id = string_deduplicator_->Insert(stringify_buffer);
         break;
       case StackFrame::Type::PROGRAM_COUNTER:
         SStringPrintf(&stringify_buffer,
                       "pc:%" PRIxPTR,
                       reinterpret_cast<uintptr_t>(frame.value));
-        frame_node_value->SetString("name", stringify_buffer);
+        name_string_id = string_deduplicator_->Insert(stringify_buffer);
         break;
     }
-    if (frame_node->parent_frame_index >= 0) {
-      SStringPrintf(&stringify_buffer, "%d", frame_node->parent_frame_index);
-      frame_node_value->SetString("parent", stringify_buffer);
+    traced_value->SetInteger("name_sid", name_string_id);

[Primiano Tucci (use gerrit), 2017/03/09 11:47:44]

see my comment above about shortening these to "n" and "p"  (or similar) to work
around JSON sillyness

+
+    if (frame_node.parent_frame_index >= 0) {
+      traced_value->SetInteger("parent", frame_node.parent_frame_index);
     }
-    frame_node_value->AppendAsTraceFormat(out);
 
-    i++;
-    frame_node++;
-
-    if (frame_node != it_end)
-      out->append(",");
+    traced_value->EndDictionary();
   }
-
-  out->append("}");  // End the |stackFrames| dictionary.
 }
 
 void StackFrameDeduplicator::EstimateTraceMemoryOverhead(
     TraceEventMemoryOverhead* overhead) {
   size_t memory_usage =
       EstimateMemoryUsage(frames_) + EstimateMemoryUsage(roots_);
   overhead->Add("StackFrameDeduplicator",
                 sizeof(StackFrameDeduplicator) + memory_usage);
 }
 
 }  // namespace trace_event
 }  // namespace base