[iOS] Restore recursive lock and add some comments. (#1726)

apache · Nov 9, 2018 · bd663a8 · bd663a8
1 parent f1117e5
commit bd663a8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXThreadSafeMutableArray.h b/ios/sdk/WeexSDK/Sources/Utility/WXThreadSafeMutableArray.h
@@ -24,6 +24,10 @@
  */
 @interface WXThreadSafeMutableArray : NSMutableArray
 
+/* WXThreadSafeMutableArray inherites from NSMutableArray for backward capability.
+ Keep in mind that only the following methods are thread safe guaranteed.
+ And MUST not use other methods provideded by NSMutableArray. */
+
 - (instancetype)init;
 - (instancetype)initWithCapacity:(NSUInteger)numItems;
 - (instancetype)initWithArray:(NSArray *)array;

diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXThreadSafeMutableArray.m b/ios/sdk/WeexSDK/Sources/Utility/WXThreadSafeMutableArray.m
@@ -36,7 +36,7 @@ - (instancetype)initCommon
     self = [super init];
     if (self) {
         pthread_mutexattr_init(&(_safeThreadArrayMutexAttr));
-        pthread_mutexattr_settype(&(_safeThreadArrayMutexAttr), PTHREAD_MUTEX_DEFAULT);
+        pthread_mutexattr_settype(&(_safeThreadArrayMutexAttr), PTHREAD_MUTEX_RECURSIVE); // must use recursive lock
         pthread_mutex_init(&(_safeThreadArrayMutex), &(_safeThreadArrayMutexAttr));
     }
     return self;

diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXThreadSafeMutableDictionary.h b/ios/sdk/WeexSDK/Sources/Utility/WXThreadSafeMutableDictionary.h
@@ -24,6 +24,10 @@
  */
 @interface WXThreadSafeMutableDictionary<KeyType, ObjectType> : NSMutableDictionary
 
+/* WXThreadSafeMutableDictionary inherites from NSMutableDictionary for backward capability.
+ Keep in mind that only the following methods are thread safe guaranteed.
+ And MUST not use other methods provideded by NSMutableDictionary. */
+
 - (instancetype)init;
 - (instancetype)initWithCapacity:(NSUInteger)numItems;
 - (instancetype)initWithDictionary:(NSDictionary *)dictionary;

diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXThreadSafeMutableDictionary.m b/ios/sdk/WeexSDK/Sources/Utility/WXThreadSafeMutableDictionary.m
@@ -36,7 +36,7 @@ - (instancetype)initCommon
     self = [super init];
     if (self) {
         pthread_mutexattr_init(&(_safeThreadDictionaryMutexAttr));
-        pthread_mutexattr_settype(&(_safeThreadDictionaryMutexAttr), PTHREAD_MUTEX_DEFAULT);
+        pthread_mutexattr_settype(&(_safeThreadDictionaryMutexAttr), PTHREAD_MUTEX_RECURSIVE); // must use recursive lock
         pthread_mutex_init(&(_safeThreadDictionaryMutex), &(_safeThreadDictionaryMutexAttr));
     }
     return self;