Revert D85999774: Add FrameTiming module

Differential Revision:
D85999774

Original commit changeset: 39f659671ce2

Original Phabricator Diff: D85999774

fbshipit-source-id: 157f4a72a924637e2d113464cfe1e39624d83286
This commit is contained in:
Faraz Nomani authored and meta-codesync[bot] committed 2025-11-10 07:09:37 -08:00
1 parent 6a68b6668d
commit ec7f729cb2
11 files changed
+1 -197

No files matched your search

@@ -3186,7 +3186,6 @@ public final class com/facebook/react/soloader/OpenSourceMergedSoMapping : com/f
public final fun libreact_devsupportjni_so ()I
public final fun libreact_featureflagsjni_so ()I
public final fun libreact_newarchdefaults_so ()I
public final fun libreact_performancetracerjni_so ()I
public final fun libreactnative_so ()I
public final fun libreactnativeblob_so ()I
public final fun libreactnativejni_common_so ()I
-3
View File
@@ -73,6 +73,3 @@
-keep public class com.facebook.imageutils.** {
public *;
}
# devsupport - keep classes that are referenced via JNI or reflection
-keep class com.facebook.react.devsupport.** { *; }
@@ -72,7 +72,6 @@ import com.facebook.react.devsupport.perfmonitor.PerfMonitorDevHelper
import com.facebook.react.devsupport.perfmonitor.PerfMonitorOverlayManager
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
import com.facebook.react.internal.featureflags.ReactNativeNewArchitectureFeatureFlags
import com.facebook.react.internal.tracing.PerformanceTracer
import com.facebook.react.modules.core.RCTNativeAppEventEmitter
import com.facebook.react.modules.debug.interfaces.DeveloperSettings
import com.facebook.react.packagerconnection.RequestHandler
@@ -212,8 +211,6 @@ public abstract class DevSupportManagerBase(
private var perfMonitorOverlayManager: PerfMonitorOverlayManager? = null
private var perfMonitorInitialized = false
private var tracingStateProvider: TracingStateProvider? = null
private var tracingStateSubscriptionId: Int? = null
private var frameTiming: FrameTiming? = null
public override var keyboardShortcutsEnabled: Boolean = true
public override var devMenuEnabled: Boolean = true
@@ -972,37 +969,12 @@ public abstract class DevSupportManagerBase(
isPackagerConnected = true
perfMonitorOverlayManager?.enable()
perfMonitorOverlayManager?.startBackgroundTrace()
// Subscribe to tracing state changes
tracingStateSubscriptionId =
PerformanceTracer.subscribeToTracingStateChanges(
object : PerformanceTracer.TracingStateCallback {
override fun onTracingStateChanged(isTracing: Boolean) {
if (isTracing) {
if (frameTiming == null) {
currentActivity?.window?.let { window ->
frameTiming = FrameTiming(window)
}
}
frameTiming?.startMonitoring()
} else {
frameTiming?.stopMonitoring()
}
}
}
)
}
override fun onPackagerDisconnected() {
isPackagerConnected = false
perfMonitorOverlayManager?.disable()
perfMonitorOverlayManager?.stopBackgroundTrace()
// Unsubscribe from tracing state changes
tracingStateSubscriptionId?.let { subscriptionId ->
PerformanceTracer.unsubscribeFromTracingStateChanges(subscriptionId)
tracingStateSubscriptionId = null
}
}
override fun onPackagerReloadCommand() {
@@ -1,60 +0,0 @@
/*
* 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
import android.os.Build
import android.os.Handler
import android.os.Looper
import android.view.FrameMetrics
import android.view.Window
import com.facebook.soloader.SoLoader
internal class FrameTiming(private val window: Window) {
init {
SoLoader.loadLibrary("react_devsupportjni")
}
private var frameCounter: Int = 0
private val frameMetricsListener =
Window.OnFrameMetricsAvailableListener { _, frameMetrics, dropCount ->
val metrics = FrameMetrics(frameMetrics)
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,
)
}
companion object {
@JvmStatic
private external fun reportFrameTiming(frame: Int, paintStartNanos: Long, paintEndNanos: Long)
}
private val handler = Handler(Looper.getMainLooper())
internal fun startMonitoring() {
frameCounter = 0
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
return
}
window.addOnFrameMetricsAvailableListener(frameMetricsListener, handler)
}
internal fun stopMonitoring() {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
return
}
window.removeOnFrameMetricsAvailableListener(frameMetricsListener)
}
}
@@ -28,7 +28,6 @@ public object OpenSourceMergedSoMapping : ExternalSoMapping {
"react_devsupportjni",
"react_featureflagsjni",
"react_newarchdefaults",
"react_performancetracerjni",
"reactnativeblob",
"reactnativejni",
"reactnativejni_common",
@@ -58,7 +57,6 @@ public object OpenSourceMergedSoMapping : ExternalSoMapping {
"react_devsupportjni" -> libreact_devsupportjni_so()
"react_featureflagsjni" -> libreact_featureflagsjni_so()
"react_newarchdefaults" -> libreact_newarchdefaults_so()
"react_performancetracerjni" -> libreact_performancetracerjni_so()
"reactnative" -> libreactnative_so()
"reactnativeblob" -> libreactnativeblob_so()
"reactnativejni" -> libreactnativejni_so()
@@ -90,8 +88,6 @@ public object OpenSourceMergedSoMapping : ExternalSoMapping {
public external fun libreact_newarchdefaults_so(): Int
public external fun libreact_performancetracerjni_so(): Int
public external fun libreactnative_so(): Int
public external fun libreactnativeblob_so(): Int
@@ -153,7 +153,6 @@ add_react_android_subdir(src/main/jni/react/runtime/cxxreactpackage)
add_react_android_subdir(src/main/jni/react/runtime/jni)
add_react_android_subdir(src/main/jni/react/runtime/hermes/jni)
add_react_android_subdir(src/main/jni/react/devsupport)
add_react_android_subdir(src/main/jni/react/tracing)
# SoMerging Utils
include(${REACT_ANDROID_DIR}/src/main/jni/first-party/jni-lib-merge/SoMerging-utils.cmake)
@@ -198,7 +197,6 @@ add_library(reactnative
$<TARGET_OBJECTS:react_newarchdefaults>
$<TARGET_OBJECTS:react_performance_cdpmetrics>
$<TARGET_OBJECTS:react_performance_timeline>
$<TARGET_OBJECTS:react_performancetracerjni>
$<TARGET_OBJECTS:react_renderer_animations>
$<TARGET_OBJECTS:react_renderer_attributedstring>
$<TARGET_OBJECTS:react_renderer_componentregistry>
@@ -290,7 +288,6 @@ target_include_directories(reactnative
$<TARGET_PROPERTY:react_newarchdefaults,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:react_performance_cdpmetrics,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:react_performance_timeline,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:react_performancetracerjni,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:react_renderer_animations,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:react_renderer_attributedstring,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:react_renderer_componentregistry,INTERFACE_INCLUDE_DIRECTORIES>
@@ -20,8 +20,6 @@ target_include_directories(react_devsupportjni PUBLIC .)
target_link_libraries(react_devsupportjni
fbjni
jsinspector
jsinspector_tracing
react_networking
react_timing)
react_networking)
target_compile_reactnative_options(react_devsupportjni PRIVATE)
@@ -1,36 +0,0 @@
/*
* 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.
*/
#include "JFrameTiming.h"
#include <jsinspector-modern/tracing/PerformanceTracer.h>
#include <react/timing/primitives.h>
namespace facebook::react::jsinspector_modern {
void JFrameTiming::reportFrameTiming(
jni::alias_ref<jclass> /*unused*/,
jint frameNumber,
jlong paintStartNanos,
jlong paintEndNanos) {
auto& performanceTracer = tracing::PerformanceTracer::getInstance();
auto startTime = HighResTimeStamp::fromDOMHighResTimeStamp(
static_cast<double>(paintStartNanos) / 1e6);
auto endTime = HighResTimeStamp::fromDOMHighResTimeStamp(
static_cast<double>(paintEndNanos) / 1e6);
performanceTracer.reportFrameTiming(frameNumber, startTime, endTime);
}
void JFrameTiming::registerNatives() {
javaClassLocal()->registerNatives({
makeNativeMethod("reportFrameTiming", JFrameTiming::reportFrameTiming),
});
}
} // namespace facebook::react::jsinspector_modern
@@ -1,30 +0,0 @@
/*
* 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.
*/
#pragma once
#include <fbjni/fbjni.h>
namespace facebook::react::jsinspector_modern {
/**
* JNI wrapper for reporting frame timing to PerformanceTracer.
*/
class JFrameTiming : public jni::JavaClass<JFrameTiming> {
public:
static constexpr auto kJavaDescriptor = "Lcom/facebook/react/devsupport/FrameTiming;";
static void
reportFrameTiming(jni::alias_ref<jclass> /*unused*/, jint frame, jlong paintStartNanos, jlong paintEndNanos);
static void registerNatives();
private:
JFrameTiming() = delete;
};
} // namespace facebook::react::jsinspector_modern
@@ -7,7 +7,6 @@
#include "JCxxInspectorPackagerConnection.h"
#include "JCxxInspectorPackagerConnectionWebSocketDelegate.h"
#include "JFrameTiming.h"
#include "JInspectorFlags.h"
#include "JInspectorNetworkReporter.h"
@@ -19,7 +18,6 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* /*unused*/) {
registerNatives();
facebook::react::jsinspector_modern::
JCxxInspectorPackagerConnectionWebSocketDelegate::registerNatives();
facebook::react::jsinspector_modern::JFrameTiming::registerNatives();
facebook::react::jsinspector_modern::JInspectorFlags::registerNatives();
facebook::react::jsinspector_modern::JInspectorNetworkReporter::
registerNatives();
@@ -1,27 +0,0 @@
# 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.
cmake_minimum_required(VERSION 3.13)
set(CMAKE_VERBOSE_MAKEFILE on)
include(${REACT_ANDROID_DIR}/src/main/jni/first-party/jni-lib-merge/SoMerging-utils.cmake)
include(${REACT_COMMON_DIR}/cmake-utils/react-native-flags.cmake)
file(GLOB react_performancetracerjni_SRC CONFIGURE_DEPENDS *.cpp)
add_library(react_performancetracerjni OBJECT ${react_performancetracerjni_SRC})
target_merge_so(react_performancetracerjni)
target_include_directories(react_performancetracerjni PUBLIC .)
target_link_libraries(react_performancetracerjni
fbjni
jsinspector
jsinspector_tracing
reactnativejni_common
react_timing)
target_compile_reactnative_options(react_performancetracerjni PRIVATE)