@amazon-devices/react-native-worklets 1.0.0-rn-83 → 1.0.0-rn-83.1

package/Common/cpp/worklets/Registries/EventHandlerRegistry.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <keplerui-083/keplerscript-export.h>
-
 #include <worklets/WorkletRuntime/WorkletRuntime.h>
 
 #include <jsi/jsi.h>
@@ -13,13 +11,17 @@
 #include <unordered_map>
 #include <utility>
 
+// amznmod_react - export symbols for reanimated
+#include "react-native-worklets-4_export.h"
+
 using namespace facebook;
 
 namespace worklets {
 
 class WorkletEventHandler;
 
-class KEPLERSCRIPT_EXPORT EventHandlerRegistry {
+// amznmod_react - export symbols for reanimated
+class REACT_NATIVE_WORKLETS_4_EXPORT EventHandlerRegistry {
   std::map<
       std::pair<int, std::string>,
       std::unordered_map<uint64_t, std::shared_ptr<WorkletEventHandler>>>

package/Common/cpp/worklets/RunLoop/AsyncQueueImpl.cpp

@@ -8,10 +8,9 @@ namespace worklets {
 AsyncQueueImpl::AsyncQueueImpl(std::string name)
     : state_(std::make_shared<AsyncQueueState>()) {
   auto thread = std::thread([name, state = state_] {
-// amzn_mod - include check for VOLTA_DARWIN
-#if __APPLE__ || defined(VOLTA_DARWIN)
+#if __APPLE__
     pthread_setname_np(name.c_str());
-#endif // __APPLE__ || VOLTA_DARWIN
+#endif // __APPLE__
     while (state->running) {
       std::unique_lock<std::mutex> lock(state->mutex);
       state->cv.wait(
@@ -28,10 +27,10 @@ AsyncQueueImpl::AsyncQueueImpl(std::string name)
       job();
     }
   });
-// amzn_mod - exclude VOLTA_DARWIN
-#if defined(ANDROID) && not defined(VOLTA_DARWIN)
+// amzn_mod - exclude __APPLE__
+#if defined(ANDROID) && not defined(__APPLE__)
   pthread_setname_np(thread.native_handle(), name.c_str());
-#endif // ANDROID && !VOLTA_DARWIN
+#endif // ANDROID && !__APPLE__
   thread.detach();
 }
 

package/Common/cpp/worklets/RunLoop/EventLoop.cpp

@@ -28,10 +28,10 @@ void EventLoop::run() {
   const auto threadName = name_ + "(timeout)";
   auto thread = std::thread(
       [threadName, state = timeoutsQueueState_, weakThis = weak_from_this()] {
-// amzn_mod - include check for VOLTA_DARWIN
-#if __APPLE__ || defined(VOLTA_DARWIN)
+// amzn_mod - include check for Vega aarch64
+#if __APPLE__
         pthread_setname_np(threadName.c_str());
-#endif // __APPLE__ || VOLTA_DARWIN
+#endif // __APPLE__
         while (state->running) {
           std::unique_lock<std::mutex> lock(state->mutex);
 
@@ -73,10 +73,10 @@ void EventLoop::run() {
           }
         }
       });
-// amzn_mod - exclude VOLTA_DARWIN
-#if defined(ANDROID) && not defined(VOLTA_DARWIN)
+// amzn_mod - exclude __APPLE__
+#if defined(ANDROID) && not defined(__APPLE__)
   pthread_setname_np(thread.native_handle(), threadName.c_str());
-#endif // ANDROID && !VOLTA_DARWIN
+#endif // ANDROID && !__APPLE__
   thread.detach();
 }
 

package/Common/cpp/worklets/SharedItems/Serializable.h

@@ -1,8 +1,5 @@
 #pragma once
 
-// amznmod_react - export symbols for reanimated
-#include <keplerui-083/keplerscript-export.h>
-
 #include <worklets/Registries/WorkletRuntimeRegistry.h>
 
 #include <jsi/jsi.h>
@@ -12,6 +9,9 @@
 #include <utility>
 #include <vector>
 
+// amznmod_react - export symbols for reanimated
+#include "react-native-worklets-4_export.h"
+
 using namespace facebook;
 
 namespace worklets {
@@ -20,7 +20,7 @@ jsi::Function getValueUnpacker(jsi::Runtime &rt);
 
 #ifndef NDEBUG
 // amznmod_react - export symbols for reanimated
-jsi::Function KEPLERSCRIPT_EXPORT getCallGuard(jsi::Runtime &rt);
+jsi::Function REACT_NATIVE_WORKLETS_4_EXPORT getCallGuard(jsi::Runtime &rt);
 #endif // NDEBUG
 
 // If possible, please use `WorkletRuntime::runGuarded` instead.
@@ -67,7 +67,7 @@ inline void cleanupIfRuntimeExists(
 }
 
 // amznmod_react - export symbols for reanimated
-class KEPLERSCRIPT_EXPORT Serializable {
+class REACT_NATIVE_WORKLETS_4_EXPORT Serializable {
  public:
   virtual jsi::Value toJSValue(jsi::Runtime &rt) = 0;
 
@@ -213,7 +213,7 @@ jsi::Value makeSerializableWorklet(
     const bool &shouldRetainRemote);
 
 // amznmod_react - export symbols for reanimated
-std::shared_ptr<Serializable> KEPLERSCRIPT_EXPORT extractSerializableOrThrow(
+std::shared_ptr<Serializable> REACT_NATIVE_WORKLETS_4_EXPORT extractSerializableOrThrow(
     jsi::Runtime &rt,
     const jsi::Value &maybeSerializableValue,
     const std::string &errorMessage =
@@ -244,7 +244,7 @@ class SerializableArray : public Serializable {
 };
 
 // amznmod_react - export symbols for reanimated
-class KEPLERSCRIPT_EXPORT SerializableObject : public Serializable {
+class REACT_NATIVE_WORKLETS_4_EXPORT SerializableObject : public Serializable {
  public:
   SerializableObject(jsi::Runtime &rt, const jsi::Object &object);
 
@@ -328,7 +328,8 @@ class SerializableArrayBuffer : public Serializable {
   const std::vector<uint8_t> data_;
 };
 
-class KEPLERSCRIPT_EXPORT SerializableWorklet : public SerializableObject {
+// amznmod_react - export symbols for reanimated
+class REACT_NATIVE_WORKLETS_4_EXPORT SerializableWorklet : public SerializableObject {
  public:
   SerializableWorklet(jsi::Runtime &rt, const jsi::Object &worklet)
       : SerializableObject(rt, worklet) {

package/Common/cpp/worklets/Tools/JSISerializer.h

@@ -1,12 +1,12 @@
 #pragma once
 
-// amznmod_react - export symbols for reanimated
-#include <keplerui-083/keplerscript-export.h>
-
 #include <jsi/jsi.h>
 #include <string>
 #include <vector>
 
+// amznmod_react - export symbols for reanimated
+#include "react-native-worklets-4_export.h"
+
 using namespace facebook;
 
 namespace worklets {
@@ -46,6 +46,6 @@ class JSISerializer {
 };
 
 // amznmod_react - export symbols for reanimated
-std::string KEPLERSCRIPT_EXPORT stringifyJSIValue(jsi::Runtime &rt, const jsi::Value &value);
+std::string REACT_NATIVE_WORKLETS_4_EXPORT stringifyJSIValue(jsi::Runtime &rt, const jsi::Value &value);
 
 } // namespace worklets

package/Common/cpp/worklets/Tools/JSScheduler.h

@@ -1,18 +1,20 @@
 #pragma once
 
-#include <keplerui-083/keplerscript-export.h>
-
 #include <ReactCommon/CallInvoker.h>
 #include <jsi/jsi.h>
 
 #include <memory>
 
+// amznmod_react - export symbols for reanimated
+#include "react-native-worklets-4_export.h"
+
 using namespace facebook;
 using namespace react;
 
 namespace worklets {
 
-class KEPLERSCRIPT_EXPORT JSScheduler {
+// amznmod_react - export symbols for reanimated
+class REACT_NATIVE_WORKLETS_4_EXPORT JSScheduler {
   using Job = std::function<void(jsi::Runtime &rt)>;
 
  public:

package/Common/cpp/worklets/Tools/SingleInstanceChecker.h

@@ -17,7 +17,8 @@
 
 // amzn_mod - use KPLog for logging on Kepler
 #ifdef KEPLER
-#include <KeplerScript/logger/KPLog.h>
+#include <Kepler/turbomodule/TMLog.h>
+#include <fmt/format.h>
 #endif // KEPLER
 
 namespace worklets {
@@ -40,7 +41,7 @@ class SingleInstanceChecker {
       __android_log_print(ANDROID_LOG_WARN, "Worklets", "%s", message.c_str());
 // amzn_mod - add logging on Kepler
 #elif defined(KEPLER)
-      volta::react::KPLog.warn("[Worklets] {}", message);
+      TMWARN(fmt::format("[Worklets] {}", message));
 #else
       std::cerr << "[Worklets] " << message << std::endl;
 #endif

package/Common/cpp/worklets/Tools/UIScheduler.h

@@ -1,18 +1,18 @@
 #pragma once
 
-// amznmod_react - export symbols for reanimated
-#include <keplerui-083/keplerscript-export.h>
-
 #include <worklets/Tools/ThreadSafeQueue.h>
 
 #include <ReactCommon/CallInvoker.h>
 
 #include <atomic>
 
+// amznmod_react - export symbols for reanimated
+#include "react-native-worklets-4_export.h"
+
 namespace worklets {
 
 // amznmod_react - export symbols for reanimated
-class KEPLERSCRIPT_EXPORT UIScheduler {
+class REACT_NATIVE_WORKLETS_4_EXPORT UIScheduler {
  public:
   virtual void scheduleOnUI(std::function<void()> job);
   virtual void triggerUI();

package/Common/cpp/worklets/Tools/VersionUtils.h

@@ -1,8 +1,5 @@
 #pragma once
 
-// amznmod_react - export symbols for reanimated
-#include <keplerui-083/keplerscript-export.h>
-
 #include <worklets/Tools/JSLogger.h>
 
 #include <jsi/jsi.h>
@@ -17,7 +14,7 @@ namespace worklets {
 bool matchVersion(const std::string &version1, const std::string &version2);
 
 // amznmod_react - export symbols for reanimated
-void KEPLERSCRIPT_EXPORT checkJSVersion(
+void __attribute__((visibility("default"))) checkJSVersion(
     jsi::Runtime &runtime,
     jsi::Value &jsVersionValue,
     const std::shared_ptr<worklets::JSLogger> &jsLogger,

package/Common/cpp/worklets/Tools/WorkletsSystraceSection.h

@@ -13,11 +13,6 @@
 #include <sstream>
 #endif // OS_LOG_TARGET_HAS_10_15_FEATURES
 
-// amznmod_react - add support for tracing on Vega
-#elif defined(KEPLER)
-
-#include <Volta/trace/Tracing.h>
-
 #elif defined(ANDROID)
 
 #include <android/trace.h>
@@ -125,26 +120,6 @@ struct WorkletsSystraceSection {
   std::string_view name_;
 };
 
-// amznmod_react - add support for tracing on Vega
-#elif defined(KEPLER) and defined(WORKLETS_PROFILING) && not defined(VOLTA_DARWIN)
-
-struct WorkletsSystraceSection {
- public:
-  template <typename... ConvertsToStringPiece>
-  explicit WorkletsSystraceSection(
-      const char *name,
-      ConvertsToStringPiece &&...args) {
-    name_ = name;
-    VOLTA_TRACE_BEGIN_STR(name_.data());
-  }
-
-  ~WorkletsSystraceSection() {
-    VOLTA_TRACE_END_STR(name_.data());
-  }
- private:
-  std::string_view name_;
-};
-
 #else
 
 struct WorkletsSystraceSection {