@nativescript/canvas 2.0.0-webgpu.3 → 2.0.0-webgpu.30

package/platforms/ios/src/NSOperationQueueWrapper.h

@@ -3,7 +3,7 @@
 #include <functional>
 class NSOperationQueueWrapper {
 public:
-    NSOperationQueueWrapper(bool currentQueue);
+    NSOperationQueueWrapper(bool currentQueue, bool serial = false);
     ~NSOperationQueueWrapper();
 
     void addOperation(std::function<void()> task);

package/platforms/ios/src/NSOperationQueueWrapper.mm

@@ -7,12 +7,16 @@
 
 @implementation NSOperationQueueWrapperObjC {
     NSOperationQueue* operationQueue;
+    __CFRunLoop* current;
+    BOOL isSerial;
 }
 
 - (instancetype)init {
     self = [super init];
     if (self) {
-        operationQueue = [[NSOperationQueue alloc] init];
+        isSerial = false;
+        operationQueue = NULL;
+        current = NULL;
     }
     return self;
 }
@@ -20,7 +24,15 @@
 -(instancetype)initWithCurrentQueue {
     self = [super init];
     if (self) {
-        operationQueue = [NSOperationQueue currentQueue];
+        current = CFRunLoopGetCurrent();
+    }
+    return self;
+}
+
+-(instancetype)initWithSerial:(BOOL)serial {
+    self = [super init];
+    if (self) {
+        isSerial = serial;
     }
     return self;
 }
@@ -28,11 +40,32 @@
 - (void)dealloc {}
 
 - (void)addOperation:(void (^)())task {
-    NSBlockOperation* operation = [NSBlockOperation blockOperationWithBlock:^{
-        task();
-    }];
     
-    [operationQueue addOperation:operation];
+    if(current != NULL){
+        if(current == CFRunLoopGetCurrent()){
+            task();
+        }else {
+            CFRunLoopPerformBlock(current, kCFRunLoopDefaultMode, ^{
+                task();
+            });
+            CFRunLoopWakeUp(current);
+        }
+    }else if(operationQueue != NULL){
+        NSBlockOperation* operation = [NSBlockOperation blockOperationWithBlock:^{
+            task();
+        }];
+        
+        [operationQueue addOperation:operation];
+    }else if(isSerial){
+        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_SERIAL, 0), ^{
+              task();
+          });
+        
+    }else {
+        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+              task();
+          });
+    }
 }
 
 - (NSOperationQueue*)getOperationQueue {
@@ -42,7 +75,7 @@
 
 @end
 
-NSOperationQueueWrapper::NSOperationQueueWrapper(bool currentQueue) {
+NSOperationQueueWrapper::NSOperationQueueWrapper(bool currentQueue, bool serial) {
     if (currentQueue) {
         NSOperationQueueWrapperObjC* objcWrapper = [[NSOperationQueueWrapperObjC alloc] initWithCurrentQueue];
         
@@ -50,11 +83,10 @@ NSOperationQueueWrapper::NSOperationQueueWrapper(bool currentQueue) {
     
         operationQueue = (void*)ptr;
     }else {
-        NSOperationQueueWrapperObjC* objcWrapper = [[NSOperationQueueWrapperObjC alloc] init];
+        NSOperationQueueWrapperObjC* objcWrapper = [[NSOperationQueueWrapperObjC alloc] initWithSerial: serial];
         CFTypeRef ptr = (__bridge_retained CFTypeRef)objcWrapper;
         operationQueue = (void*)ptr;
     }
-   
 }
 
 NSOperationQueueWrapper::~NSOperationQueueWrapper() {

package/platforms/ios/src/cpp/AsyncCallback.h

@@ -19,6 +19,7 @@
 
 #include <unistd.h>
 #include <fcntl.h>
+#include <thread>
 
 typedef void(*CompleteCallback)(bool success, void *data);
 
@@ -45,14 +46,23 @@ struct AsyncCallback {
             this->completeCallbackWrapper_ = [](bool success, void *data){
                 if(data != nullptr){
                     auto* callback = static_cast<AsyncCallback*>(data);
-                    auto inner = callback->inner_.get();
-                    if(inner == nullptr || inner->current_queue == nullptr){
+                    if(callback->inner_->current_queue == nullptr){
                         return;
                     }
-                    inner->current_queue->addOperation([success, data, inner, callback](){
+                    
+                    auto inner = std::shared_ptr<Inner>(callback->inner_);
+                                        
+                    std::thread thread([success, data, callback](std::shared_ptr<Inner> inner){
+                        inner->current_queue = nullptr;
                         inner->completeCallback_(success, data);
-                       // delete callback;
-                    });
+                    }, std::move(inner));
+                    
+                    thread.detach();
+                    
+//                    callback->inner_->current_queue->addOperation([success, data, callback, inner_ptr](){
+//                        inner_ptr->completeCallback_(success, data);
+//                       // delete callback;
+//                    });
                 }
             };
         }
@@ -170,7 +180,7 @@ struct AsyncCallback {
         auto data = new AsyncCallback(this->inner_);
         ALooper_addFd(looper,
                       fd,
-                      ALOOPER_POLL_CALLBACK,
+                      0,
                       ALOOPER_EVENT_INPUT,
                       [](int fd, int events,
                          void *data) {
@@ -181,8 +191,6 @@ struct AsyncCallback {
                           cb->inner_->completeCallback_(done, data);
                           return 0;
                       }, (void *) data);
-
-        ALooper_wake(looper);
     }
 
     void execute(bool complete) const {