Implement synchronized setter/getter for logTaggedMarkerImpl

facebook · Jul 19, 2024 · 6599883 · 6599883
1 parent 2eb7bcb
commit 6599883
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git a/packages/react-native/React/CxxBridge/RCTCxxBridge.mm b/packages/react-native/React/CxxBridge/RCTCxxBridge.mm
@@ -163,10 +163,11 @@ static void mapReactMarkerToPerformanceLogger(
 static void registerPerformanceLoggerHooks(RCTPerformanceLogger *performanceLogger)
 {
   __weak RCTPerformanceLogger *weakPerformanceLogger = performanceLogger;
-  ReactMarker::logTaggedMarkerImpl = [weakPerformanceLogger](
+  ReactMarker::LogTaggedMarker newMarker = [weakPerformanceLogger](
                                          const ReactMarker::ReactMarkerId markerId, const char *tag) {
     mapReactMarkerToPerformanceLogger(markerId, weakPerformanceLogger, tag);
   };
+  ReactMarker::setLogTaggedMarkerImpl(newMarker);
 }
 
 @interface RCTCxxBridge () <RCTModuleDataCallInvokerProvider>

diff --git a/packages/react-native/ReactCommon/cxxreact/ReactMarker.cpp b/packages/react-native/ReactCommon/cxxreact/ReactMarker.cpp
@@ -16,7 +16,6 @@ namespace ReactMarker {
 #pragma clang diagnostic ignored "-Wglobal-constructors"
 #endif
 
-LogTaggedMarker logTaggedMarkerImpl = nullptr;
 LogTaggedMarker logTaggedMarkerBridgelessImpl = nullptr;
 
 #if __clang__

diff --git a/packages/react-native/ReactCommon/cxxreact/ReactMarker.h b/packages/react-native/ReactCommon/cxxreact/ReactMarker.h
@@ -8,6 +8,7 @@
 #pragma once
 
 #include <cmath>
+#include <shared_mutex>
 
 #ifdef __APPLE__
 #include <functional>
@@ -51,7 +52,21 @@ typedef void (*LogTaggedMarkerBridgeless)(const ReactMarkerId, const char* tag);
 #define RN_EXPORT __attribute__((visibility("default")))
 #endif
 
-extern RN_EXPORT LogTaggedMarker logTaggedMarkerImpl; // Bridge only
+namespace {
+  std::shared_mutex logTaggedMarkerImplMutex;
+  LogTaggedMarker logTaggedMarkerImpl = nullptr;
+}
+
+extern RN_EXPORT inline LogTaggedMarker getLogTaggedMarkerImpl(void) {
+  std::shared_lock lock(logTaggedMarkerImplMutex);
+  return logTaggedMarkerImpl;
+}
+
+extern RN_EXPORT inline void setLogTaggedMarkerImpl(LogTaggedMarker marker) {
+  std::unique_lock lock(logTaggedMarkerImplMutex);
+  logTaggedMarkerImpl = marker;
+}
+
 extern RN_EXPORT LogTaggedMarker logTaggedMarkerBridgelessImpl;
 
 extern RN_EXPORT void logMarker(const ReactMarkerId markerId); // Bridge only

diff --git a/packages/react-native/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp b/packages/react-native/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp
@@ -140,7 +140,7 @@ void JSIExecutor::initializeRuntime() {
     runtimeInstaller_(*runtime_);
   }
 
-  bool hasLogger(ReactMarker::logTaggedMarkerImpl);
+  bool hasLogger(ReactMarker::getLogTaggedMarkerImpl());
   if (hasLogger) {
     ReactMarker::logMarker(ReactMarker::CREATE_REACT_CONTEXT_STOP);
   }
@@ -151,7 +151,7 @@ void JSIExecutor::loadBundle(
     std::string sourceURL) {
   SystraceSection s("JSIExecutor::loadBundle");
 
-  bool hasLogger(ReactMarker::logTaggedMarkerImpl);
+  bool hasLogger(ReactMarker::getLogTaggedMarkerImpl());
   std::string scriptName = simpleBasename(sourceURL);
   if (hasLogger) {
     ReactMarker::logTaggedMarker(

diff --git a/packages/react-native/ReactCommon/jsiexecutor/jsireact/JSINativeModules.cpp b/packages/react-native/ReactCommon/jsiexecutor/jsireact/JSINativeModules.cpp
@@ -67,7 +67,7 @@ void JSINativeModules::reset() {
 std::optional<Object> JSINativeModules::createModule(
     Runtime& rt,
     const std::string& name) {
-  bool hasLogger(ReactMarker::logTaggedMarkerImpl);
+  bool hasLogger(ReactMarker::getLogTaggedMarkerImpl());
   if (hasLogger) {
     ReactMarker::logTaggedMarker(
         ReactMarker::NATIVE_MODULE_SETUP_START, name.c_str());