Refactor RuntimeSamplingProfileTraceEventSerializer: use smart pointers, split code, add tests

packages/react-native/ReactCommon/jsinspector-modern/TracingAgent.cpp

@@ -72,7 +72,9 @@ bool TracingAgent::handleRequest(const cdp::PreparsedRequest& req) {
     }
 
     instanceAgent_->stopTracing();
-    bool correctlyStopped = PerformanceTracer::getInstance().stopTracing();
+
+    PerformanceTracer& performanceTracer = PerformanceTracer::getInstance();
+    bool correctlyStopped = performanceTracer.stopTracing();
     if (!correctlyStopped) {
       frontendChannel_(cdp::jsonError(
           req.id,
@@ -90,15 +92,16 @@ bool TracingAgent::handleRequest(const cdp::PreparsedRequest& req) {
           "Tracing.dataCollected",
           folly::dynamic::object("value", eventsChunk)));
     };
-    PerformanceTracer::getInstance().collectEvents(
+    performanceTracer.collectEvents(
         dataCollectedCallback, TRACE_EVENT_CHUNK_SIZE);
 
-    tracing::RuntimeSamplingProfileTraceEventSerializer::serializeAndNotify(
-        PerformanceTracer::getInstance(),
-        instanceAgent_->collectTracingProfile().getRuntimeSamplingProfile(),
-        instanceTracingStartTimestamp_,
+    tracing::RuntimeSamplingProfileTraceEventSerializer serializer(
+        performanceTracer,
         dataCollectedCallback,
         PROFILE_TRACE_EVENT_CHUNK_SIZE);
+    serializer.serializeAndNotify(
+        instanceAgent_->collectTracingProfile().getRuntimeSamplingProfile(),
+        instanceTracingStartTimestamp_);
 
     frontendChannel_(cdp::jsonNotification(
         "Tracing.tracingComplete",

packages/react-native/ReactCommon/jsinspector-modern/tracing/ProfileTreeNode.h

@@ -7,7 +7,10 @@
 
 #pragma once
 
-#include "RuntimeSamplingProfile.h"
+#include <memory>
+#include <utility>
+
+#include <jsinspector-modern/tracing/RuntimeSamplingProfile.h>
 
 namespace facebook::react::jsinspector_modern::tracing {
 
@@ -28,7 +31,7 @@ class ProfileTreeNode {
   ProfileTreeNode(
       uint32_t id,
       CodeType codeType,
-      ProfileTreeNode* parent,
+      std::shared_ptr<ProfileTreeNode> parent,
       RuntimeSamplingProfile::SampleCallStackFrame callFrame)
       : id_(id),
         codeType_(codeType),
@@ -47,7 +50,7 @@ class ProfileTreeNode {
    * \return pointer to the parent node, nullptr if this is the root node.
    */
   ProfileTreeNode* getParent() const {
-    return parent_;
+    return parent_.get();
   }
 
   /**
@@ -58,12 +61,14 @@ class ProfileTreeNode {
   }
 
   /**
-   * Will only add unique child node. Returns pointer to the already existing
-   * child node, nullptr if the added child node is unique.
+   * Will only add unique child node.
+   * \return shared pointer to the already existing child node, nullptr if the
+   * added child node is unique.
    */
-  ProfileTreeNode* addChild(ProfileTreeNode* child) {
-    for (auto existingChild : children_) {
-      if (*existingChild == child) {
+  std::shared_ptr<ProfileTreeNode> addChild(
+      std::shared_ptr<ProfileTreeNode> child) {
+    for (const auto& existingChild : children_) {
+      if (*existingChild == child.get()) {
         return existingChild;
       }
     }
@@ -94,13 +99,13 @@ class ProfileTreeNode {
    */
   CodeType codeType_;
   /**
-   * Pointer to the parent node. Should be nullptr only for root node.
+   * Shared pointer to the parent node. Can be nullptr only for root node.
    */
-  ProfileTreeNode* parent_{nullptr};
+  std::shared_ptr<ProfileTreeNode> parent_;
   /**
-   * Lst of pointers to children nodes.
+   * Lst of shared pointers to children nodes.
    */
-  std::vector<ProfileTreeNode*> children_{};
+  std::vector<std::shared_ptr<ProfileTreeNode>> children_;
   /**
    * Information about the corresponding call frame that is represented by this
    * node.