Performance optimization

Common/cpp/NativeModules/NativeReanimatedModule.cpp

@@ -80,6 +80,10 @@ NativeReanimatedModule::NativeReanimatedModule(std::shared_ptr<CallInvoker> jsIn
                                       platformDepMethodsHolder.scrollToFunction,
                                       platformDepMethodsHolder.measuringFunction,
                                       platformDepMethodsHolder.getCurrentTime);
+   onRenderCallback = [this](double timestampMs) {
+    this->renderRequested = false;
+    this->onRender(timestampMs);
+  };
 }
 
 void NativeReanimatedModule::installCoreFunctions(jsi::Runtime &rt, const jsi::Value &valueSetter)
@@ -210,10 +214,7 @@ void NativeReanimatedModule::maybeRequestRender()
   if (!renderRequested)
   {
     renderRequested = true;
-    requestRender([this](double timestampMs) {
-      this->renderRequested = false;
-      this->onRender(timestampMs);
-    }, *this->runtime);
+    requestRender(onRenderCallback, *this->runtime);
   }
 }
 
@@ -223,7 +224,7 @@ void NativeReanimatedModule::onRender(double timestampMs)
   {
     std::vector<FrameCallback> callbacks = frameCallbacks;
     frameCallbacks.clear();
-    for (auto callback : callbacks)
+    for (auto& callback : callbacks)
     {
       callback(timestampMs);
     }

Common/cpp/SharedItems/MutableValueSetterProxy.cpp

@@ -9,16 +9,16 @@ namespace reanimated {
 
 void MutableValueSetterProxy::set(jsi::Runtime &rt, const jsi::PropNameID &name, const jsi::Value &newValue) {
   auto propName = name.utf8(rt);
-  if (propName == "value") {
-    // you call `this.value` inside of value setter, we should throw
-  } else if (propName == "_value") {
+  if (propName == "_value") {
     mutableValue->setValue(rt, newValue);
   } else if (propName == "_animation") {
     // TODO: assert to allow animation to be set from UI only
     if (mutableValue->animation.expired()) {
       mutableValue->animation = mutableValue->getWeakRef(rt);
     }
     *mutableValue->animation.lock() = jsi::Value(rt, newValue);
+  } else if (propName == "value") {
+      // you call `this.value` inside of value setter, we should throw
   }
 }
 

Common/cpp/SharedItems/ShareableValue.cpp

@@ -52,7 +52,6 @@ void ShareableValue::adaptCache(jsi::Runtime &rt, const jsi::Value &value) {
 }
 
 void ShareableValue::adapt(jsi::Runtime &rt, const jsi::Value &value, ValueType objectType) {
-  bool isRNRuntime = RuntimeDecorator::isReactRuntime(rt);
   if (value.isObject()) {
     jsi::Object object = value.asObject(rt);
     jsi::Value hiddenValue = object.getProperty(rt, HIDDEN_HOST_OBJECT_PROP);
@@ -117,7 +116,7 @@ void ShareableValue::adapt(jsi::Runtime &rt, const jsi::Value &value, ValueType
         valueContainer = std::make_unique<FrozenObjectWrapper>(std::make_shared<FrozenObject>(rt, object, runtimeManager));
         auto& frozenObject = ValueWrapper::asFrozenObject(valueContainer);
         containsHostFunction |= frozenObject->containsHostFunction;
-        if (isRNRuntime && !containsHostFunction) {
+        if (RuntimeDecorator::isReactRuntime(rt) && !containsHostFunction) {
           addHiddenProperty(rt, createHost(rt, frozenObject), object, HIDDEN_HOST_OBJECT_PROP);
         }
       }
@@ -154,7 +153,7 @@ void ShareableValue::adapt(jsi::Runtime &rt, const jsi::Value &value, ValueType
       );
       auto& frozenObject = ValueWrapper::asFrozenObject(valueContainer);
       containsHostFunction |= frozenObject->containsHostFunction;
-      if (isRNRuntime) {
+      if (RuntimeDecorator::isReactRuntime(rt)) {
         if (!containsHostFunction) {
           addHiddenProperty(rt, createHost(rt, frozenObject), object, HIDDEN_HOST_OBJECT_PROP);
         }
@@ -179,17 +178,16 @@ jsi::Value ShareableValue::getValue(jsi::Runtime &rt) {
   // TODO: maybe we can cache toJSValue results on a per-runtime basis, need to avoid ref loops
   if (RuntimeDecorator::isWorkletRuntime(rt)) {
     if (remoteValue.expired()) {
-      auto ref = getWeakRef(rt);
-      remoteValue = ref;
+      remoteValue = getWeakRef(rt);
     }
 
     if (remoteValue.lock()->isUndefined()) {
-      (*remoteValue.lock()) = jsi::Value(rt, toJSValue(rt));
+      (*remoteValue.lock()) = toJSValue(rt);
     }
     return jsi::Value(rt, *remoteValue.lock());
   } else {
     if (hostValue.get() == nullptr) {
-      hostValue = std::make_unique<jsi::Value>(rt, toJSValue(rt));
+      hostValue = std::make_unique<jsi::Value>(toJSValue(rt));
     }
     return jsi::Value(rt, *hostValue);
   }
@@ -339,8 +337,10 @@ jsi::Value ShareableValue::toJSValue(jsi::Runtime &rt) {
                    const jsi::Value *args,
                    size_t count
                    ) mutable -> jsi::Value {
-           jsi::Value oldJSThis = rt.global().getProperty(rt, "jsThis");
-           rt.global().setProperty(rt, "jsThis", *jsThis); //set jsThis
+           const jsi::String jsThisName = jsi::String::createFromAscii(rt, "jsThis");
+           jsi::Object global = rt.global();
+           jsi::Value oldJSThis = global.getProperty(rt, jsThisName);
+           global.setProperty(rt, jsThisName, *jsThis); //set jsThis
 
            jsi::Value res = jsi::Value::undefined();
            try {
@@ -361,8 +361,7 @@ jsi::Value ShareableValue::toJSValue(jsi::Runtime &rt) {
               runtimeManager->errorHandler->setError(str);
               runtimeManager->errorHandler->raise();
             }
-
-           rt.global().setProperty(rt, "jsThis", oldJSThis); //clean jsThis
+           global.setProperty(rt, jsThisName, oldJSThis); //clean jsThis
            return res;
         };
         return jsi::Function::createFromHostFunction(rt, jsi::PropNameID::forAscii(rt, name.c_str()), 0, clb);
@@ -394,9 +393,10 @@ jsi::Value ShareableValue::toJSValue(jsi::Runtime &rt) {
             }
 
             jsi::Value returnedValue;
-
-            jsi::Value oldJSThis = rt.global().getProperty(rt, "jsThis");
-            rt.global().setProperty(rt, "jsThis", jsThis); //set jsThis
+            const jsi::String jsThisName = jsi::String::createFromAscii(rt, "jsThis");
+            jsi::Object global = rt.global();
+            jsi::Value oldJSThis = global.getProperty(rt, jsThisName);
+            global.setProperty(rt, jsThisName, jsThis); //set jsThis
             try {
               returnedValue = funPtr->call(rt,
                                              static_cast<const jsi::Value*>(args),
@@ -416,7 +416,7 @@ jsi::Value ShareableValue::toJSValue(jsi::Runtime &rt) {
               runtimeManager->errorHandler->setError(str);
               runtimeManager->errorHandler->raise();
             }
-            rt.global().setProperty(rt, "jsThis", oldJSThis); //clean jsThis
+            global.setProperty(rt, jsThisName, oldJSThis); //clean jsThis
 
             delete [] args;
             // ToDo use returned value to return promise

Common/cpp/headers/NativeModules/NativeReanimatedModule.h

@@ -57,11 +57,12 @@ class NativeReanimatedModule : public NativeReanimatedModuleSpec, public Runtime
 private:
   std::shared_ptr<MapperRegistry> mapperRegistry;
   std::shared_ptr<EventHandlerRegistry> eventHandlerRegistry;
-  std::function<void(FrameCallback, jsi::Runtime&)> requestRender;
+  std::function<void(FrameCallback&, jsi::Runtime&)> requestRender;
   std::shared_ptr<jsi::Value> dummyEvent;
   std::vector<FrameCallback> frameCallbacks;
   bool renderRequested = false;
   std::function<jsi::Value(jsi::Runtime &, const int, const jsi::String &)> propObtainer;
+  std::function<void(double)> onRenderCallback;
 };
 
 } // namespace reanimated

android/src/main/cpp/NativeProxy.cpp

@@ -66,10 +66,12 @@ void NativeProxy::installJSIBindings()
     //as we use diffrent timer to better handle events. The lambda is translated to NodeManager.OnAnimationFrame
     //and treated just like reanimated 1 frame callbacks which make use of the timestamp.
     auto wrappedOnRender = [getCurrentTime, &rt, onRender](double doNotUse) {
-       double frameTimestamp = getCurrentTime();
-       rt.global().setProperty(rt, "_frameTimestamp", frameTimestamp);
-       onRender(frameTimestamp);
-       rt.global().setProperty(rt, "_frameTimestamp", jsi::Value::undefined());
+      jsi::Object global = rt.global();
+      jsi::String frameTimestampName = jsi::String::createFromAscii(rt, "_frameTimestamp");
+      double frameTimestamp = getCurrentTime();
+      global.setProperty(rt, frameTimestampName, frameTimestamp);
+      onRender(frameTimestamp);
+      global.setProperty(rt, frameTimestampName, jsi::Value::undefined());
     };
     this->requestRender(std::move(wrappedOnRender));
   };
@@ -119,9 +121,11 @@ void NativeProxy::installJSIBindings()
   _nativeReanimatedModule = module;
 
   this->registerEventHandler([module, getCurrentTime](std::string eventName, std::string eventAsString) {
-    module->runtime->global().setProperty(*module->runtime, "_eventTimestamp", getCurrentTime());
+    jsi::Object global = module->runtime->global();
+    jsi::String eventTimestampName = jsi::String::createFromAscii(*module->runtime, "_eventTimestamp");
+    global.setProperty(*module->runtime, eventTimestampName, getCurrentTime());
     module->onEvent(eventName, eventAsString);
-    module->runtime->global().setProperty(*module->runtime, "_eventTimestamp", jsi::Value::undefined());
+    global.setProperty(*module->runtime, eventTimestampName, jsi::Value::undefined());
   });
 
   runtime_->global().setProperty(

ios/native/NativeProxy.mm

@@ -124,9 +124,11 @@ static id convertJSIValueToObjCObject(jsi::Runtime &runtime, const jsi::Value &v
   auto requestRender = [reanimatedModule, &module](std::function<void(double)> onRender, jsi::Runtime &rt) {
     [reanimatedModule.nodesManager postOnAnimation:^(CADisplayLink *displayLink) {
       double frameTimestamp = displayLink.targetTimestamp * 1000;
-      rt.global().setProperty(rt, "_frameTimestamp", frameTimestamp);
+      jsi::Object global = rt.global();
+      jsi::String frameTimestampName = jsi::String::createFromAscii(rt, "_frameTimestamp");
+      global.setProperty(rt, frameTimestampName, frameTimestamp);
       onRender(frameTimestamp);
-      rt.global().setProperty(rt, "_frameTimestamp", jsi::Value::undefined());
+      global.setProperty(rt, frameTimestampName, jsi::Value::undefined());
     }];
   };
 
@@ -157,9 +159,11 @@ static id convertJSIValueToObjCObject(jsi::Runtime &runtime, const jsi::Value &v
     std::string eventAsString = folly::toJson(convertIdToFollyDynamic([event arguments][2]));
 
     eventAsString = "{ NativeMap:"  + eventAsString + "}";
-    module->runtime->global().setProperty(*module->runtime, "_eventTimestamp", CACurrentMediaTime() * 1000);
+    jsi::Object global = module->runtime->global();
+    jsi::String eventTimestampName = jsi::String::createFromAscii(*module->runtime, "_eventTimestamp");
+    global.setProperty(*module->runtime, eventTimestampName, CACurrentMediaTime() * 1000);
     module->onEvent(eventNameString, eventAsString);
-    module->runtime->global().setProperty(*module->runtime, "_eventTimestamp", jsi::Value::undefined());
+    global.setProperty(*module->runtime, eventTimestampName, jsi::Value::undefined());
   }];
 
   return module;