Fix semaphore initialization timing. (#806)

CoderMJLee · Jan 18, 2021 · c75f414 · c75f414
1 parent 7b3bc5b
commit c75f414
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 24 deletions.
diff --git a/MJExtension/MJExtensionConst.h b/MJExtension/MJExtensionConst.h
@@ -12,6 +12,13 @@
 #define MJ_UNLOCK(lock) dispatch_semaphore_signal(lock);
 #endif
 
+// 信号量
+#define MJExtensionSemaphoreCreate \
+extern dispatch_semaphore_t mje_signalSemaphore; \
+extern dispatch_once_t mje_onceTokenSemaphore; \
+dispatch_once(&mje_onceTokenSemaphore, ^{ \
+    mje_signalSemaphore = dispatch_semaphore_create(1); \
+});
 
 // 过期
 #define MJExtensionDeprecated(instead) NS_DEPRECATED(2_0, 2_0, 2_0, 2_0, instead)

diff --git a/MJExtension/NSObject+MJClass.m b/MJExtension/NSObject+MJClass.m
@@ -17,8 +17,6 @@
 static const char MJAllowedCodingPropertyNamesKey = '\0';
 static const char MJIgnoredCodingPropertyNamesKey = '\0';
 
-extern dispatch_semaphore_t signalSemaphore;
-
 @implementation NSObject (MJClass)
 
 + (NSMutableDictionary *)mj_classDictForKey:(const void *)key
@@ -141,15 +139,16 @@ + (void)mj_setupBlockReturnValue:(id (^)(void))block key:(const char *)key
     }
 
     // 清空数据
-    MJ_LOCK(signalSemaphore);
+    MJExtensionSemaphoreCreate
+    MJ_LOCK(mje_signalSemaphore);
     [[self mj_classDictForKey:key] removeAllObjects];
-    MJ_UNLOCK(signalSemaphore);
+    MJ_UNLOCK(mje_signalSemaphore);
 }
 
 + (NSMutableArray *)mj_totalObjectsWithSelector:(SEL)selector key:(const char *)key
 {
-
-    MJ_LOCK(signalSemaphore);
+    MJExtensionSemaphoreCreate
+    MJ_LOCK(mje_signalSemaphore);
     NSMutableArray *array = [self mj_classDictForKey:key][NSStringFromClass(self)];
     if (array == nil) {
         // 创建、存储
@@ -170,7 +169,7 @@ + (NSMutableArray *)mj_totalObjectsWithSelector:(SEL)selector key:(const char *)
             [array addObjectsFromArray:subArray];
         }];
     }
-    MJ_UNLOCK(signalSemaphore);
+    MJ_UNLOCK(mje_signalSemaphore);
     return array;
 }
 @end
diff --git a/MJExtension/NSObject+MJProperty.m b/MJExtension/NSObject+MJProperty.m
@@ -25,18 +25,11 @@
 
 static const char MJCachedPropertiesKey = '\0';
 
-dispatch_semaphore_t signalSemaphore;
+dispatch_semaphore_t mje_signalSemaphore;
+dispatch_once_t mje_onceTokenSemaphore;
 
 @implementation NSObject (Property)
 
-+ (void)load
-{
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        signalSemaphore = dispatch_semaphore_create(1);
-    });
-}
-
 + (NSMutableDictionary *)mj_propertyDictForKey:(const void *)key
 {
     static NSMutableDictionary *replacedKeyFromPropertyNameDict;
@@ -133,9 +126,10 @@ + (Class)mj_propertyObjectClassInArray:(NSString *)propertyName
 + (void)mj_enumerateProperties:(MJPropertiesEnumeration)enumeration
 {
     // 获得成员变量
-    MJ_LOCK(signalSemaphore);
+    MJExtensionSemaphoreCreate
+    MJ_LOCK(mje_signalSemaphore);
     NSArray *cachedProperties = [self mj_properties];
-    MJ_UNLOCK(signalSemaphore);
+    MJ_UNLOCK(mje_signalSemaphore);
     // 遍历成员变量
     BOOL stop = NO;
     for (MJProperty *property in [cachedProperties copy]) {
@@ -210,28 +204,31 @@ + (void)mj_setupObjectClassInArray:(MJObjectClassInArray)objectClassInArray
 {
     [self mj_setupBlockReturnValue:objectClassInArray key:&MJObjectClassInArrayKey];
 
-    MJ_LOCK(signalSemaphore);
+    MJExtensionSemaphoreCreate
+    MJ_LOCK(mje_signalSemaphore);
     [[self mj_propertyDictForKey:&MJCachedPropertiesKey] removeAllObjects];
-    MJ_UNLOCK(signalSemaphore);
+    MJ_UNLOCK(mje_signalSemaphore);
 }
 
 #pragma mark - key配置
 + (void)mj_setupReplacedKeyFromPropertyName:(MJReplacedKeyFromPropertyName)replacedKeyFromPropertyName
 {
     [self mj_setupBlockReturnValue:replacedKeyFromPropertyName key:&MJReplacedKeyFromPropertyNameKey];
 
-    MJ_LOCK(signalSemaphore);
+    MJExtensionSemaphoreCreate
+    MJ_LOCK(mje_signalSemaphore);
     [[self mj_propertyDictForKey:&MJCachedPropertiesKey] removeAllObjects];
-    MJ_UNLOCK(signalSemaphore);
+    MJ_UNLOCK(mje_signalSemaphore);
 }
 
 + (void)mj_setupReplacedKeyFromPropertyName121:(MJReplacedKeyFromPropertyName121)replacedKeyFromPropertyName121
 {
     objc_setAssociatedObject(self, &MJReplacedKeyFromPropertyName121Key, replacedKeyFromPropertyName121, OBJC_ASSOCIATION_COPY_NONATOMIC);
 
-    MJ_LOCK(signalSemaphore);
+    MJExtensionSemaphoreCreate
+    MJ_LOCK(mje_signalSemaphore);
     [[self mj_propertyDictForKey:&MJCachedPropertiesKey] removeAllObjects];
-    MJ_UNLOCK(signalSemaphore);
+    MJ_UNLOCK(mje_signalSemaphore);
 }
 @end
 #pragma clang diagnostic pop
diff --git a/MJExtensionDemo/AppDelegate.m b/MJExtensionDemo/AppDelegate.m
@@ -17,6 +17,7 @@ @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     // Override point for customization after application launch.
+
     return YES;
 }