@react-native-ohos/react-native-reanimated 4.0.1 → 4.0.2-beta.1

package/harmony/reanimated/src/main/cpp/Common/cpp/reanimated/Tools/ReanimatedSystraceSection.h

@@ -1,114 +1,114 @@
-#pragma once
-#include <string>
-#include <vector>
-
-#ifdef REANIMATED_PROFILING
-
-#if defined(__APPLE__)
-#include <os/trace_base.h>
-
-#if OS_LOG_TARGET_HAS_10_15_FEATURES
-#include <os/log.h>
-#include <os/signpost.h>
-#include <sstream>
-#endif // OS_LOG_TARGET_HAS_10_15_FEATURES
-
-#elif defined(ANDROID)
-
-#include <android/trace.h>
-
-#endif // defined(ANDROID)
-
-#endif // REANIMATED_PROFILING
-
-namespace reanimated {
-
-#if defined(ANDROID) && defined(REANIMATED_PROFILING)
-
-struct ReanimatedSystraceSection {
- public:
-  template <typename... ConvertsToStringPiece>
-  explicit ReanimatedSystraceSection(const char *name, ConvertsToStringPiece &&...args) {
-    ATrace_beginSection(name);
-  }
-
-  ~ReanimatedSystraceSection() {
-    ATrace_endSection();
-  }
-};
-
-// The apple part is copied from React Native
-// from
-// https://github.com/facebook/react-native/blob/5697d923a05119314b4cfcd556cb243986637764/packages/react-native/ReactCommon/cxxreact/SystraceSection.h
-#elif defined(__APPLE__) && OS_LOG_TARGET_HAS_10_15_FEATURES && defined(REANIMATED_PROFILING)
-
-template <typename T, typename = void>
-struct renderer {
-  static std::string render(const T &t) {
-    std::ostringstream oss;
-    oss << t;
-    return oss.str();
-  }
-};
-
-template <typename T>
-static auto render(const T &t) -> decltype(renderer<T>::render(std::declval<const T &>())) {
-  return renderer<T>::render(t);
-}
-
-inline os_log_t instrumentsLogHandle = nullptr;
-
-static inline os_log_t getOrCreateInstrumentsLogHandle() {
-  if (!instrumentsLogHandle) {
-    instrumentsLogHandle = os_log_create("dev.reanimated.instruments", OS_LOG_CATEGORY_POINTS_OF_INTEREST);
-  }
-  return instrumentsLogHandle;
-}
-
-struct ReanimatedSystraceSection {
- public:
-  template <typename... ConvertsToStringPiece>
-  explicit ReanimatedSystraceSection(const char *name, ConvertsToStringPiece &&...args) {
-    os_log_t instrumentsLogHandle = reanimated::getOrCreateInstrumentsLogHandle();
-
-    // If the log isn't enabled, we don't want the performance overhead of the
-    // rest of the code below.
-    if (!os_signpost_enabled(instrumentsLogHandle)) {
-      return;
-    }
-
-    name_ = name;
-
-    const auto argsVector = std::vector<std::string>{reanimated::render(args)...};
-    std::string argsString = "";
-    for (size_t i = 0; i < argsVector.size(); i += 2) {
-      argsString += argsVector[i] + "=" + argsVector[i + 1] + ";";
-    }
-
-    signpostID_ = os_signpost_id_make_with_pointer(instrumentsLogHandle, this);
-
-    os_signpost_interval_begin(
-        instrumentsLogHandle, signpostID_, "Reanimated", "%s begin: %s", name, argsString.c_str());
-  }
-
-  ~ReanimatedSystraceSection() {
-    os_signpost_interval_end(reanimated::instrumentsLogHandle, signpostID_, "Reanimated", "%s end", name_.data());
-  }
-
- private:
-  os_signpost_id_t signpostID_ = OS_SIGNPOST_ID_INVALID;
-  std::string_view name_;
-};
-
-#else
-
-struct ReanimatedSystraceSection {
- public:
-  template <typename... ConvertsToStringPiece>
-  explicit ReanimatedSystraceSection(const char *name, ConvertsToStringPiece &&...args) {}
-};
-
-#endif // defined(__APPLE__) && OS_LOG_TARGET_HAS_10_15_FEATURES && \
-    // defined(REANIMATED_PROFILING)
-
-} // namespace reanimated
+#pragma once
+#include <string>
+#include <vector>
+
+#ifdef REANIMATED_PROFILING
+
+#if defined(__APPLE__)
+#include <os/trace_base.h>
+
+#if OS_LOG_TARGET_HAS_10_15_FEATURES
+#include <os/log.h>
+#include <os/signpost.h>
+#include <sstream>
+#endif // OS_LOG_TARGET_HAS_10_15_FEATURES
+
+#elif defined(ANDROID)
+
+#include <android/trace.h>
+
+#endif // defined(ANDROID)
+
+#endif // REANIMATED_PROFILING
+
+namespace reanimated {
+
+#if defined(ANDROID) && defined(REANIMATED_PROFILING)
+
+struct ReanimatedSystraceSection {
+ public:
+  template <typename... ConvertsToStringPiece>
+  explicit ReanimatedSystraceSection(const char *name, ConvertsToStringPiece &&...args) {
+    ATrace_beginSection(name);
+  }
+
+  ~ReanimatedSystraceSection() {
+    ATrace_endSection();
+  }
+};
+
+// The apple part is copied from React Native
+// from
+// https://github.com/facebook/react-native/blob/5697d923a05119314b4cfcd556cb243986637764/packages/react-native/ReactCommon/cxxreact/SystraceSection.h
+#elif defined(__APPLE__) && OS_LOG_TARGET_HAS_10_15_FEATURES && defined(REANIMATED_PROFILING)
+
+template <typename T, typename = void>
+struct renderer {
+  static std::string render(const T &t) {
+    std::ostringstream oss;
+    oss << t;
+    return oss.str();
+  }
+};
+
+template <typename T>
+static auto render(const T &t) -> decltype(renderer<T>::render(std::declval<const T &>())) {
+  return renderer<T>::render(t);
+}
+
+inline os_log_t instrumentsLogHandle = nullptr;
+
+static inline os_log_t getOrCreateInstrumentsLogHandle() {
+  if (!instrumentsLogHandle) {
+    instrumentsLogHandle = os_log_create("dev.reanimated.instruments", OS_LOG_CATEGORY_POINTS_OF_INTEREST);
+  }
+  return instrumentsLogHandle;
+}
+
+struct ReanimatedSystraceSection {
+ public:
+  template <typename... ConvertsToStringPiece>
+  explicit ReanimatedSystraceSection(const char *name, ConvertsToStringPiece &&...args) {
+    os_log_t instrumentsLogHandle = reanimated::getOrCreateInstrumentsLogHandle();
+
+    // If the log isn't enabled, we don't want the performance overhead of the
+    // rest of the code below.
+    if (!os_signpost_enabled(instrumentsLogHandle)) {
+      return;
+    }
+
+    name_ = name;
+
+    const auto argsVector = std::vector<std::string>{reanimated::render(args)...};
+    std::string argsString = "";
+    for (size_t i = 0; i < argsVector.size(); i += 2) {
+      argsString += argsVector[i] + "=" + argsVector[i + 1] + ";";
+    }
+
+    signpostID_ = os_signpost_id_make_with_pointer(instrumentsLogHandle, this);
+
+    os_signpost_interval_begin(
+        instrumentsLogHandle, signpostID_, "Reanimated", "%s begin: %s", name, argsString.c_str());
+  }
+
+  ~ReanimatedSystraceSection() {
+    os_signpost_interval_end(reanimated::instrumentsLogHandle, signpostID_, "Reanimated", "%s end", name_.data());
+  }
+
+ private:
+  os_signpost_id_t signpostID_ = OS_SIGNPOST_ID_INVALID;
+  std::string_view name_;
+};
+
+#else
+
+struct ReanimatedSystraceSection {
+ public:
+  template <typename... ConvertsToStringPiece>
+  explicit ReanimatedSystraceSection(const char *name, ConvertsToStringPiece &&...args) {}
+};
+
+#endif // defined(__APPLE__) && OS_LOG_TARGET_HAS_10_15_FEATURES && \
+    // defined(REANIMATED_PROFILING)
+
+} // namespace reanimated

package/harmony/reanimated/src/main/cpp/Common/cpp/reanimated/Tools/ReanimatedVersion.cpp

@@ -1,46 +1,46 @@
-#include <reanimated/Tools/ReanimatedVersion.h>
-#include <worklets/Tools/JSLogger.h>
-#include <worklets/Tools/VersionUtils.h>
-
-#include <memory>
-#include <string>
-
-#ifdef REANIMATED_VERSION
-#define STRINGIZE(x) #x
-#define STRINGIZE2(x) STRINGIZE(x)
-#define REANIMATED_VERSION_STRING STRINGIZE2(REANIMATED_VERSION)
-#endif // REANIMATED_VERSION
-
-using namespace facebook;
-
-namespace reanimated {
-
-std::string getReanimatedCppVersion() {
-  return std::string(REANIMATED_VERSION_STRING);
-}
-
-void injectReanimatedCppVersion(jsi::Runtime &rnRuntime) {
-  auto version = getReanimatedCppVersion();
-  rnRuntime.global().setProperty(rnRuntime, "_REANIMATED_VERSION_CPP", jsi::String::createFromUtf8(rnRuntime, version));
-}
-
-#ifndef NDEBUG
-void checkJSVersion(jsi::Runtime &rnRuntime, const std::shared_ptr<worklets::JSLogger> &jsLogger) {
-  auto cppVersion = getReanimatedCppVersion();
-  auto jsVersionValue = rnRuntime.global().getProperty(rnRuntime, "_REANIMATED_VERSION_JS");
-  worklets::checkJSVersion(
-      rnRuntime,
-      jsVersionValue,
-      jsLogger,
-      cppVersion,
-      "Reanimated",
-      "https://docs.swmansion.com/react-native-reanimated/");
-}
-#else
-void checkJSVersion(jsi::Runtime &rnRuntime, const std::shared_ptr<worklets::JSLogger> &jsLogger) {
-  // In release builds we don't check the version, hence
-  // this function is a NOOP.
-}
-#endif // NDEBUG
-
-}; // namespace reanimated
+#include <reanimated/Tools/ReanimatedVersion.h>
+#include <worklets/Tools/JSLogger.h>
+#include <worklets/Tools/VersionUtils.h>
+
+#include <memory>
+#include <string>
+
+#ifdef REANIMATED_VERSION
+#define STRINGIZE(x) #x
+#define STRINGIZE2(x) STRINGIZE(x)
+#define REANIMATED_VERSION_STRING STRINGIZE2(REANIMATED_VERSION)
+#endif // REANIMATED_VERSION
+
+using namespace facebook;
+
+namespace reanimated {
+
+std::string getReanimatedCppVersion() {
+  return std::string(REANIMATED_VERSION_STRING);
+}
+
+void injectReanimatedCppVersion(jsi::Runtime &rnRuntime) {
+  auto version = getReanimatedCppVersion();
+  rnRuntime.global().setProperty(rnRuntime, "_REANIMATED_VERSION_CPP", jsi::String::createFromUtf8(rnRuntime, version));
+}
+
+#ifndef NDEBUG
+void checkJSVersion(jsi::Runtime &rnRuntime, const std::shared_ptr<worklets::JSLogger> &jsLogger) {
+  auto cppVersion = getReanimatedCppVersion();
+  auto jsVersionValue = rnRuntime.global().getProperty(rnRuntime, "_REANIMATED_VERSION_JS");
+  worklets::checkJSVersion(
+      rnRuntime,
+      jsVersionValue,
+      jsLogger,
+      cppVersion,
+      "Reanimated",
+      "https://docs.swmansion.com/react-native-reanimated/");
+}
+#else
+void checkJSVersion(jsi::Runtime &rnRuntime, const std::shared_ptr<worklets::JSLogger> &jsLogger) {
+  // In release builds we don't check the version, hence
+  // this function is a NOOP.
+}
+#endif // NDEBUG
+
+}; // namespace reanimated

package/harmony/reanimated/src/main/cpp/Common/cpp/reanimated/Tools/ReanimatedVersion.h

@@ -1,18 +1,18 @@
-#pragma once
-
-#include <worklets/Tools/JSLogger.h>
-
-#include <jsi/jsi.h>
-
-#include <memory>
-#include <string>
-
-using namespace facebook;
-
-namespace reanimated {
-
-std::string getReanimatedCppVersion();
-void injectReanimatedCppVersion(jsi::Runtime &);
-void checkJSVersion(jsi::Runtime &, const std::shared_ptr<worklets::JSLogger> &);
-
-}; // namespace reanimated
+#pragma once
+
+#include <worklets/Tools/JSLogger.h>
+
+#include <jsi/jsi.h>
+
+#include <memory>
+#include <string>
+
+using namespace facebook;
+
+namespace reanimated {
+
+std::string getReanimatedCppVersion();
+void injectReanimatedCppVersion(jsi::Runtime &);
+void checkJSVersion(jsi::Runtime &, const std::shared_ptr<worklets::JSLogger> &);
+
+}; // namespace reanimated