Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
47 changes: 44 additions & 3 deletions NativeScript/ffi/objc/napi/Class.mm
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,18 @@

napi_value JS_NSObject_alloc(napi_env env, napi_callback_info cbinfo);

namespace {

std::atomic<uint64_t> loadedImageGeneration{0};

// Image load functions cannot be unregistered and run on the loading thread
// with the ObjC runtime lock held, so this only touches process-wide state.
void onImageLoaded(const struct mach_header* /*header*/) {
loadedImageGeneration.fetch_add(1, std::memory_order_release);
}

} // namespace

inline bool tryGetInteropPointerArg(napi_env env, napi_value value, void** out) {
if (out == nullptr || value == nullptr) {
return false;
Expand Down Expand Up @@ -63,6 +75,10 @@ inline bool tryGetInteropPointerArg(napi_env env, napi_value value, void** out)
}

void ObjCBridgeState::registerClassGlobals(napi_env env, napi_value global) {
static std::once_flag imageLoadObserver;
std::call_once(imageLoadObserver, [] { objc_addLoadImageFunc(onImageLoaded); });
pendingMdClassesImageGeneration = loadedImageGeneration.load(std::memory_order_acquire);

MDSectionOffset offset = metadata->classesOffset;
while (offset < metadata->structsOffset) {
MDSectionOffset originalOffset = offset;
Expand Down Expand Up @@ -111,6 +127,8 @@ inline bool tryGetInteropPointerArg(napi_env env, napi_value value, void** out)
auto nativeClass = objc_getClass(runtimeName);
if (nativeClass != nil) {
mdClassesByPointer[nativeClass] = originalOffset;
} else {
pendingMdClasses.emplace_back(runtimeName, originalOffset);
}

napi_property_descriptor prop = {
Expand All @@ -127,6 +145,29 @@ inline bool tryGetInteropPointerArg(napi_env env, napi_value value, void** out)
}
}

bool ObjCBridgeState::resolvePendingMetadataClasses() {
if (pendingMdClasses.empty()) {
return false;
}

uint64_t generation = loadedImageGeneration.load(std::memory_order_acquire);
if (generation == pendingMdClassesImageGeneration) {
return false;
}
pendingMdClassesImageGeneration = generation;

size_t pendingCount = pendingMdClasses.size();
std::erase_if(pendingMdClasses, [this](const auto& pending) {
Class nativeClass = objc_getClass(pending.first);
if (nativeClass == nil) {
return false;
}
mdClassesByPointer.emplace(nativeClass, pending.second);
return true;
});
return pendingMdClasses.size() != pendingCount;
}

NAPI_FUNCTION(registerClass) {
NAPI_CALLBACK_BEGIN(1)

Expand Down Expand Up @@ -267,9 +308,9 @@ void setupObjCClassDecorator(napi_env env) {
return get_ref_value(env, find->second->constructor);
}

auto mdClass = bridgeState->mdClassesByPointer.find(superClass);
if (mdClass != bridgeState->mdClassesByPointer.end()) {
auto bridgedClass = bridgeState->getClass(env, mdClass->second);
MDSectionOffset superClassOffset = MD_SECTION_OFFSET_NULL;
if (bridgeState->findMetadataClassOffset(superClass, &superClassOffset)) {
auto bridgedClass = bridgeState->getClass(env, superClassOffset);
return get_ref_value(env, bridgedClass->constructor);
}

Expand Down
22 changes: 22 additions & 0 deletions NativeScript/ffi/objc/napi/ObjCBridge.h
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,26 @@ class ObjCBridgeState {

ObjCClass* getClass(napi_env env, MDSectionOffset offset);

inline bool findMetadataClassOffset(Class cls, MDSectionOffset* offset) {
auto find = mdClassesByPointer.find(cls);
if (find == mdClassesByPointer.end()) {
if (!resolvePendingMetadataClasses()) {
return false;
}
find = mdClassesByPointer.find(cls);
if (find == mdClassesByPointer.end()) {
return false;
}
}
*offset = find->second;
return true;
}

// Maps metadata classes whose image was not loaded when the class globals
// were registered. Only does work after another image has loaded since the
// last call. Returns whether any class was mapped.
bool resolvePendingMetadataClasses();

ObjCProtocol* getProtocol(napi_env env, MDSectionOffset offset);

Cif* getMethodCif(napi_env env, Method method);
Expand Down Expand Up @@ -972,6 +992,8 @@ class ObjCBridgeState {
std::unordered_map<MDSectionOffset, ObjCProtocol*> protocols;
std::unordered_map<Class, ObjCClass*> classesByPointer;
std::unordered_map<Class, MDSectionOffset> mdClassesByPointer;
std::vector<std::pair<const char*, MDSectionOffset>> pendingMdClasses;
uint64_t pendingMdClassesImageGeneration = 0;
std::unordered_map<Protocol*, MDSectionOffset> mdProtocolsByPointer;
std::unordered_map<void*, id> nativeObjectsByBridgeWrapper;
std::unordered_map<Class, napi_ref> constructorsByPointer;
Expand Down
18 changes: 9 additions & 9 deletions NativeScript/ffi/objc/napi/Object.mm
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,9 @@ napi_value findConstructorForClassObject(napi_env env, ObjCBridgeState* bridgeSt
}
}

auto metadataClass = bridgeState->mdClassesByPointer.find(cls);
if (metadataClass != bridgeState->mdClassesByPointer.end()) {
auto bridgedMetadataClass = bridgeState->getClass(env, metadataClass->second);
MDSectionOffset metadataOffset = MD_SECTION_OFFSET_NULL;
if (bridgeState->findMetadataClassOffset(cls, &metadataOffset)) {
auto bridgedMetadataClass = bridgeState->getClass(env, metadataOffset);
if (bridgedMetadataClass != nullptr) {
return get_ref_value(env, bridgedMetadataClass->constructor);
}
Expand Down Expand Up @@ -648,9 +648,9 @@ napi_value findConstructorForObject(napi_env env, ObjCBridgeState* bridgeState,

// Look up if there is a metadata-defined class
{
auto find = bridgeState->mdClassesByPointer.find(cls);
if (find != bridgeState->mdClassesByPointer.end()) {
auto cls = bridgeState->getClass(env, find->second);
MDSectionOffset metadataOffset = MD_SECTION_OFFSET_NULL;
if (bridgeState->findMetadataClassOffset(cls, &metadataOffset)) {
auto cls = bridgeState->getClass(env, metadataOffset);
return get_ref_value(env, cls->constructor);
}
}
Expand Down Expand Up @@ -745,9 +745,9 @@ napi_value findConstructorForObject(napi_env env, ObjCBridgeState* bridgeState,

auto cls = objectClass;

auto mdFindByPointer = mdClassesByPointer.find(cls);
if (mdFindByPointer != mdClassesByPointer.end()) {
classOffset = mdFindByPointer->second;
MDSectionOffset metadataOffset = MD_SECTION_OFFSET_NULL;
if (findMetadataClassOffset(cls, &metadataOffset)) {
classOffset = metadataOffset;
}

auto findByPointer = classesByPointer.find(cls);
Expand Down
Loading