From 7f8db8e7352d2192e8737f87ae64e3fbc8121f6c Mon Sep 17 00:00:00 2001 From: Liron Yahdav <359157+lyahdav@users.noreply.github.com> Date: Mon, 6 May 2024 13:38:38 -0700 Subject: [PATCH] Remove duplicate SystraceSection.h file (#44319) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/44319 The files were identical so no need for both. Having both is error-prone as one may be modified without modifying the other. Changelog: [Internal] Reviewed By: christophpurrer Differential Revision: D56659179 --- .../Fabric/Mounting/RCTMountingManager.mm | 2 +- .../react-native/React/Fabric/RCTScheduler.mm | 2 +- .../src/main/jni/react/fabric/Binding.cpp | 2 +- .../react/fabric/FabricMountingManager.cpp | 2 +- .../NativeMutationObserver.cpp | 2 +- .../components/root/RootShadowNode.cpp | 2 +- .../view/YogaLayoutableShadowNode.cpp | 2 +- .../react/renderer/core/EventEmitter.cpp | 2 +- .../react/renderer/debug/SystraceSection.h | 59 ------------------- .../renderer/imagemanager/RCTImageManager.mm | 2 +- .../renderer/mounting/Differentiator.cpp | 2 +- .../renderer/mounting/MountingCoordinator.cpp | 2 +- .../react/renderer/mounting/ShadowTree.cpp | 2 +- .../IntersectionObserverManager.cpp | 2 +- .../mutation/MutationObserverManager.cpp | 2 +- .../runtimescheduler/RuntimeScheduler.cpp | 2 +- .../RuntimeScheduler_Legacy.cpp | 2 +- .../RuntimeScheduler_Modern.cpp | 2 +- .../react/renderer/scheduler/Scheduler.cpp | 2 +- .../renderer/scheduler/SurfaceHandler.cpp | 2 +- .../uimanager/SurfaceRegistryBinding.cpp | 2 +- .../react/renderer/uimanager/UIManager.cpp | 2 +- .../renderer/uimanager/UIManagerBinding.cpp | 2 +- 23 files changed, 22 insertions(+), 81 deletions(-) delete mode 100644 packages/react-native/ReactCommon/react/renderer/debug/SystraceSection.h diff --git a/packages/react-native/React/Fabric/Mounting/RCTMountingManager.mm b/packages/react-native/React/Fabric/Mounting/RCTMountingManager.mm index 0e2323f88a5a..9759094f8854 100644 --- a/packages/react-native/React/Fabric/Mounting/RCTMountingManager.mm +++ b/packages/react-native/React/Fabric/Mounting/RCTMountingManager.mm @@ -14,11 +14,11 @@ #import #import #import +#import #import #import #import #import -#import #import #import diff --git a/packages/react-native/React/Fabric/RCTScheduler.mm b/packages/react-native/React/Fabric/RCTScheduler.mm index 5a5c3b42ea22..db6e9e0ed3c6 100644 --- a/packages/react-native/React/Fabric/RCTScheduler.mm +++ b/packages/react-native/React/Fabric/RCTScheduler.mm @@ -7,9 +7,9 @@ #import "RCTScheduler.h" +#import #import #import -#import #import #import #import diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/Binding.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/Binding.cpp index ede3d65e57eb..98cd535f93fa 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/Binding.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/Binding.cpp @@ -16,6 +16,7 @@ #include "ReactNativeConfigHolder.h" #include "SurfaceHandlerBinding.h" +#include #include #include #include @@ -26,7 +27,6 @@ #include #include #include -#include #include #include #include diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.cpp index e34a3f2adf66..e745d69eaf60 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.cpp @@ -11,11 +11,11 @@ #include "MountItem.h" #include "StateWrapperImpl.h" +#include #include #include #include #include -#include #include #include #include diff --git a/packages/react-native/ReactCommon/react/nativemodule/mutationobserver/NativeMutationObserver.cpp b/packages/react-native/ReactCommon/react/nativemodule/mutationobserver/NativeMutationObserver.cpp index c860176c387f..2c848d070377 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/mutationobserver/NativeMutationObserver.cpp +++ b/packages/react-native/ReactCommon/react/nativemodule/mutationobserver/NativeMutationObserver.cpp @@ -6,9 +6,9 @@ */ #include "NativeMutationObserver.h" +#include #include #include -#include #include #include diff --git a/packages/react-native/ReactCommon/react/renderer/components/root/RootShadowNode.cpp b/packages/react-native/ReactCommon/react/renderer/components/root/RootShadowNode.cpp index e9f4ff452274..015366dacc84 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/root/RootShadowNode.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/root/RootShadowNode.cpp @@ -7,8 +7,8 @@ #include "RootShadowNode.h" +#include #include -#include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/YogaLayoutableShadowNode.cpp b/packages/react-native/ReactCommon/react/renderer/components/view/YogaLayoutableShadowNode.cpp index f296208d2211..69cac33f11f4 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/YogaLayoutableShadowNode.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/view/YogaLayoutableShadowNode.cpp @@ -6,6 +6,7 @@ */ #include "YogaLayoutableShadowNode.h" +#include #include #include #include @@ -15,7 +16,6 @@ #include #include #include -#include #include #include #include diff --git a/packages/react-native/ReactCommon/react/renderer/core/EventEmitter.cpp b/packages/react-native/ReactCommon/react/renderer/core/EventEmitter.cpp index 1b3749258377..746314719cbc 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/EventEmitter.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/EventEmitter.cpp @@ -7,10 +7,10 @@ #include "EventEmitter.h" +#include #include #include #include -#include #include "RawEvent.h" diff --git a/packages/react-native/ReactCommon/react/renderer/debug/SystraceSection.h b/packages/react-native/ReactCommon/react/renderer/debug/SystraceSection.h deleted file mode 100644 index 34a31792e42e..000000000000 --- a/packages/react-native/ReactCommon/react/renderer/debug/SystraceSection.h +++ /dev/null @@ -1,59 +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 - -#ifdef WITH_FBSYSTRACE -#include -#endif - -namespace facebook::react { - -/** - * Allow providing an fbsystrace implementation that can short-circuit out - * quickly and can throttle too frequent events so we can get useful traces even - * if rendering etc. is spinning. For throttling we'll need file/line info so we - * use a macro. - */ -#if defined(WITH_LOOM_TRACE) -#define SystraceSection \ - static constexpr const char systraceSectionFile[] = __FILE__; \ - fbsystrace::FbSystraceSection -/** - * This is a convenience class to avoid lots of verbose profiling - * #ifdefs. If WITH_FBSYSTRACE is not defined, the optimizer will - * remove this completely. If it is defined, it will behave as - * FbSystraceSection, with the right tag provided. Use two separate classes to - * to ensure that the ODR rule isn't violated, that is, if WITH_FBSYSTRACE has - * different values in different files, there is no inconsistency in the sizes - * of defined symbols. - */ -#elif defined(WITH_FBSYSTRACE) -struct ConcreteSystraceSection { - public: - template - explicit ConcreteSystraceSection( - const char* name, - ConvertsToStringPiece&&... args) - : m_section(TRACE_TAG_REACT_CXX_BRIDGE, name, args...) {} - - private: - fbsystrace::FbSystraceSection m_section; -}; -using SystraceSection = ConcreteSystraceSection; -#else -struct DummySystraceSection { - public: - template - explicit DummySystraceSection( - const __unused char* name, - __unused ConvertsToStringPiece&&... args) {} -}; -using SystraceSection = DummySystraceSection; -#endif - -} // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/RCTImageManager.mm b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/RCTImageManager.mm index 2aff60659532..f0f352f5f314 100644 --- a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/RCTImageManager.mm +++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/RCTImageManager.mm @@ -7,7 +7,7 @@ #import "RCTImageManager.h" -#import +#import #import #import diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/Differentiator.cpp b/packages/react-native/ReactCommon/react/renderer/mounting/Differentiator.cpp index fab2665857da..aa511645bbf0 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/Differentiator.cpp +++ b/packages/react-native/ReactCommon/react/renderer/mounting/Differentiator.cpp @@ -7,10 +7,10 @@ #include "Differentiator.h" +#include #include #include #include -#include #include #include "ShadowView.h" diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/MountingCoordinator.cpp b/packages/react-native/ReactCommon/react/renderer/mounting/MountingCoordinator.cpp index 5cb618979ddc..e98717bbba02 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/MountingCoordinator.cpp +++ b/packages/react-native/ReactCommon/react/renderer/mounting/MountingCoordinator.cpp @@ -15,9 +15,9 @@ #include +#include #include #include -#include #include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.cpp b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.cpp index 4ece7148da2d..c20bb79c3c17 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.cpp +++ b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.cpp @@ -7,13 +7,13 @@ #include "ShadowTree.h" +#include #include #include #include #include #include #include -#include #include #include #include diff --git a/packages/react-native/ReactCommon/react/renderer/observers/intersection/IntersectionObserverManager.cpp b/packages/react-native/ReactCommon/react/renderer/observers/intersection/IntersectionObserverManager.cpp index a3c9eecf4c0e..7f17437943d4 100644 --- a/packages/react-native/ReactCommon/react/renderer/observers/intersection/IntersectionObserverManager.cpp +++ b/packages/react-native/ReactCommon/react/renderer/observers/intersection/IntersectionObserverManager.cpp @@ -7,7 +7,7 @@ #include "IntersectionObserverManager.h" #include -#include +#include #include #include "IntersectionObserver.h" diff --git a/packages/react-native/ReactCommon/react/renderer/observers/mutation/MutationObserverManager.cpp b/packages/react-native/ReactCommon/react/renderer/observers/mutation/MutationObserverManager.cpp index 8403a2757e63..fec927b18741 100644 --- a/packages/react-native/ReactCommon/react/renderer/observers/mutation/MutationObserverManager.cpp +++ b/packages/react-native/ReactCommon/react/renderer/observers/mutation/MutationObserverManager.cpp @@ -6,7 +6,7 @@ */ #include "MutationObserverManager.h" -#include +#include #include #include "MutationObserver.h" diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.cpp b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.cpp index 804e7cf10be9..d485390bd7b2 100644 --- a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.cpp +++ b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.cpp @@ -10,8 +10,8 @@ #include "RuntimeScheduler_Modern.h" #include "SchedulerPriorityUtils.h" +#include #include -#include #include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Legacy.cpp b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Legacy.cpp index e16188137413..345c003ac299 100644 --- a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Legacy.cpp +++ b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Legacy.cpp @@ -9,8 +9,8 @@ #include "SchedulerPriorityUtils.h" #include +#include #include -#include #include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Modern.cpp b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Modern.cpp index a38be770cb12..8fb27ae7b29a 100644 --- a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Modern.cpp +++ b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Modern.cpp @@ -9,9 +9,9 @@ #include "SchedulerPriorityUtils.h" #include +#include #include #include -#include #include #include diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp b/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp index 942d0a802d17..2b35fb80e861 100644 --- a/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp +++ b/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp @@ -10,12 +10,12 @@ #include #include +#include #include #include #include #include #include -#include #include #include #include diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceHandler.cpp b/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceHandler.cpp index 7c86d4c59985..7b3ca3f19c39 100644 --- a/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceHandler.cpp +++ b/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceHandler.cpp @@ -7,8 +7,8 @@ #include "SurfaceHandler.h" +#include #include -#include #include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/SurfaceRegistryBinding.cpp b/packages/react-native/ReactCommon/react/renderer/uimanager/SurfaceRegistryBinding.cpp index 6612a6918d2d..4b726748c26c 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/SurfaceRegistryBinding.cpp +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/SurfaceRegistryBinding.cpp @@ -6,7 +6,7 @@ */ #include "SurfaceRegistryBinding.h" -#include +#include #include #include #include "bindingUtils.h" diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.cpp b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.cpp index 075634b89d17..c25c4a4bca81 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.cpp +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.cpp @@ -8,12 +8,12 @@ #include "UIManager.h" #include +#include #include #include #include #include #include -#include #include #include #include diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp index b73714bbbbfc..96d3dfb221b8 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp @@ -7,12 +7,12 @@ #include "UIManagerBinding.h" +#include #include #include #include #include #include -#include #include #include #include