Implement synchronization with static vars on class instead of static getter/setter

Author: hakonk

packages/react-native/React/CxxBridge/RCTCxxBridge.mm

@@ -167,7 +167,7 @@ static void registerPerformanceLoggerHooks(RCTPerformanceLogger *performanceLogg
                                          const ReactMarker::ReactMarkerId markerId, const char *tag) {
     mapReactMarkerToPerformanceLogger(markerId, weakPerformanceLogger, tag);
   };
-  ReactMarker::setLogTaggedMarkerImpl(newMarker);
+  ReactMarker::LogTaggedMarkerWrapper::setLogTaggedMarkerImpl(newMarker);
 }
 
 @interface RCTCxxBridge () <RCTModuleDataCallInvokerProvider>

packages/react-native/ReactCommon/cxxreact/ReactMarker.cpp

@@ -17,6 +17,8 @@ namespace ReactMarker {
 #endif
 
 LogTaggedMarker logTaggedMarkerBridgelessImpl = nullptr;
+LogTaggedMarker LogTaggedMarkerWrapper::logTaggedMarkerImpl = nullptr;
+std::shared_mutex LogTaggedMarkerWrapper::logTaggedMarkerImplMutex;
 
 #if __clang__
 #pragma clang diagnostic pop
@@ -27,7 +29,7 @@ void logMarker(const ReactMarkerId markerId) {
 }
 
 void logTaggedMarker(const ReactMarkerId markerId, const char* tag) {
-  logTaggedMarkerImpl(markerId, tag);
+  LogTaggedMarkerWrapper::getLogTaggedMarkerImpl()(markerId, tag);
 }
 
 void logMarkerBridgeless(const ReactMarkerId markerId) {

packages/react-native/ReactCommon/cxxreact/ReactMarker.h

@@ -52,20 +52,23 @@ typedef void (*LogTaggedMarkerBridgeless)(const ReactMarkerId, const char* tag);
 #define RN_EXPORT __attribute__((visibility("default")))
 #endif
 
-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;
-}
+class RN_EXPORT LogTaggedMarkerWrapper {
+public:
+  static inline LogTaggedMarker getLogTaggedMarkerImpl(void) {
+    std::shared_lock lock(logTaggedMarkerImplMutex);
+    return logTaggedMarkerImpl;
+  }
+
+  static inline void setLogTaggedMarkerImpl(LogTaggedMarker marker) {
+    std::unique_lock lock(logTaggedMarkerImplMutex);
+    logTaggedMarkerImpl = marker;
+  }
+
+private:
+  LogTaggedMarkerWrapper() = delete;
+  static std::shared_mutex logTaggedMarkerImplMutex;
+  static LogTaggedMarker logTaggedMarkerImpl;
+};
 
 extern RN_EXPORT LogTaggedMarker logTaggedMarkerBridgelessImpl;
 

packages/react-native/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp

@@ -139,8 +139,7 @@ void JSIExecutor::initializeRuntime() {
   if (runtimeInstaller_) {
     runtimeInstaller_(*runtime_);
   }
-
-  bool hasLogger(ReactMarker::getLogTaggedMarkerImpl());
+  bool hasLogger(ReactMarker::LogTaggedMarkerWrapper::getLogTaggedMarkerImpl());
   if (hasLogger) {
     ReactMarker::logMarker(ReactMarker::CREATE_REACT_CONTEXT_STOP);
   }
@@ -151,7 +150,7 @@ void JSIExecutor::loadBundle(
     std::string sourceURL) {
   SystraceSection s("JSIExecutor::loadBundle");
 
-  bool hasLogger(ReactMarker::getLogTaggedMarkerImpl());
+  bool hasLogger(ReactMarker::LogTaggedMarkerWrapper::getLogTaggedMarkerImpl());
   std::string scriptName = simpleBasename(sourceURL);
   if (hasLogger) {
     ReactMarker::logTaggedMarker(

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::getLogTaggedMarkerImpl());
+  bool hasLogger(ReactMarker::LogTaggedMarkerWrapper::getLogTaggedMarkerImpl());
   if (hasLogger) {
     ReactMarker::logTaggedMarker(
         ReactMarker::NATIVE_MODULE_SETUP_START, name.c_str());