fix: handle gc protection in runtime run loop

NativeScript · Dec 5, 2024 · 78b5e37 · 78b5e37
1 parent 8b932a3
commit 78b5e37
Showing 1 changed file with 60 additions and 23 deletions.
diff --git a/NativeScript/runtime/ClassBuilder.mm b/NativeScript/runtime/ClassBuilder.mm
@@ -268,19 +268,30 @@
                 return retain(self, @selector(retain));
             }
             if ([self retainCount] == 1) {
-                auto innerCache = isolateWrapper.GetCache();
-                auto it = innerCache->Instances.find(self);
-                if (it != innerCache->Instances.end()) {
-                    v8::Locker locker(isolate);
-                    Isolate::Scope isolate_scope(isolate);
-                    HandleScope handle_scope(isolate);
-                    Local<Value> value = it->second->Get(isolate);
-                    BaseDataWrapper* wrapper = tns::GetValue(isolate, value);
-                    if (wrapper != nullptr && wrapper->Type() == WrapperType::ObjCObject) {
-                        ObjCDataWrapper* objcWrapper = static_cast<ObjCDataWrapper*>(wrapper);
-                        objcWrapper->GcProtect();
+                auto runtime = Runtime::GetRuntime(isolate);
+                auto runtimeLoop = runtime->RuntimeLoop();
+                void* weakSelf = (__bridge void*) self;
+                auto gcProtect = ^() {
+                    auto innerCache = isolateWrapper.GetCache();
+                    auto it = innerCache->Instances.find((id)weakSelf);
+                    if (it != innerCache->Instances.end()) {
+                        v8::Locker locker(isolate);
+                        Isolate::Scope isolate_scope(isolate);
+                        HandleScope handle_scope(isolate);
+                        Local<Value> value = it->second->Get(isolate);
+                        BaseDataWrapper* wrapper = tns::GetValue(isolate, value);
+                        if (wrapper != nullptr && wrapper->Type() == WrapperType::ObjCObject) {
+                            ObjCDataWrapper* objcWrapper = static_cast<ObjCDataWrapper*>(wrapper);
+                            objcWrapper->GcProtect();
+                        }
                     }
+                };
+                if(CFRunLoopGetCurrent() != runtimeLoop) {
+                    tns::ExecuteOnRunLoop(runtimeLoop, gcProtect);
+                } else {
+                    gcProtect();
                 }
+
             }
 
             return retain(self, @selector(retain));
@@ -295,18 +306,44 @@
             }
 
             if ([self retainCount] == 2) {
-                auto innerCache = isolateWrapper.GetCache();
-                auto it = innerCache->Instances.find(self);
-                if (it != innerCache->Instances.end()) {
-                    v8::Locker locker(isolate);
-                    Isolate::Scope isolate_scope(isolate);
-                    HandleScope handle_scope(isolate);
-                    if (it->second != nullptr) {
-                        Local<Value> value = it->second->Get(isolate);
-                        BaseDataWrapper* wrapper = tns::GetValue(isolate, value);
-                        if (wrapper != nullptr && wrapper->Type() == WrapperType::ObjCObject) {
-                            ObjCDataWrapper* objcWrapper = static_cast<ObjCDataWrapper*>(wrapper);
-                            objcWrapper->GcUnprotect();
+                void* weakSelf = (__bridge void*) self;
+                auto gcUnprotect = ^() {
+
+
+                    auto innerCache = isolateWrapper.GetCache();
+                    auto it = innerCache->Instances.find((id)weakSelf);
+                    if (it != innerCache->Instances.end()) {
+                        v8::Locker locker(isolate);
+                        Isolate::Scope isolate_scope(isolate);
+                        HandleScope handle_scope(isolate);
+                        if (it->second != nullptr) {
+                            Local<Value> value = it->second->Get(isolate);
+                            BaseDataWrapper* wrapper = tns::GetValue(isolate, value);
+                            if (wrapper != nullptr && wrapper->Type() == WrapperType::ObjCObject) {
+                                ObjCDataWrapper* objcWrapper = static_cast<ObjCDataWrapper*>(wrapper);
+                                objcWrapper->GcUnprotect();
+                            }
+                        }
+                    }
+                };
+                auto runtime = Runtime::GetRuntime(isolate);
+                auto runtimeLoop = runtime->RuntimeLoop();
+                if(CFRunLoopGetCurrent() != runtimeLoop) {
+                    tns::ExecuteOnRunLoop(runtimeLoop, gcUnprotect);
+                } else {
+                    auto innerCache = isolateWrapper.GetCache();
+                    auto it = innerCache->Instances.find(self);
+                    if (it != innerCache->Instances.end()) {
+                        v8::Locker locker(isolate);
+                        Isolate::Scope isolate_scope(isolate);
+                        HandleScope handle_scope(isolate);
+                        if (it->second != nullptr) {
+                            Local<Value> value = it->second->Get(isolate);
+                            BaseDataWrapper* wrapper = tns::GetValue(isolate, value);
+                            if (wrapper != nullptr && wrapper->Type() == WrapperType::ObjCObject) {
+                                ObjCDataWrapper* objcWrapper = static_cast<ObjCDataWrapper*>(wrapper);
+                                objcWrapper->GcUnprotect();
+                            }
                         }
                     }
                 }