Priv

Author: pblazej

Sources/LiveKit/Support/Locks.swift

@@ -35,29 +35,17 @@ func createLock() -> some LockType {
     return UnfairLock()
 }
 
-// MARK: - Unfair lock
-
-//
-// Read http://www.russbishop.net/the-law for more information on why this is necessary
-//
-final class UnfairLock: LockType {
-    private var _lock: UnsafeMutablePointer<os_unfair_lock>
-
-    fileprivate init() {
-        _lock = UnsafeMutablePointer<os_unfair_lock>.allocate(capacity: 1)
-        _lock.initialize(to: os_unfair_lock())
-    }
+// MARK: - Mutex
 
-    deinit {
-        _lock.deinitialize(count: 1)
-        _lock.deallocate()
-    }
+@available(iOS 18.0, macOS 15.0, tvOS 18.0, visionOS 2.0, *)
+private final class MutexWrapper: LockType {
+    private let mutex = Mutex(())
 
     @inline(__always)
     func sync<Result>(_ fnc: () throws -> Result) rethrows -> Result {
-        os_unfair_lock_lock(_lock)
-        defer { os_unfair_lock_unlock(_lock) }
-        return try fnc()
+        try mutex.withLock { _ in
+            try fnc()
+        }
     }
 }
 
@@ -71,16 +59,28 @@ extension OSAllocatedUnfairLock: LockType where State == Void {
     }
 }
 
-// MARK: - Mutex
+// MARK: - Unfair lock
 
-@available(iOS 18.0, macOS 15.0, tvOS 18.0, visionOS 2.0, *)
-private final class MutexWrapper: LockType {
-    private let mutex = Mutex(())
+//
+// Read http://www.russbishop.net/the-law for more information on why this is necessary
+//
+private final class UnfairLock: LockType {
+    private let _lock: UnsafeMutablePointer<os_unfair_lock>
+
+    init() {
+        _lock = UnsafeMutablePointer<os_unfair_lock>.allocate(capacity: 1)
+        _lock.initialize(to: os_unfair_lock())
+    }
+
+    deinit {
+        _lock.deinitialize(count: 1)
+        _lock.deallocate()
+    }
 
     @inline(__always)
     func sync<Result>(_ fnc: () throws -> Result) rethrows -> Result {
-        try mutex.withLock { _ in
-            try fnc()
-        }
+        os_unfair_lock_lock(_lock)
+        defer { os_unfair_lock_unlock(_lock) }
+        return try fnc()
     }
 }