Skip to content

Commit b9367b9

Browse files
javachemeta-codesync[bot]
javache
authored and
meta-codesync[bot]
committed
Remove RuntimeSchedulerCallInvoker
Summary: Remove the deprecated `RuntimeSchedulerCallInvoker` implementation now that React instances expose their buffered `CallInvoker`. Make that invoker available through the runtime binding and migrate remaining consumers to use it. Changelog: [General][Breaking] - Remove the deprecated `RuntimeSchedulerCallInvoker` API Differential Revision: D123627753
1 parent 5548a9a commit b9367b9

15 files changed

Lines changed: 68 additions & 114 deletions

‎packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.cpp‎

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@
66
*/
77

88
#include "RuntimeSchedulerBinding.h"
9+
#include <React/Debug.h>
910
#include <ReactCommon/SchedulerPriority.h>
1011
#include <react/timing/primitives.h>
1112
#include "RuntimeScheduler.h"
1213
#include "SchedulerPriorityUtils.h"
1314
#include "primitives.h"
1415

16+
#include <cstdlib>
1517
#include <memory>
1618
#include <utility>
1719

@@ -20,16 +22,17 @@ namespace facebook::react {
2022
std::shared_ptr<RuntimeSchedulerBinding>
2123
RuntimeSchedulerBinding::createAndInstallIfNeeded(
2224
jsi::Runtime& runtime,
23-
const std::shared_ptr<RuntimeScheduler>& runtimeScheduler) {
25+
const std::shared_ptr<RuntimeScheduler>& runtimeScheduler,
26+
std::shared_ptr<CallInvoker> callInvoker) {
2427
auto runtimeSchedulerModuleName = "nativeRuntimeScheduler";
2528

2629
auto runtimeSchedulerValue =
2730
runtime.global().getProperty(runtime, runtimeSchedulerModuleName);
2831
if (runtimeSchedulerValue.isUndefined()) {
2932
// The global namespace does not have an instance of the binding;
3033
// we need to create, install and return it.
31-
auto runtimeSchedulerBinding =
32-
std::make_shared<RuntimeSchedulerBinding>(runtimeScheduler);
34+
auto runtimeSchedulerBinding = std::make_shared<RuntimeSchedulerBinding>(
35+
runtimeScheduler, std::move(callInvoker));
3336
auto object =
3437
jsi::Object::createFromHostObject(runtime, runtimeSchedulerBinding);
3538
runtime.global().setProperty(
@@ -40,7 +43,12 @@ RuntimeSchedulerBinding::createAndInstallIfNeeded(
4043
// The global namespace already has an instance of the binding;
4144
// we need to return that.
4245
auto runtimeSchedulerObject = runtimeSchedulerValue.asObject(runtime);
43-
return runtimeSchedulerObject.getHostObject<RuntimeSchedulerBinding>(runtime);
46+
auto runtimeSchedulerBinding =
47+
runtimeSchedulerObject.getHostObject<RuntimeSchedulerBinding>(runtime);
48+
if (callInvoker) {
49+
runtimeSchedulerBinding->callInvoker_ = std::move(callInvoker);
50+
}
51+
return runtimeSchedulerBinding;
4452
}
4553

4654
std::shared_ptr<RuntimeSchedulerBinding> RuntimeSchedulerBinding::getBinding(
@@ -58,14 +66,25 @@ std::shared_ptr<RuntimeSchedulerBinding> RuntimeSchedulerBinding::getBinding(
5866
}
5967

6068
RuntimeSchedulerBinding::RuntimeSchedulerBinding(
61-
std::shared_ptr<RuntimeScheduler> runtimeScheduler)
62-
: runtimeScheduler_(std::move(runtimeScheduler)) {}
69+
std::shared_ptr<RuntimeScheduler> runtimeScheduler,
70+
std::shared_ptr<CallInvoker> callInvoker)
71+
: runtimeScheduler_(std::move(runtimeScheduler)),
72+
callInvoker_(std::move(callInvoker)) {}
6373

6474
std::shared_ptr<RuntimeScheduler>
6575
RuntimeSchedulerBinding::getRuntimeScheduler() noexcept {
6676
return runtimeScheduler_;
6777
}
6878

79+
std::shared_ptr<CallInvoker>
80+
RuntimeSchedulerBinding::getCallInvoker() noexcept {
81+
if (!callInvoker_) {
82+
react_native_assert(false && "CallInvoker is unavailable");
83+
std::abort();
84+
}
85+
return callInvoker_;
86+
}
87+
6988
jsi::Value RuntimeSchedulerBinding::get(
7089
jsi::Runtime& runtime,
7190
const jsi::PropNameID& name) {

‎packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.h‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,17 @@
1313

1414
namespace facebook::react {
1515

16+
class CallInvoker;
1617
class RuntimeScheduler;
1718

1819
/*
1920
* Exposes RuntimeScheduler to JavaScript realm.
2021
*/
2122
class RuntimeSchedulerBinding : public jsi::HostObject {
2223
public:
23-
RuntimeSchedulerBinding(std::shared_ptr<RuntimeScheduler> runtimeScheduler);
24+
RuntimeSchedulerBinding(
25+
std::shared_ptr<RuntimeScheduler> runtimeScheduler,
26+
std::shared_ptr<CallInvoker> callInvoker = nullptr);
2427

2528
/*
2629
* Installs RuntimeSchedulerBinding into JavaScript runtime if needed.
@@ -30,7 +33,8 @@ class RuntimeSchedulerBinding : public jsi::HostObject {
3033
*/
3134
static std::shared_ptr<RuntimeSchedulerBinding> createAndInstallIfNeeded(
3235
jsi::Runtime &runtime,
33-
const std::shared_ptr<RuntimeScheduler> &runtimeScheduler);
36+
const std::shared_ptr<RuntimeScheduler> &runtimeScheduler,
37+
std::shared_ptr<CallInvoker> callInvoker = nullptr);
3438

3539
/*
3640
* Returns a shared pointer to RuntimeSchedulerBinding previously installed
@@ -43,13 +47,19 @@ class RuntimeSchedulerBinding : public jsi::HostObject {
4347
*/
4448
std::shared_ptr<RuntimeScheduler> getRuntimeScheduler() noexcept;
4549

50+
/*
51+
* Returns the CallInvoker associated with the React instance.
52+
*/
53+
std::shared_ptr<CallInvoker> getCallInvoker() noexcept;
54+
4655
/*
4756
* `jsi::HostObject` specific overloads.
4857
*/
4958
jsi::Value get(jsi::Runtime &runtime, const jsi::PropNameID &name) override;
5059

5160
private:
5261
std::shared_ptr<RuntimeScheduler> runtimeScheduler_;
62+
std::shared_ptr<CallInvoker> callInvoker_;
5363
};
5464

5565
} // namespace facebook::react

‎packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.cpp‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.h‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎packages/react-native/ReactCommon/react/runtime/CallInvokerImpl.cpp‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,10 @@ void CallInvokerImpl::invokeAsync(CallFunc&& func) noexcept {
2121
// Held for the duration of the call: `BufferedRuntimeExecutor` reaches the
2222
// scheduler through a raw pointer, which is only safe while the instance that
2323
// owns it is alive. A CallInvoker outlives its instance routinely — a caller
24-
// can hold one across a reload — so the weak reference is what keeps this
25-
// from dispatching into a destroyed scheduler. Dropping the work matches what
26-
// `RuntimeSchedulerCallInvoker` does once its scheduler is gone.
24+
// can hold one across a reload — so guard dispatch with the weak scheduler.
25+
// If it has expired, there is no runtime left to receive the work.
2726
if (auto runtimeScheduler = runtimeScheduler_.lock()) {
28-
// No priority given, so this takes the executor's default — matching what
29-
// `RuntimeSchedulerCallInvoker` did via `scheduleWork`.
27+
// No priority was given, so use the executor's default.
3028
bufferedRuntimeExecutor_->execute(std::move(func));
3129
}
3230
}

‎packages/react-native/ReactCommon/react/runtime/ReactInstance.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ void ReactInstance::initializeRuntime(
443443
bindNativePerformanceNow(runtime);
444444

445445
RuntimeSchedulerBinding::createAndInstallIfNeeded(
446-
runtime, runtimeScheduler_);
446+
runtime, runtimeScheduler_, createJSCallInvoker());
447447

448448
runtime_->unstable_initializeOnJsThread();
449449

‎scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4463,9 +4463,10 @@ class facebook::react::RuntimeSchedulerBase : public facebook::hermes::IEventLoo
44634463
}
44644464

44654465
class facebook::react::RuntimeSchedulerBinding : public facebook::jsi::HostObject {
4466-
public RuntimeSchedulerBinding(std::shared_ptr<facebook::react::RuntimeScheduler> runtimeScheduler);
4467-
public static std::shared_ptr<facebook::react::RuntimeSchedulerBinding> createAndInstallIfNeeded(facebook::jsi::Runtime& runtime, const std::shared_ptr<facebook::react::RuntimeScheduler>& runtimeScheduler);
4466+
public RuntimeSchedulerBinding(std::shared_ptr<facebook::react::RuntimeScheduler> runtimeScheduler, std::shared_ptr<facebook::react::CallInvoker> callInvoker = nullptr);
4467+
public static std::shared_ptr<facebook::react::RuntimeSchedulerBinding> createAndInstallIfNeeded(facebook::jsi::Runtime& runtime, const std::shared_ptr<facebook::react::RuntimeScheduler>& runtimeScheduler, std::shared_ptr<facebook::react::CallInvoker> callInvoker = nullptr);
44684468
public static std::shared_ptr<facebook::react::RuntimeSchedulerBinding> getBinding(facebook::jsi::Runtime& runtime);
4469+
public std::shared_ptr<facebook::react::CallInvoker> getCallInvoker() noexcept;
44694470
public std::shared_ptr<facebook::react::RuntimeScheduler> getRuntimeScheduler() noexcept;
44704471
public virtual facebook::jsi::Value get(facebook::jsi::Runtime& runtime, const facebook::jsi::PropNameID& name) override;
44714472
}

‎scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4307,9 +4307,10 @@ class facebook::react::RuntimeSchedulerBase : public facebook::hermes::IEventLoo
43074307
}
43084308

43094309
class facebook::react::RuntimeSchedulerBinding : public facebook::jsi::HostObject {
4310-
public RuntimeSchedulerBinding(std::shared_ptr<facebook::react::RuntimeScheduler> runtimeScheduler);
4311-
public static std::shared_ptr<facebook::react::RuntimeSchedulerBinding> createAndInstallIfNeeded(facebook::jsi::Runtime& runtime, const std::shared_ptr<facebook::react::RuntimeScheduler>& runtimeScheduler);
4310+
public RuntimeSchedulerBinding(std::shared_ptr<facebook::react::RuntimeScheduler> runtimeScheduler, std::shared_ptr<facebook::react::CallInvoker> callInvoker = nullptr);
4311+
public static std::shared_ptr<facebook::react::RuntimeSchedulerBinding> createAndInstallIfNeeded(facebook::jsi::Runtime& runtime, const std::shared_ptr<facebook::react::RuntimeScheduler>& runtimeScheduler, std::shared_ptr<facebook::react::CallInvoker> callInvoker = nullptr);
43124312
public static std::shared_ptr<facebook::react::RuntimeSchedulerBinding> getBinding(facebook::jsi::Runtime& runtime);
4313+
public std::shared_ptr<facebook::react::CallInvoker> getCallInvoker() noexcept;
43134314
public std::shared_ptr<facebook::react::RuntimeScheduler> getRuntimeScheduler() noexcept;
43144315
public virtual facebook::jsi::Value get(facebook::jsi::Runtime& runtime, const facebook::jsi::PropNameID& name) override;
43154316
}

‎scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4460,9 +4460,10 @@ class facebook::react::RuntimeSchedulerBase : public facebook::hermes::IEventLoo
44604460
}
44614461

44624462
class facebook::react::RuntimeSchedulerBinding : public facebook::jsi::HostObject {
4463-
public RuntimeSchedulerBinding(std::shared_ptr<facebook::react::RuntimeScheduler> runtimeScheduler);
4464-
public static std::shared_ptr<facebook::react::RuntimeSchedulerBinding> createAndInstallIfNeeded(facebook::jsi::Runtime& runtime, const std::shared_ptr<facebook::react::RuntimeScheduler>& runtimeScheduler);
4463+
public RuntimeSchedulerBinding(std::shared_ptr<facebook::react::RuntimeScheduler> runtimeScheduler, std::shared_ptr<facebook::react::CallInvoker> callInvoker = nullptr);
4464+
public static std::shared_ptr<facebook::react::RuntimeSchedulerBinding> createAndInstallIfNeeded(facebook::jsi::Runtime& runtime, const std::shared_ptr<facebook::react::RuntimeScheduler>& runtimeScheduler, std::shared_ptr<facebook::react::CallInvoker> callInvoker = nullptr);
44654465
public static std::shared_ptr<facebook::react::RuntimeSchedulerBinding> getBinding(facebook::jsi::Runtime& runtime);
4466+
public std::shared_ptr<facebook::react::CallInvoker> getCallInvoker() noexcept;
44664467
public std::shared_ptr<facebook::react::RuntimeScheduler> getRuntimeScheduler() noexcept;
44674468
public virtual facebook::jsi::Value get(facebook::jsi::Runtime& runtime, const facebook::jsi::PropNameID& name) override;
44684469
}

‎scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6621,9 +6621,10 @@ class facebook::react::RuntimeSchedulerBase : public facebook::hermes::IEventLoo
66216621
}
66226622

66236623
class facebook::react::RuntimeSchedulerBinding : public facebook::jsi::HostObject {
6624-
public RuntimeSchedulerBinding(std::shared_ptr<facebook::react::RuntimeScheduler> runtimeScheduler);
6625-
public static std::shared_ptr<facebook::react::RuntimeSchedulerBinding> createAndInstallIfNeeded(facebook::jsi::Runtime& runtime, const std::shared_ptr<facebook::react::RuntimeScheduler>& runtimeScheduler);
6624+
public RuntimeSchedulerBinding(std::shared_ptr<facebook::react::RuntimeScheduler> runtimeScheduler, std::shared_ptr<facebook::react::CallInvoker> callInvoker = nullptr);
6625+
public static std::shared_ptr<facebook::react::RuntimeSchedulerBinding> createAndInstallIfNeeded(facebook::jsi::Runtime& runtime, const std::shared_ptr<facebook::react::RuntimeScheduler>& runtimeScheduler, std::shared_ptr<facebook::react::CallInvoker> callInvoker = nullptr);
66266626
public static std::shared_ptr<facebook::react::RuntimeSchedulerBinding> getBinding(facebook::jsi::Runtime& runtime);
6627+
public std::shared_ptr<facebook::react::CallInvoker> getCallInvoker() noexcept;
66276628
public std::shared_ptr<facebook::react::RuntimeScheduler> getRuntimeScheduler() noexcept;
66286629
public virtual facebook::jsi::Value get(facebook::jsi::Runtime& runtime, const facebook::jsi::PropNameID& name) override;
66296630
}

0 commit comments

Comments
 (0)