Skip to content

[0.72] Release long lived JSI objects ASAP #12388

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

Merged
microsoft-github-policy-service merged 3 commits into from
Nov 14, 2023
Merged

[0.72] Release long lived JSI objects ASAP #12388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
84aad62
Release long lived JSI objects ASAP
vmoroz Nov 13, 2023
e245ae0
Change files
vmoroz Nov 13, 2023
31a2b4e
Fix scenario BG thread scenario
vmoroz Nov 14, 2023
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
7 changes: 7 additions & 0 deletions change/react-native-windows-86ce2be3-b89f-4ddb-9476-45f3d6c9cd21.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Release long lived JSI objects ASAP",
"packageName": "react-native-windows",
"email": "vmorozov@microsoft.com",
"dependentChangeType": "patch"
}
29 changes: 18 additions & 11 deletions vnext/Microsoft.ReactNative/JSDispatcherWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ JSDispatcherWriter::JSDispatcherWriter(
std::weak_ptr<LongLivedJsiRuntime> jsiRuntimeHolder) noexcept
: m_jsDispatcher(jsDispatcher), m_jsiRuntimeHolder(std::move(jsiRuntimeHolder)) {}

JSDispatcherWriter::~JSDispatcherWriter() {
if (auto jsiRuntimeHolder = m_jsiRuntimeHolder.lock()) {
jsiRuntimeHolder->allowRelease();
}
}

void JSDispatcherWriter::WithResultArgs(
Mso::Functor<void(facebook::jsi::Runtime &rt, facebook::jsi::Value const *args, size_t argCount)>
handler) noexcept {
Expand All @@ -49,17 +55,18 @@ void JSDispatcherWriter::WithResultArgs(
VerifyElseCrash(!m_jsiWriter);
folly::dynamic dynValue = m_dynamicWriter->TakeValue();
VerifyElseCrash(dynValue.isArray());
m_jsDispatcher.Post([handler, dynValue = std::move(dynValue), weakJsiRuntimeHolder = m_jsiRuntimeHolder]() {
if (auto jsiRuntimeHolder = weakJsiRuntimeHolder.lock()) {
std::vector<facebook::jsi::Value> args;
args.reserve(dynValue.size());
auto &runtime = jsiRuntimeHolder->Runtime();
for (auto const &item : dynValue) {
args.emplace_back(facebook::jsi::valueFromDynamic(runtime, item));
}
handler(runtime, args.data(), args.size());
}
});
m_jsDispatcher.Post(
[handler, dynValue = std::move(dynValue), weakJsiRuntimeHolder = m_jsiRuntimeHolder, self = get_strong()]() {
if (auto jsiRuntimeHolder = weakJsiRuntimeHolder.lock()) {
std::vector<facebook::jsi::Value> args;
args.reserve(dynValue.size());
auto &runtime = jsiRuntimeHolder->Runtime();
for (auto const &item : dynValue) {
args.emplace_back(facebook::jsi::valueFromDynamic(runtime, item));
}
handler(runtime, args.data(), args.size());
}
});
}
}

Expand Down
1 change: 1 addition & 0 deletions vnext/Microsoft.ReactNative/JSDispatcherWriter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ namespace winrt::Microsoft::ReactNative {
// In case if writing is done outside of JSDispatcher, it uses DynamicWriter to create
// folly::dynamic which then is written to JsiWriter in JSDispatcher.
struct JSDispatcherWriter : winrt::implements<JSDispatcherWriter, IJSValueWriter> {
~JSDispatcherWriter();
JSDispatcherWriter(
IReactDispatcher const &jsDispatcher,
std::weak_ptr<LongLivedJsiRuntime> jsiRuntimeHolder) noexcept;
Expand Down
132 changes: 92 additions & 40 deletions vnext/Microsoft.ReactNative/TurboModulesProvider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,11 +221,46 @@ class TurboModuleImpl : public facebook::react::TurboModule {
VerifyElseCrash(argCount > 1);
if (auto strongLongLivedObjectCollection = longLivedObjectCollection.lock()) {
auto jsiRuntimeHolder = LongLivedJsiRuntime::CreateWeak(strongLongLivedObjectCollection, rt);
auto weakCallback1 = LongLivedJsiFunction::CreateWeak(
strongLongLivedObjectCollection, rt, args[argCount - 2].getObject(rt).getFunction(rt));
auto weakCallback2 = LongLivedJsiFunction::CreateWeak(
strongLongLivedObjectCollection, rt, args[argCount - 1].getObject(rt).getFunction(rt));

method(
winrt::make<JsiReader>(rt, args, argCount - 2),
winrt::make<JSDispatcherWriter>(jsDispatcher, jsiRuntimeHolder),
MakeCallback(rt, strongLongLivedObjectCollection, args[argCount - 2]),
MakeCallback(rt, strongLongLivedObjectCollection, args[argCount - 1]));
[weakCallback1, weakCallback2, jsiRuntimeHolder](const IJSValueWriter &writer) noexcept {
writer.as<JSDispatcherWriter>()->WithResultArgs(
[weakCallback1, weakCallback2, jsiRuntimeHolder](
facebook::jsi::Runtime &rt, facebook::jsi::Value const *args, size_t count) {
if (auto callback1 = weakCallback1.lock()) {
callback1->Value().call(rt, args, count);
callback1->allowRelease();
}
if (auto callback2 = weakCallback2.lock()) {
callback2->allowRelease();
}
if (auto runtimeHolder = jsiRuntimeHolder.lock()) {
runtimeHolder->allowRelease();
}
});
},
[weakCallback1, weakCallback2, jsiRuntimeHolder](const IJSValueWriter &writer) noexcept {
writer.as<JSDispatcherWriter>()->WithResultArgs(
[weakCallback1, weakCallback2, jsiRuntimeHolder](
facebook::jsi::Runtime &rt, facebook::jsi::Value const *args, size_t count) {
if (auto callback2 = weakCallback2.lock()) {
callback2->Value().call(rt, args, count);
callback2->allowRelease();
}
if (auto callback1 = weakCallback1.lock()) {
callback1->allowRelease();
}
if (auto runtimeHolder = jsiRuntimeHolder.lock()) {
runtimeHolder->allowRelease();
}
});
});
}
return facebook::jsi::Value::undefined();
});
Expand All @@ -247,49 +282,65 @@ class TurboModuleImpl : public facebook::react::TurboModule {
auto argWriter = winrt::make<JSDispatcherWriter>(jsDispatcher, jsiRuntimeHolder);
return facebook::react::createPromiseAsJSIValue(
rt,
[method, argReader, argWriter, strongLongLivedObjectCollection](
[method, argReader, argWriter, strongLongLivedObjectCollection, jsiRuntimeHolder](
facebook::jsi::Runtime &runtime, std::shared_ptr<facebook::react::Promise> promise) {
auto weakResolve = LongLivedJsiFunction::CreateWeak(
strongLongLivedObjectCollection, runtime, std::move(promise->resolve_));
auto weakReject = LongLivedJsiFunction::CreateWeak(
strongLongLivedObjectCollection, runtime, std::move(promise->reject_));
method(
argReader,
argWriter,
[weakResolve = LongLivedJsiFunction::CreateWeak(
strongLongLivedObjectCollection, runtime, std::move(promise->resolve_))](
const IJSValueWriter &writer) {
writer.as<JSDispatcherWriter>()->WithResultArgs([weakResolve](
facebook::jsi::Runtime &runtime,
facebook::jsi::Value const *args,
size_t argCount) {
VerifyElseCrash(argCount == 1);
if (auto resolveHolder = weakResolve.lock()) {
resolveHolder->Value().call(runtime, args[0]);
}
});
[weakResolve, weakReject, jsiRuntimeHolder](const IJSValueWriter &writer) {
writer.as<JSDispatcherWriter>()->WithResultArgs(
[weakResolve, weakReject, jsiRuntimeHolder](
facebook::jsi::Runtime &runtime,
facebook::jsi::Value const *args,
size_t argCount) {
VerifyElseCrash(argCount == 1);
if (auto resolveHolder = weakResolve.lock()) {
resolveHolder->Value().call(runtime, args[0]);
resolveHolder->allowRelease();
}
if (auto rejectHolder = weakReject.lock()) {
rejectHolder->allowRelease();
}
if (auto runtimeHolder = jsiRuntimeHolder.lock()) {
runtimeHolder->allowRelease();
}
});
},
[weakReject = LongLivedJsiFunction::CreateWeak(
strongLongLivedObjectCollection, runtime, std::move(promise->reject_))](
const IJSValueWriter &writer) {
writer.as<JSDispatcherWriter>()->WithResultArgs([weakReject](
facebook::jsi::Runtime &runtime,
facebook::jsi::Value const *args,
size_t argCount) {
VerifyElseCrash(argCount == 1);
if (auto rejectHolder = weakReject.lock()) {
// To match the Android and iOS TurboModule behavior we create the Error object for
// the Promise rejection the same way as in updateErrorWithErrorData method.
// See react-native/Libraries/BatchedBridge/NativeModules.js for details.
auto error = runtime.global()
.getPropertyAsFunction(runtime, "Error")
.callAsConstructor(runtime, {});
auto &errorData = args[0];
if (errorData.isObject()) {
runtime.global()
.getPropertyAsObject(runtime, "Object")
.getPropertyAsFunction(runtime, "assign")
.call(runtime, error, errorData.getObject(runtime));
}
rejectHolder->Value().call(runtime, args[0]);
}
});
[weakResolve, weakReject, jsiRuntimeHolder](const IJSValueWriter &writer) {
writer.as<JSDispatcherWriter>()->WithResultArgs(
[weakResolve, weakReject, jsiRuntimeHolder](
facebook::jsi::Runtime &runtime,
facebook::jsi::Value const *args,
size_t argCount) {
VerifyElseCrash(argCount == 1);
if (auto rejectHolder = weakReject.lock()) {
// To match the Android and iOS TurboModule behavior we create the Error object
// for the Promise rejection the same way as in updateErrorWithErrorData method.
// See react-native/Libraries/BatchedBridge/NativeModules.js for details.
auto error = runtime.global()
.getPropertyAsFunction(runtime, "Error")
.callAsConstructor(runtime, {});
auto &errorData = args[0];
if (errorData.isObject()) {
runtime.global()
.getPropertyAsObject(runtime, "Object")
.getPropertyAsFunction(runtime, "assign")
.call(runtime, error, errorData.getObject(runtime));
}
rejectHolder->Value().call(runtime, args[0]);
rejectHolder->allowRelease();
}
if (auto resolveHolder = weakResolve.lock()) {
resolveHolder->allowRelease();
}
if (auto runtimeHolder = jsiRuntimeHolder.lock()) {
runtimeHolder->allowRelease();
}
});
});
});
}
Expand Down Expand Up @@ -347,6 +398,7 @@ class TurboModuleImpl : public facebook::react::TurboModule {
[weakCallback](facebook::jsi::Runtime &rt, facebook::jsi::Value const *args, size_t count) {
if (auto callback = weakCallback.lock()) {
callback->Value().call(rt, args, count);
callback->allowRelease();
}
});
};
Expand Down