Propagate Frames data through Host (facebook#54671)

Summary:
Pull Request resolved: facebook#54671

# Changelog: [Internal]

Replaces the calls to `PerformanceTracer` through `jni` with the calls through inpsector's `HostTarget`.

Reviewed By: sbuggay

Differential Revision: D87373808

fbshipit-source-id: f86a679a09b1586a426e69914de2c9f658289039

Author: hoxyq

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/inspector/FrameTimingSequence.kt

@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.devsupport.inspector
+
+internal data class FrameTimingSequence(
+    val id: Int,
+    val threadId: Int,
+    val beginDrawingTimestamp: Long,
+    val commitTimestamp: Long,
+    val endDrawingTimestamp: Long,
+)

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/inspector/FrameTimingsObserver.kt

@@ -10,30 +10,42 @@ package com.facebook.react.devsupport.inspector
 import android.os.Build
 import android.os.Handler
 import android.os.Looper
+import android.os.Process
 import android.view.FrameMetrics
 import android.view.Window
 import com.facebook.proguard.annotations.DoNotStripAny
 import com.facebook.soloader.SoLoader
 
 @DoNotStripAny
-internal class FrameTimingsObserver(private val window: Window) {
+internal class FrameTimingsObserver(
+    private val window: Window,
+    onFrameTimingSequence: (sequence: FrameTimingSequence) -> Unit,
+) {
   private val handler = Handler(Looper.getMainLooper())
   private var frameCounter: Int = 0
 
   private external fun setLayerTreeId(frame: String, layerTreeId: Int)
 
   private val frameMetricsListener =
-      Window.OnFrameMetricsAvailableListener { _, frameMetrics, dropCount ->
-        val metrics = FrameMetrics(frameMetrics)
+      Window.OnFrameMetricsAvailableListener { _, frameMetrics, _dropCount ->
+        val beginDrawingTimestamp = frameMetrics.getMetric(FrameMetrics.INTENDED_VSYNC_TIMESTAMP)
+        val commitTimestamp =
+            beginDrawingTimestamp + frameMetrics.getMetric(FrameMetrics.INPUT_HANDLING_DURATION)
+        +frameMetrics.getMetric(FrameMetrics.ANIMATION_DURATION)
+        +frameMetrics.getMetric(FrameMetrics.LAYOUT_MEASURE_DURATION)
+        +frameMetrics.getMetric(FrameMetrics.DRAW_DURATION)
+        +frameMetrics.getMetric(FrameMetrics.SYNC_DURATION)
+        val endDrawingTimestamp =
+            beginDrawingTimestamp + frameMetrics.getMetric(FrameMetrics.TOTAL_DURATION)
 
-        val paintStartTime = metrics.getMetric(FrameMetrics.INTENDED_VSYNC_TIMESTAMP)
-        val totalDuration = metrics.getMetric(FrameMetrics.TOTAL_DURATION)
-
-        val currentFrame = frameCounter++
-        reportFrameTiming(
-            frame = currentFrame,
-            paintStartNanos = paintStartTime,
-            paintEndNanos = paintStartTime + totalDuration,
+        onFrameTimingSequence(
+            FrameTimingSequence(
+                frameCounter++,
+                Process.myTid(),
+                beginDrawingTimestamp,
+                commitTimestamp,
+                endDrawingTimestamp,
+            )
         )
       }
 
@@ -44,10 +56,6 @@ internal class FrameTimingsObserver(private val window: Window) {
     }
 
     window.addOnFrameMetricsAvailableListener(frameMetricsListener, handler)
-
-    // Hardcoded frame identfier and layerTreeId. Needed for DevTools to
-    // begin parsing frame events.
-    setLayerTreeId("", 1)
   }
 
   fun stop() {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.kt

@@ -1572,7 +1572,10 @@ public class ReactHostImpl(
             TracingState.ENABLED_IN_BACKGROUND_MODE,
             TracingState.ENABLED_IN_CDP_MODE -> {
               currentActivity?.window?.let { window ->
-                val observer = FrameTimingsObserver(window)
+                val observer =
+                    FrameTimingsObserver(window) { frameTimingsSequence ->
+                      inspectorTarget.recordFrameTimings(frameTimingsSequence)
+                    }
                 observer.start()
                 frameTimingsObserver = observer
               }

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostInspectorTarget.kt

@@ -12,6 +12,7 @@ import com.facebook.proguard.annotations.DoNotStripAny
 import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.common.annotations.FrameworkAPI
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
+import com.facebook.react.devsupport.inspector.FrameTimingSequence
 import com.facebook.react.devsupport.inspector.TracingState
 import com.facebook.react.devsupport.inspector.TracingStateListener
 import com.facebook.react.devsupport.perfmonitor.PerfMonitorInspectorTarget
@@ -48,6 +49,8 @@ internal class ReactHostInspectorTarget(reactHostImpl: ReactHostImpl) :
 
   external fun unregisterTracingStateListener(subscriptionId: Long)
 
+  external fun recordFrameTimings(frameTimingSequence: FrameTimingSequence)
+
   override fun addPerfMonitorListener(listener: PerfMonitorUpdateListener) {
     perfMonitorListeners.add(listener)
   }

packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactHostInspectorTarget.cpp

@@ -253,6 +253,8 @@ void JReactHostInspectorTarget::registerNatives() {
       makeNativeMethod(
           "unregisterTracingStateListener",
           JReactHostInspectorTarget::unregisterTracingStateListener),
+      makeNativeMethod(
+          "recordFrameTimings", JReactHostInspectorTarget::recordFrameTimings),
   });
 }
 
@@ -290,6 +292,17 @@ HostTargetTracingDelegate* JReactHostInspectorTarget::getTracingDelegate() {
   return tracingDelegate_.get();
 }
 
+void JReactHostInspectorTarget::recordFrameTimings(
+    jni::alias_ref<JFrameTimingSequence::javaobject> frameTimingSequence) {
+  inspectorTarget_->recordFrameTimings({
+      frameTimingSequence->getId(),
+      frameTimingSequence->getThreadId(),
+      frameTimingSequence->getBeginDrawingTimestamp(),
+      frameTimingSequence->getCommitTimestamp(),
+      frameTimingSequence->getEndDrawingTimestamp(),
+  });
+}
+
 void TracingDelegate::onTracingStarted(
     tracing::Mode tracingMode,
     bool screenshotsCategoryEnabled) {

packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactHostInspectorTarget.h

@@ -32,6 +32,43 @@ struct JTracingStateListener : public jni::JavaClass<JTracingStateListener> {
   static constexpr auto kJavaDescriptor = "Lcom/facebook/react/devsupport/inspector/TracingStateListener;";
 };
 
+struct JFrameTimingSequence : public jni::JavaClass<JFrameTimingSequence> {
+  static constexpr auto kJavaDescriptor = "Lcom/facebook/react/devsupport/inspector/FrameTimingSequence;";
+
+  uint64_t getId() const
+  {
+    auto field = javaClassStatic()->getField<jint>("id");
+    return static_cast<uint64_t>(getFieldValue(field));
+  }
+
+  uint64_t getThreadId() const
+  {
+    auto field = javaClassStatic()->getField<jint>("threadId");
+    return static_cast<uint64_t>(getFieldValue(field));
+  }
+
+  HighResTimeStamp getBeginDrawingTimestamp() const
+  {
+    auto field = javaClassStatic()->getField<jlong>("beginDrawingTimestamp");
+    return HighResTimeStamp::fromChronoSteadyClockTimePoint(
+        std::chrono::steady_clock::time_point(std::chrono::nanoseconds(getFieldValue(field))));
+  }
+
+  HighResTimeStamp getCommitTimestamp() const
+  {
+    auto field = javaClassStatic()->getField<jlong>("commitTimestamp");
+    return HighResTimeStamp::fromChronoSteadyClockTimePoint(
+        std::chrono::steady_clock::time_point(std::chrono::nanoseconds(getFieldValue(field))));
+  }
+
+  HighResTimeStamp getEndDrawingTimestamp() const
+  {
+    auto field = javaClassStatic()->getField<jlong>("endDrawingTimestamp");
+    return HighResTimeStamp::fromChronoSteadyClockTimePoint(
+        std::chrono::steady_clock::time_point(std::chrono::nanoseconds(getFieldValue(field))));
+  }
+};
+
 struct JReactHostImpl : public jni::JavaClass<JReactHostImpl> {
   static constexpr auto kJavaDescriptor = "Lcom/facebook/react/runtime/ReactHostImpl;";
 
@@ -185,6 +222,11 @@ class JReactHostInspectorTarget : public jni::HybridClass<JReactHostInspectorTar
    */
   void unregisterTracingStateListener(jlong subscriptionId);
 
+  /**
+   * Propagate frame timings information to the Inspector's Tracing subsystem.
+   */
+  void recordFrameTimings(jni::alias_ref<JFrameTimingSequence::javaobject> frameTimingSequence);
+
   // HostTargetDelegate methods
   jsinspector_modern::HostTargetMetadata getMetadata() override;
   void onReload(const PageReloadRequest &request) override;