[iOS] support jsTaskQueue thread safe

apache · Aug 7, 2019 · bc252dc · bc252dc
1 parent b333c98
commit bc252dc
Showing 1 changed file with 23 additions and 13 deletions.
diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXBridgeManager.m b/ios/sdk/WeexSDK/Sources/Manager/WXBridgeManager.m
@@ -151,7 +151,7 @@ + (void)_performBlockOnBridgeThread:(void (^)(void))block
     if ([NSThread currentThread] == [self jsThread]) {
         block();
     } else {
-        [self performSelector:@selector(_performBlockOnBridgeThread:instance:)
+        [self performSelector:@selector(_performBlockOnBridgeThread:)
                          onThread:[self jsThread]
                        withObject:[block copy]
                     waitUntilDone:NO];
@@ -205,12 +205,18 @@ + (void)_performBlockOnBackupBridgeThread:(void (^)(void))block putInTaskQueue:(
         return;
     }
     if (putInTaskQueue) {
-        [[WXSDKManager bridgeMgr].jsTaskQueue addObject:block];
+        [WXBridgeManager _performBlockOnBackupBridgeThread:^{
+            [[WXSDKManager bridgeMgr].jsTaskQueue addObject:block];
+        } putInTaskQueue:NO];
     } else {
-        [self performSelector:@selector(_performBlockOnBridgeThread:instance:)
-                     onThread:[self backupJsThread]
-                   withObject:[block copy]
-                waitUntilDone:NO];
+        if ([NSThread currentThread] == [self backupJsThread]) {
+            block();
+        } else {
+            [self performSelector:@selector(_performBlockOnBridgeThread:instance:)
+                         onThread:[self backupJsThread]
+                       withObject:[block copy]
+                    waitUntilDone:NO];
+        }
     }
 }
 
@@ -350,13 +356,17 @@ - (void)createInstance:(NSString *)instance
 }
 
 - (void)executeJSTaskQueue {
-    if (_jsTaskQueue.count == 0 || !_supportMultiJSThread) {
-        return;
-    }
-    for (id block in _jsTaskQueue) {
-        [WXBridgeManager _performBlockOnBackupBridgeThread:block putInTaskQueue:NO];
-    }
-    [_jsTaskQueue removeAllObjects];
+    __weak typeof(self) weakSelf = self;
+    [WXBridgeManager _performBlockOnBackupBridgeThread:^{
+        if (weakSelf.jsTaskQueue.count == 0 || !weakSelf.supportMultiJSThread) {
+            return;
+        }
+        for (id task in weakSelf.jsTaskQueue) {
+            void (^block)(void) = task;
+            block();
+        }
+        [weakSelf.jsTaskQueue removeAllObjects];
+    } putInTaskQueue:NO];
 }
 
 - (WXThreadSafeMutableArray *)instanceIdStack