Update SRRunLoopThread.m

SocketRocket/Internal/RunLoop/SRRunLoopThread.m

@@ -10,17 +10,48 @@
 //
 
 #import "SRRunLoopThread.h"
-
+#import <pthread.h>
 @interface SRRunLoopThread ()
-{
-    dispatch_group_t _waitGroup;
-}
 
 @property (nonatomic, strong, readwrite) NSRunLoop *runLoop;
 
+@property (assign, nonatomic) pthread_mutex_t lock;
+@property (assign, nonatomic) pthread_cond_t cond;
 @end
 
 @implementation SRRunLoopThread
+- (void)dealloc {
+    // 不用需要销毁
+    pthread_mutex_destroy(&_lock);
+    pthread_cond_destroy(&_cond);
+}
+- (void)__initMutex:(pthread_mutex_t *)mutex {
+
+    // 1.初始化属性
+    pthread_mutexattr_t attr;
+    pthread_mutexattr_init(&attr);
+    /*
+     * Mutex type attributes
+     */
+    //    #define PTHREAD_MUTEX_NORMAL        0
+    //    #define PTHREAD_MUTEX_ERRORCHECK    1
+    //    #define PTHREAD_MUTEX_RECURSIVE        2
+    //    #define PTHREAD_MUTEX_DEFAULT        PTHREAD_MUTEX_NORMAL
+
+    //    pthread_mutexattr_settype(&attr, NULL); 传空，默认 PTHREAD_MUTEX_DEFAULT
+    pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+
+    // 2.初始化锁
+    pthread_mutex_init(mutex, &attr);
+
+    // 3.销毁属性
+    pthread_mutexattr_destroy(&attr);
+
+    // 初始化条件
+    pthread_cond_init(&_cond, NULL);
+    // 加锁
+    pthread_mutex_lock(mutex);
+}
 
 + (instancetype)sharedThread
 {
@@ -38,18 +69,18 @@ - (instancetype)init
 {
     self = [super init];
     if (self) {
-        _waitGroup = dispatch_group_create();
-        dispatch_group_enter(_waitGroup);
+        [self __initMutex:&_lock];
     }
     return self;
 }
 
 - (void)main
 {
+
     @autoreleasepool {
         _runLoop = [NSRunLoop currentRunLoop];
-        dispatch_group_leave(_waitGroup);
-
+        // 激活一个等待该条件的线程
+        pthread_cond_signal(&_cond);
         // Add an empty run loop source to prevent runloop from spinning.
         CFRunLoopSourceContext sourceCtx = {
             .version = 0,
@@ -66,17 +97,18 @@ - (void)main
         CFRunLoopSourceRef source = CFRunLoopSourceCreate(NULL, 0, &sourceCtx);
         CFRunLoopAddSource(CFRunLoopGetCurrent(), source, kCFRunLoopDefaultMode);
         CFRelease(source);
-
+        
         while ([_runLoop runMode:NSDefaultRunLoopMode beforeDate:[NSDate distantFuture]]) {
-
+            
         }
         assert(NO);
     }
 }
 
 - (NSRunLoop *)runLoop;
 {
-    dispatch_group_wait(_waitGroup, DISPATCH_TIME_FOREVER);
+    // 等待条件（进入休眠，放开mutex锁；被唤醒后，会再次对mutex加锁）
+    pthread_cond_wait(&_cond, &_lock);
     return _runLoop;
 }
 

SocketRocket/SRWebSocket.m

@@ -18,8 +18,8 @@
 #ifdef HAS_ICU
 #import <unicode/utf8.h>
 #endif
-
-#import <libkern/OSAtomic.h>
+#import <os/lock.h>
+//#import <libkern/OSAtomic.h>
 
 #import "SRDelegateController.h"
 #import "SRIOConsumer.h"
@@ -80,12 +80,12 @@ @interface SRWebSocket ()  <NSStreamDelegate>
 @property (nonatomic, assign, readwrite) BOOL allowsUntrustedSSLCertificates;
 
 @property (nonatomic, strong, readonly) SRDelegateController *delegateController;
-
+@property (assign, nonatomic) os_unfair_lock mLock;
 @end
 
 @implementation SRWebSocket {
     SRMutex _kvoLock;
-    OSSpinLock _propertyLock;
+//    OSSpinLock _propertyLock;
 
     dispatch_queue_t _workQueue;
     NSMutableArray<SRIOConsumer *> *_consumers;
@@ -160,7 +160,8 @@ - (instancetype)initWithURLRequest:(NSURLRequest *)request protocols:(NSArray<NS
 
     _readyState = SR_CONNECTING;
 
-    _propertyLock = OS_SPINLOCK_INIT;
+//    _propertyLock = OS_SPINLOCK_INIT;
+    self.mLock = OS_UNFAIR_LOCK_INIT;
     _kvoLock = SRMutexInitRecursive();
     _workQueue = dispatch_queue_create(NULL, DISPATCH_QUEUE_SERIAL);
 
@@ -268,11 +269,11 @@ - (void)dealloc
     }
 
     SRMutexDestroy(_kvoLock);
+//    pthread_mutex_destroy(&_lock);
 }
 
 ///--------------------------------------
 #pragma mark - Accessors
-///--------------------------------------
 
 #pragma mark readyState
 
@@ -282,9 +283,11 @@ - (void)setReadyState:(SRReadyState)readyState
         SRMutexLock(_kvoLock);
         if (_readyState != readyState) {
             [self willChangeValueForKey:@"readyState"];
-            OSSpinLockLock(&_propertyLock);
+//            OSSpinLockLock(&_propertyLock);
+            os_unfair_lock_lock(&_mLock);
             _readyState = readyState;
-            OSSpinLockUnlock(&_propertyLock);
+//            OSSpinLockUnlock(&_propertyLock);
+            os_unfair_lock_unlock(&_mLock);
             [self didChangeValueForKey:@"readyState"];
         }
     }
@@ -296,9 +299,11 @@ - (void)setReadyState:(SRReadyState)readyState
 - (SRReadyState)readyState
 {
     SRReadyState state = 0;
-    OSSpinLockLock(&_propertyLock);
+//    OSSpinLockLock(&_propertyLock);
+    os_unfair_lock_lock(&_mLock);
     state = _readyState;
-    OSSpinLockUnlock(&_propertyLock);
+//    OSSpinLockUnlock(&_propertyLock);
+    os_unfair_lock_unlock(&_mLock);
     return state;
 }