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

[0.72][JSCRuntime] Add runtimeConfig to set debugger options #1959

Merged
merged 3 commits into from
Oct 28, 2023
Merged

[0.72][JSCRuntime] Add runtimeConfig to set debugger options #1959

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
7547366
Refactor _JSC_HAS_INSPECTABLE to support macOS
Saadnajmi Oct 27, 2023
817e82e
[JSCRuntime] Add runtimeConfig to set debugger options
Saadnajmi Oct 27, 2023
6343bce
Add macOS tags to RuntimeConfig changes
Saadnajmi Oct 27, 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
11 changes: 11 additions & 0 deletions packages/react-native/React/CxxBridge/JSCExecutorFactory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,23 @@ class JSCExecutorFactory : public JSExecutorFactory {
explicit JSCExecutorFactory(JSIExecutor::RuntimeInstaller runtimeInstaller)
: runtimeInstaller_(std::move(runtimeInstaller)) {}

// [macOS
void setEnableDebugger(bool enableDebugger);

void setDebuggerName(const std::string &debuggerName);
// macOS]

std::unique_ptr<JSExecutor> createJSExecutor(
std::shared_ptr<ExecutorDelegate> delegate,
std::shared_ptr<MessageQueueThread> jsQueue) override;

private:
JSIExecutor::RuntimeInstaller runtimeInstaller_;

// [macOS
bool enableDebugger_ = true;
std::string debuggerName_ = "JSC React Native";
// macOS]
};

} // namespace react
Expand Down
19 changes: 17 additions & 2 deletions packages/react-native/React/CxxBridge/JSCExecutorFactory.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,27 @@
namespace facebook {
namespace react {

// [macOS
void JSCExecutorFactory::setEnableDebugger(bool enableDebugger) {
enableDebugger_ = enableDebugger;
}

void JSCExecutorFactory::setDebuggerName(const std::string &debuggerName) {
debuggerName_ = debuggerName;
}
// macOS]

std::unique_ptr<JSExecutor> JSCExecutorFactory::createJSExecutor(
std::shared_ptr<ExecutorDelegate> delegate,
std::shared_ptr<MessageQueueThread> __unused jsQueue)
{
return std::make_unique<JSIExecutor>(
facebook::jsc::makeJSCRuntime(), delegate, JSIExecutor::defaultTimeoutInvoker, runtimeInstaller_);
// [macOS
facebook::jsc::RuntimeConfig rc = {
.enableDebugger = enableDebugger_,
.debuggerName = debuggerName_,
};
return std::make_unique<JSIExecutor>(facebook::jsc::makeJSCRuntime(std::move(rc)), delegate, JSIExecutor::defaultTimeoutInvoker, runtimeInstaller_);
// macOS]
}

} // namespace react
Expand Down
30 changes: 29 additions & 1 deletion packages/react-native/ReactCommon/jsc/JSCRuntime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ class JSCRuntime : public jsi::Runtime {
public:
// Creates new context in new context group
JSCRuntime();
// [macOS
// Creates new context in new context group with config
JSCRuntime(const facebook::jsc::RuntimeConfig& rc);
// macOS]
// Retains ctx
JSCRuntime(JSGlobalContextRef ctx);
~JSCRuntime();
Expand Down Expand Up @@ -293,7 +297,7 @@ class JSCRuntime : public jsi::Runtime {
} \
} while (0)

#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) // [macOS]
// This takes care of watch and tvos (due to backwards compatibility in
// Availability.h
#if __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_9_0
Expand All @@ -316,6 +320,11 @@ class JSCRuntime : public jsi::Runtime {
#if __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_12
#define _JSC_NO_ARRAY_BUFFERS
#endif
// [macOS
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 130300
#define _JSC_HAS_INSPECTABLE
#endif
// macOS]
#endif

// JSStringRef utilities
Expand Down Expand Up @@ -392,6 +401,19 @@ JSCRuntime::JSCRuntime()
JSGlobalContextRelease(ctx_);
}

// [macOS
JSCRuntime::JSCRuntime(const facebook::jsc::RuntimeConfig& rc)
: JSCRuntime() {
#ifdef _JSC_HAS_INSPECTABLE
if (__builtin_available(macOS 13.3, iOS 16.4, tvOS 16.4, *)) {
JSGlobalContextSetInspectable(ctx_, rc.enableDebugger);
}
#endif
JSGlobalContextSetName(ctx_, JSStringCreateWithUTF8CString(rc.debuggerName.c_str()));

}
// macOS]

JSCRuntime::JSCRuntime(JSGlobalContextRef ctx)
: ctx_(JSGlobalContextRetain(ctx)),
ctxInvalid_(false)
Expand Down Expand Up @@ -1567,5 +1589,11 @@ std::unique_ptr<jsi::Runtime> makeJSCRuntime() {
return std::make_unique<JSCRuntime>();
}

// [macOS
std::unique_ptr<jsi::Runtime> makeJSCRuntime(const facebook::jsc::RuntimeConfig& rc) {
return std::make_unique<JSCRuntime>(rc);
}
// macOS]

} // namespace jsc
} // namespace facebook
9 changes: 9 additions & 0 deletions packages/react-native/ReactCommon/jsc/JSCRuntime.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,16 @@
namespace facebook {
namespace jsc {

// [macOS
struct RuntimeConfig {
bool enableDebugger;
std::string debuggerName;
};
// macOS]

std::unique_ptr<jsi::Runtime> makeJSCRuntime();

std::unique_ptr<jsi::Runtime> makeJSCRuntime(const facebook::jsc::RuntimeConfig& rc); // [macOS]

} // namespace jsc
} // namespace facebook