use Mutex

Author: swhitty

.github/workflows/build.yml

@@ -124,15 +124,15 @@ jobs:
       - name: Build
         run: swift build --swift-sdk aarch64-unknown-linux-android24
 
-  windows_swift_6_2:
+  windows_swift_6_1:
     runs-on: windows-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Install Swift
         uses: SwiftyLab/setup-swift@latest
         with:
-          swift-version: "6.2.0"
+          swift-version: "6.1.2"
           visual-studio-components: Microsoft.VisualStudio.Component.Windows11SDK.22621
       - name: Version
         run: swift --version

Sources/IdentifiableContinuation.swift

@@ -29,6 +29,14 @@
 //  SOFTWARE.
 //
 
+#if !canImport(Darwin)
+
+import Synchronization
+
+typealias Mutex = Synchronization.Mutex
+
+#endif
+
 #if compiler(>=6.0)
 /// Invokes the passed in closure with an `IdentifableContinuation` for the current task.
 ///

Sources/Mutex.swift renamed to Sources/Mutex+Darwin.swift

@@ -29,6 +29,14 @@
 //  SOFTWARE.
 //
 
+#if canImport(Darwin)
+
+import struct os.os_unfair_lock_t
+import struct os.os_unfair_lock
+import func os.os_unfair_lock_lock
+import func os.os_unfair_lock_unlock
+import func os.os_unfair_lock_trylock
+
 // Backports the Swift 6 type Mutex<Value> to all Darwin platforms
 @usableFromInline
 struct Mutex<Value: ~Copyable>: ~Copyable {
@@ -60,14 +68,6 @@ struct Mutex<Value: ~Copyable>: ~Copyable {
 
 extension Mutex: @unchecked Sendable where Value: ~Copyable { }
 
-#if canImport(Darwin)
-
-import struct os.os_unfair_lock_t
-import struct os.os_unfair_lock
-import func os.os_unfair_lock_lock
-import func os.os_unfair_lock_unlock
-import func os.os_unfair_lock_trylock
-
 final class Storage<Value: ~Copyable> {
     private let _lock: os_unfair_lock_t
     var value: Value
@@ -96,78 +96,4 @@ final class Storage<Value: ~Copyable> {
     }
 }
 
-#elseif canImport(Glibc) || canImport(Musl) || canImport(Bionic)
-
-#if canImport(Musl)
-import Musl
-#elseif canImport(Bionic)
-import Android
-#else
-import Glibc
-#endif
-
-final class Storage<Value: ~Copyable> {
-    private let _lock: UnsafeMutablePointer<pthread_mutex_t>
-
-    var value: Value
-
-    init(_ initialValue: consuming Value) {
-        var attr = pthread_mutexattr_t()
-        pthread_mutexattr_init(&attr)
-        self._lock = .allocate(capacity: 1)
-        let err = pthread_mutex_init(self._lock, &attr)
-        precondition(err == 0, "pthread_mutex_init error: \(err)")
-        self.value = initialValue
-    }
-
-    func lock() {
-        let err = pthread_mutex_lock(_lock)
-        precondition(err == 0, "pthread_mutex_lock error: \(err)")
-    }
-
-    func unlock() {
-        let err = pthread_mutex_unlock(_lock)
-        precondition(err == 0, "pthread_mutex_unlock error: \(err)")
-    }
-
-    func tryLock() -> Bool {
-        pthread_mutex_trylock(_lock) == 0
-    }
-
-    deinit {
-        let err = pthread_mutex_destroy(self._lock)
-        precondition(err == 0, "pthread_mutex_destroy error: \(err)")
-        self._lock.deallocate()
-    }
-}
-
-#elseif canImport(WinSDK)
-
-import ucrt
-import WinSDK
-
-final class Storage<Value> {
-    private let _lock: UnsafeMutablePointer<SRWLOCK>
-
-    var value: Value
-
-    init(_ initialValue: Value) {
-        self._lock = .allocate(capacity: 1)
-        InitializeSRWLock(self._lock)
-        self.value = initialValue
-    }
-
-    func lock() {
-        AcquireSRWLockExclusive(_lock)
-    }
-
-    func unlock() {
-        ReleaseSRWLockExclusive(_lock)
-    }
-
-    func tryLock() -> Bool {
-        TryAcquireSRWLockExclusive(_lock) != 0
-    }
-}
-
 #endif