[iOS] Fix ios mutlithread related issues. Refactor WXThreadSafeMutableXXX containers. (#1716)

Author: wqyfavor

ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m

@@ -30,7 +30,6 @@
 #import "WXSDKManager.h"
 #import "WXDebugTool.h"
 #import "WXSDKInstance_private.h"
-#import "WXThreadSafeMutableArray.h"
 #import "WXAppConfiguration.h"
 #import "WXInvocationConfig.h"
 #import "WXComponentMethod.h"

ios/sdk/WeexSDK/Sources/Component/WXListComponent.mm

@@ -31,7 +31,6 @@
 #import "WXSDKInstance_private.h"
 #import "WXRefreshComponent.h"
 #import "WXLoadingComponent.h"
-#import "WXThreadSafeMutableArray.h"
 
 @interface WXTableView : UITableView
 
@@ -95,12 +94,8 @@ @implementation WXSectionComponent
 - (instancetype)init
 {
     if (self = [super init]) {
-		if ([WXUtility listSectionRowThreadSafe]) {
-			_rows = [WXThreadSafeMutableArray array];
-		} else {
-			_rows = [NSMutableArray array];
-		}    }
-    
+        _rows = [NSMutableArray array];
+    }
     return self;
 }
 

ios/sdk/WeexSDK/Sources/Controller/WXRootViewController.m

@@ -19,14 +19,13 @@
 
 #import "WXRootViewController.h"
 #import "WXBaseViewController.h"
-#import "WXThreadSafeMutableArray.h"
 #import "WXDefine.h"
 
 typedef void(^OperationBlock)(void);
 
 @interface WXRootViewController() <UIGestureRecognizerDelegate>
 
-@property(nonatomic, strong) WXThreadSafeMutableArray *operationArray;
+@property (nonatomic, strong) NSMutableArray *operationArray;
 @property (nonatomic, assign) BOOL operationInProcess;
 
 @end
@@ -131,11 +130,10 @@ - (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
     return YES;
 }
 
-- (NSMutableArray *)pendingBlocks
+- (NSMutableArray *)operationArray
 {
-    
     if (nil == _operationArray) {
-        _operationArray = [[WXThreadSafeMutableArray alloc] init];
+        _operationArray = [[NSMutableArray alloc] init];
     }
 
     return _operationArray;

ios/sdk/WeexSDK/Sources/Manager/WXBridgeManager.m

@@ -31,12 +31,13 @@
 #import "WXTracingManager.h"
 #import "WXMonitor.h"
 #import "WXSDKInstance_performance.h"
+#import "WXThreadSafeMutableArray.h"
 
 @interface WXBridgeManager ()
 
-@property (nonatomic, strong) WXBridgeContext   *bridgeCtx;
-@property (nonatomic, assign) BOOL  stopRunning;
-@property (nonatomic, strong) NSMutableArray *instanceIdStack;
+@property (nonatomic, assign) BOOL stopRunning;
+@property (nonatomic, strong) WXBridgeContext *bridgeCtx;
+@property (nonatomic, strong) WXThreadSafeMutableArray *instanceIdStack;
 
 @end
 
@@ -202,26 +203,24 @@ - (void)createInstance:(NSString *)instance
 }
 
 
-- (NSMutableArray *)instanceIdStack
+- (WXThreadSafeMutableArray *)instanceIdStack
 {
     if (_instanceIdStack) return _instanceIdStack;
 
-    _instanceIdStack = [NSMutableArray array];
+    _instanceIdStack = [[WXThreadSafeMutableArray alloc] init];
 
     return _instanceIdStack;
 }
 
 - (NSArray *)getInstanceIdStack;
 {
-    return self.instanceIdStack;
+    return [self.instanceIdStack copy];
 }
 
 - (void)destroyInstance:(NSString *)instance
 {
     if (!instance) return;
-    if([self.instanceIdStack containsObject:instance]){
-        [self.instanceIdStack removeObject:instance];
-    }
+    [self.instanceIdStack removeObject:instance];
 
     __weak typeof(self) weakSelf = self;
     WXPerformBlockOnBridgeThread(^(){

ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.mm

@@ -89,7 +89,11 @@ - (instancetype)initWithWeexInstance:(id)weexInstance
         pthread_mutexattr_init(&_propertMutexAttr);
         pthread_mutexattr_settype(&_propertMutexAttr, PTHREAD_MUTEX_RECURSIVE);
         pthread_mutex_init(&_propertyMutex, &_propertMutexAttr);
-        [self _startDisplayLink];
+        
+        WXPerformBlockOnComponentThread(^{
+            // We should ensure that [WXDisplayLinkManager sharedInstance] is only invoked in component thread.
+            [self _startDisplayLink];
+        });
     }
 
     return self;

ios/sdk/WeexSDK/Sources/Manager/WXSDKManager.m

@@ -81,7 +81,7 @@ + (void)removeInstanceforID:(NSString *)identifier
 
 + (void)unload
 {
-    for (NSString *instanceID in [self sharedInstance].instanceDict) {
+    for (NSString *instanceID in [[self sharedInstance].instanceDict allKeys]) {
         WXSDKInstance *instance = [[self sharedInstance].instanceDict objectForKey:instanceID];
         [instance destroyInstance];
     }

ios/sdk/WeexSDK/Sources/Model/WXComponent.mm

@@ -30,8 +30,6 @@
 #import "WXConvert.h"
 #import "WXMonitor.h"
 #import "WXAssert.h"
-#import "WXThreadSafeMutableDictionary.h"
-#import "WXThreadSafeMutableArray.h"
 #import "WXTransform.h"
 #import "WXRoundedRect.h"
 #import <pthread/pthread.h>

ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.h

@@ -82,7 +82,7 @@ extern NSString *const bundleUrlOptionKey;
 @property (nonatomic, strong) NSDictionary* containerInfo;
 
 /**
- * Whether this instance is rendered or not. Please MUST not render an instance twice.
+ * Whether this instance is rendered or not. Please MUST not render an instance twice even if you have called destroyInstance.
  **/
 @property (nonatomic, assign, readonly) BOOL isRendered;
 
@@ -276,7 +276,7 @@ typedef NS_ENUM(NSInteger, WXErrorCode) {//error.code
 - (void)refreshInstance:(id)data;
 
 /**
- * Destroys current instance.
+ * Destroys current instance. An instance destroyed should not be used for rendering again, please create another instance.
  **/
 - (void)destroyInstance;
 

ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m

@@ -75,7 +75,6 @@ @implementation WXSDKInstance
     WXRootView *_rootView;
     WXThreadSafeMutableDictionary *_moduleEventObservers;
     BOOL _performanceCommit;
-    BOOL _syncDestroyComponentManager;
     BOOL _debugJS;
     id<WXBridgeProtocol> _instanceJavaScriptContext; // sandbox javaScript context    
     CGFloat _defaultPixelScaleFactor;
@@ -87,11 +86,6 @@ - (void)dealloc
 {
     [_moduleEventObservers removeAllObjects];
     [self removeObservers];
-    if (_syncDestroyComponentManager) {
-        WXPerformBlockSyncOnComponentThread(^{
-            _componentManager = nil;
-        });
-    }
 }
 
 - (instancetype)init
@@ -123,10 +117,6 @@ - (instancetype)init
         _performance = [[WXPerformance alloc] init];
         _apmInstance = [[WXApmForInstance alloc] init];
 
-        id configCenter = [WXSDKEngine handlerForProtocol:@protocol(WXConfigCenterProtocol)];
-        if ([configCenter respondsToSelector:@selector(configForKey:defaultValue:isDefault:)]) {
-            _syncDestroyComponentManager = [[configCenter configForKey:@"iOS_weex_ext_config.syncDestroyComponentManager" defaultValue:@(YES) isDefault:NULL] boolValue];
-        }
         _defaultPixelScaleFactor = CGFLOAT_MIN;
         _bReleaseInstanceInMainThread = YES;
         _defaultDataRender = NO;
@@ -447,14 +437,9 @@ - (BOOL)_handleConfigCenter
     if ([configCenter respondsToSelector:@selector(configForKey:defaultValue:isDefault:)]) {
         BOOL useCoreText = [[configCenter configForKey:@"iOS_weex_ext_config.text_render_useCoreText" defaultValue:@YES isDefault:NULL] boolValue];
         [WXTextComponent setRenderUsingCoreText:useCoreText];
-        BOOL useThreadSafeLock = [[configCenter configForKey:@"iOS_weex_ext_config.useThreadSafeLock" defaultValue:@YES isDefault:NULL] boolValue];
-        [WXUtility setThreadSafeCollectionUsingLock:useThreadSafeLock];
 
         BOOL unregisterFontWhenCollision = [[configCenter configForKey:@"iOS_weex_ext_config.unregisterFontWhenCollision" defaultValue:@NO isDefault:NULL] boolValue];
         [WXUtility setUnregisterFontWhenCollision:unregisterFontWhenCollision];
-
-		BOOL listSectionRowThreadSafe = [[configCenter configForKey:@"iOS_weex_ext_config.listSectionRowThreadSafe" defaultValue:@(YES) isDefault:NULL] boolValue];
-		[WXUtility setListSectionRowThreadSafe:listSectionRowThreadSafe];
 
         BOOL useJSCApiForCreateInstance = [[configCenter configForKey:@"iOS_weex_ext_config.useJSCApiForCreateInstance" defaultValue:@(YES) isDefault:NULL] boolValue];
         [WXUtility setUseJSCApiForCreateInstance:useJSCApiForCreateInstance];
@@ -663,25 +648,22 @@ - (void)destroyInstance
     [WXPrerenderManager destroyTask:self.instanceId];
     [[WXSDKManager bridgeMgr] destroyInstance:self.instanceId];
 
-    __weak typeof(self) weakSelf = self;
+    WXComponentManager* componentManager = self.componentManager;
+    NSString* instanceId = self.instanceId;
+    
     WXPerformBlockOnComponentThread(^{
-        __strong typeof(self) strongSelf = weakSelf;
-        if (strongSelf == nil) {
-            return;
-        }
-        
         // Destroy components and views in main thread. Unbind with underneath RenderObjects.
-        [strongSelf.componentManager unload];
+        [componentManager unload];
 
         // Destroy weexcore c++ page and objects.
-        [WXCoreBridge closePage:strongSelf.instanceId];
+        [WXCoreBridge closePage:instanceId];
 
         // Reading config from orange for Release instance in Main Thread or not, for Bug #15172691 +{
         if (!_bReleaseInstanceInMainThread) {
-            [WXSDKManager removeInstanceforID:strongSelf.instanceId];
+            [WXSDKManager removeInstanceforID:instanceId];
         } else {
             dispatch_async(dispatch_get_main_queue(), ^{
-                [WXSDKManager removeInstanceforID:strongSelf.instanceId];
+                [WXSDKManager removeInstanceforID:instanceId];
             });
         }
         //+}
@@ -690,8 +672,6 @@ - (void)destroyInstance
     if (url.length > 0) {
         [WXPrerenderManager addGlobalTask:url callback:nil];
     }
-    
-    _isRendered = NO;
 }
 
 - (void)forceGarbageCollection

ios/sdk/WeexSDK/Sources/Utility/WXThreadSafeMutableArray.h

@@ -24,4 +24,28 @@
  */
 @interface WXThreadSafeMutableArray : NSMutableArray
 
+- (instancetype)init;
+- (instancetype)initWithCapacity:(NSUInteger)numItems;
+- (instancetype)initWithArray:(NSArray *)array;
+- (instancetype)initWithCoder:(NSCoder *)aDecoder;
+- (instancetype)initWithObjects:(const id [])objects count:(NSUInteger)cnt;
+
+- (NSUInteger)count;
+- (id)objectAtIndex:(NSUInteger)index;
+- (id)objectAtIndexedSubscript:(NSUInteger)index;
+- (id)firstObject;
+- (id)lastObject;
+- (BOOL)containsObject:(id)anObject;
+- (NSEnumerator *)objectEnumerator;
+- (NSEnumerator *)reverseObjectEnumerator;
+- (void)insertObject:(id)anObject atIndex:(NSUInteger)index;
+- (void)setObject:(id)anObject atIndexedSubscript:(NSUInteger)index;
+- (void)addObject:(id)anObject;
+- (void)removeObject:(id)anObject;
+- (void)removeObjectAtIndex:(NSUInteger)index;
+- (void)removeLastObject;
+- (void)removeAllObjects;
+- (void)replaceObjectAtIndex:(NSUInteger)index withObject:(id)anObject;
+- (NSUInteger)indexOfObject:(id)anObject;
+
 @end