Base, Locale, PlugIn, RunLoop: spell pthread as CF

Use `CFLock_t` instead of `pthread_mutex_t`.  This has a small semantic
change on Linux where we now use pthreads rather than a cmpxchg to
implement locking.  This makes the behaviour of POSIX-y systems and
Darwin more uniform.  Additionally, we now generically target pthreads
on any system that supports POSIX threading.  Windows continues to
behave differently (though should replace the cmpxchg in favour of
SWRLOCK).

This leaves the open question of why do we not use `pthread_spinlock_t`
to implement the libkern `OSSpinLock*` family of functions.  If we do
so, we should be able to fold away the differences on POSIX and Darwin
systems.

Author: compnerd

CoreFoundation/Base.subproj/CFInternal.h

@@ -522,53 +522,46 @@ typedef pthread_mutex_t CFLock_t;
 
 #define __CFLockTry(LP) ({ pthread_mutex_trylock(LP) == 0; })
 
-#elif DEPLOYMENT_TARGET_WINDOWS
+#elif _POSIX_THREADS
 
-typedef int32_t CFLock_t;
-#define CFLockInit 0
+typedef pthread_mutex_t CFLock_t;
+#if DEPLOYMENT_TARGET_FREEBSD
+#define CFLockInit ((pthread_mutex_t)PTHREAD_MUTEX_INITIALIZER)
+#else
+#define CFLockInit ((pthread_mutex_t)PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP)
+#endif
 #define CF_LOCK_INIT_FOR_STRUCTS(X) (X = CFLockInit)
 
-CF_INLINE void __CFLock(volatile CFLock_t *lock) {
-    while (InterlockedCompareExchange((LONG volatile *)lock, ~0, 0) != 0) {
-	Sleep(0);
-    }
-}
-
-CF_INLINE void __CFUnlock(volatile CFLock_t *lock) {
-    MemoryBarrier();
-    *lock = 0;
-}
+#define __CFLock(LP) ({ (void)pthread_mutex_lock(LP); })
+#define __CFUnlock(LP) ({ (void)pthread_mutex_unlock(LP); })
+#define __CFLockTry(LP) ({ pthread_mutex_trylock(LP) == 0; })
 
-CF_INLINE Boolean __CFLockTry(volatile CFLock_t *lock) {
-    return (InterlockedCompareExchange((LONG volatile *)lock, ~0, 0) == 0);
-}
+typedef int32_t OSSpinLock;
+#define OS_SPINLOCK_INIT 0
+#define OSSpinLockLock(lock) ({ while (__sync_val_compare_and_swap(lock, 0, ~0) != 0) sleep(0); })
+#define OSSpinLockUnlock(lock) ({ __sync_synchronize(); *lock = 0; })
 
-#elif DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD
+#elif DEPLOYMENT_TARGET_WINDOWS
 
 typedef int32_t CFLock_t;
 #define CFLockInit 0
 #define CF_LOCK_INIT_FOR_STRUCTS(X) (X = CFLockInit)
 
 CF_INLINE void __CFLock(volatile CFLock_t *lock) {
-    while (__sync_val_compare_and_swap(lock, 0, ~0) != 0) {
-	sleep(0);
+    while (InterlockedCompareExchange((LONG volatile *)lock, ~0, 0) != 0) {
+	Sleep(0);
     }
 }
 
 CF_INLINE void __CFUnlock(volatile CFLock_t *lock) {
-    __sync_synchronize();
+    MemoryBarrier();
     *lock = 0;
 }
 
 CF_INLINE Boolean __CFLockTry(volatile CFLock_t *lock) {
-    return (__sync_val_compare_and_swap(lock, 0, ~0) == 0);
+    return (InterlockedCompareExchange((LONG volatile *)lock, ~0, 0) == 0);
 }
 
-typedef CFLock_t OSSpinLock;
-#define OS_SPINLOCK_INIT CFLockInit
-#define OSSpinLockLock(lock) __CFLock(lock)
-#define OSSpinLockUnlock(lock) __CFUnlock(lock)
-
 #else
 
 #warning CF locks not defined for this platform -- CF is not thread-safe

CoreFoundation/Locale.subproj/CFDateFormatter.c

@@ -58,7 +58,7 @@ CFArrayRef CFDateFormatterCreateDateFormatsFromTemplates(CFAllocatorRef allocato
 
 static Boolean useTemplatePatternGenerator(CFLocaleRef locale, void(^work)(UDateTimePatternGenerator *ptg)) {
     static UDateTimePatternGenerator *ptg;
-    static pthread_mutex_t ptgLock = PTHREAD_MUTEX_INITIALIZER;
+    static CFLock_t ptgLock = PTHREAD_MUTEX_INITIALIZER;
     static const char *ptgLocaleName;
     CFStringRef ln = locale ? CFLocaleGetIdentifier(locale) : CFSTR("");
     char buffer[BUFFER_SIZE];

CoreFoundation/PlugIn.subproj/CFBundle.c

@@ -119,7 +119,7 @@ CONST_STRING_DECL(_kCFBundleCFMLoadAsBundleKey, "CFBundleCFMLoadAsBundle")
 // Keys used by NSBundle for loaded Info plists.
 CONST_STRING_DECL(_kCFBundlePrincipalClassKey, "NSPrincipalClass")
 
-static pthread_mutex_t CFBundleGlobalDataLock = PTHREAD_MUTEX_INITIALIZER;
+static CFLock_t CFBundleGlobalDataLock = PTHREAD_MUTEX_INITIALIZER;
 
 static CFMutableDictionaryRef _bundlesByIdentifier = NULL;
 static CFMutableDictionaryRef _bundlesByURL = NULL;

CoreFoundation/PlugIn.subproj/CFBundle_Internal.h

@@ -109,7 +109,7 @@ struct __CFBundle {
 
     _CFPlugInData _plugInData;
 
-    pthread_mutex_t _bundleLoadingLock;
+    CFLock_t _bundleLoadingLock;
 
     CFStringRef _executablePath; // Calculated and cached here
     CFStringRef _developmentRegion; // Calculated and cached here

CoreFoundation/PlugIn.subproj/CFBundle_Main.c

@@ -24,7 +24,7 @@ static Boolean _initedMainBundle = false;
 static CFBundleRef _mainBundle = NULL;
 static char __CFBundleMainID__[1026] = {0};
 char *__CFBundleMainID = __CFBundleMainID__;
-static pthread_mutex_t _mainBundleLock = PTHREAD_MUTEX_INITIALIZER;
+static CFLock_t _mainBundleLock = PTHREAD_MUTEX_INITIALIZER;
 
 #pragma mark -
 

CoreFoundation/RunLoop.subproj/CFRunLoop.c

@@ -668,7 +668,7 @@ typedef struct __CFRunLoopMode *CFRunLoopModeRef;
 
 struct __CFRunLoopMode {
     CFRuntimeBase _base;
-    pthread_mutex_t _lock;	/* must have the run loop locked before locking this */
+    CFLock_t _lock;	/* must have the run loop locked before locking this */
     CFStringRef _name;
     Boolean _stopped;
     char _padding[3];
@@ -781,7 +781,7 @@ typedef struct _per_run_data {
 
 struct __CFRunLoop {
     CFRuntimeBase _base;
-    pthread_mutex_t _lock;			/* locked for accessing mode list */
+    CFLock_t _lock;			/* locked for accessing mode list */
     __CFPort _wakeUpPort;			// used for CFRunLoopWakeUp 
     Boolean _unused;
     volatile _per_run_data *_perRunData;              // reset for runs of the run loop
@@ -892,7 +892,7 @@ CF_PRIVATE void __CFRunLoopDump() { // __private_extern__ to keep the compiler f
     CFRelease(desc);
 }
 
-CF_INLINE void __CFRunLoopLockInit(pthread_mutex_t *lock) {
+CF_INLINE void __CFRunLoopLockInit(CFLock_t *lock) {
     pthread_mutexattr_t mattr;
     pthread_mutexattr_init(&mattr);
     pthread_mutexattr_settype(&mattr, PTHREAD_MUTEX_RECURSIVE);
@@ -1099,7 +1099,7 @@ CF_INLINE void __CFUnsetValid(void *cf) {
 
 struct __CFRunLoopSource {
     CFRuntimeBase _base;
-    pthread_mutex_t _lock;
+    CFLock_t _lock;
     CFIndex _order;			/* immutable */
     CFMutableBagRef _runLoops;
     union {
@@ -1135,7 +1135,7 @@ CF_INLINE void __CFRunLoopSourceUnlock(CFRunLoopSourceRef rls) {
 
 struct __CFRunLoopObserver {
     CFRuntimeBase _base;
-    pthread_mutex_t _lock;
+    CFLock_t _lock;
     CFRunLoopRef _runLoop;
     CFIndex _rlCount;
     CFOptionFlags _activities;		/* immutable */
@@ -1204,7 +1204,7 @@ static void __CFRunLoopObserverCancel(CFRunLoopObserverRef rlo, CFRunLoopRef rl,
 struct __CFRunLoopTimer {
     CFRuntimeBase _base;
     uint16_t _bits;
-    pthread_mutex_t _lock;
+    CFLock_t _lock;
     CFRunLoopRef _runLoop;
     CFMutableSetRef _rlModes;
     CFAbsoluteTime _nextFireDate;