Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Crash on UI Scheduling with invalidated WorkletsModuleProxy #6893

Closed
wants to merge 1 commit into from
+19 −0
Closed

fix: Crash on UI Scheduling with invalidated WorkletsModuleProxy #6893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions packages/react-native-reanimated/Common/cpp/worklets/NativeModules/WorkletsModuleProxy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,15 @@ WorkletsModuleProxy::WorkletsModuleProxy(
valueUnpackerCode_)) {}

WorkletsModuleProxy::~WorkletsModuleProxy() {
// We need an exclusive lock to make sure nothing can be scheduled on the UI
// during the destructor invocation.
uiWorkletRuntimeMutex_.lock();

isValid_ = false;
jsQueue_->quitSynchronous();
uiWorkletRuntime_.reset();

uiWorkletRuntimeMutex_.unlock();
}

jsi::Value WorkletsModuleProxy::makeShareableClone(
Expand All @@ -70,6 +77,13 @@ jsi::Value WorkletsModuleProxy::makeShareableClone(
void WorkletsModuleProxy::scheduleOnUI(
jsi::Runtime &rt,
const jsi::Value &worklet) {
// We need a shared lock here to make sure the UI runtime is not being
// destroyed while we are scheduling worklets on it.
uiWorkletRuntimeMutex_.lock_shared();
if (!isValid_) {
return;
}

auto shareableWorklet = extractShareableOrThrow<ShareableWorklet>(
rt, worklet, "[Worklets] Only worklets can be scheduled to run on UI.");
uiScheduler_->scheduleOnUI(COPY_CAPTURE_WITH_THIS {
Expand All @@ -82,6 +96,8 @@ void WorkletsModuleProxy::scheduleOnUI(
const auto scope = jsi::Scope(uiWorkletRuntime_->getJSIRuntime());
#endif
uiWorkletRuntime_->runGuarded(shareableWorklet);

uiWorkletRuntimeMutex_.unlock_shared();
});
}

Expand Down
3 changes: 3 additions & 0 deletions packages/react-native-reanimated/Common/cpp/worklets/NativeModules/WorkletsModuleProxy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include <worklets/Tools/UIScheduler.h>
#include <worklets/WorkletRuntime/WorkletRuntime.h>
#include <memory>
#include <shared_mutex>
#include <string>

namespace worklets {
Expand Down Expand Up @@ -74,6 +75,8 @@ class WorkletsModuleProxy : public WorkletsModuleProxySpec {
#ifndef NDEBUG
SingleInstanceChecker<WorkletsModuleProxy> singleInstanceChecker_;
#endif // NDEBUG
bool isValid_{true};
std::shared_mutex uiWorkletRuntimeMutex_;
};

} // namespace worklets
Loading