TouchInstinct
/
RxSwift
311
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #643 from Nirma/develop 

Dry up lock / unlock logic in Lock.swift
This commit is contained in:
Krunoslav Zaher 2016-04-29 20:34:51 +02:00
parent b3036c037b 9e345e3645
commit 0288ba78d5
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
RxSwift/Concurrency/Lock.swift
View File

@ -37,23 +37,17 @@ protocol Lock {
}
func performLocked(@noescape action: () -> Void) {
pthread_spin_lock(&_lock)
lock(); defer { unlock() }
action()
pthread_spin_unlock(&_lock)
}
func calculateLocked<T>(@noescape action: () -> T) -> T {
pthread_spin_lock(&_lock)
let result = action()
pthread_spin_unlock(&_lock)
return result
lock(); defer { unlock() }
return action()
}
func calculateLockedOrFail<T>(@noescape action: () throws -> T) throws -> T {
pthread_spin_lock(&_lock)
defer {
pthread_spin_unlock(&_lock)
}
lock(); defer { unlock() }
let result = try action()
return result
}
@ -70,23 +64,17 @@ protocol Lock {
extension NSRecursiveLock : Lock {
func performLocked(@noescape action: () -> Void) {
self.lock()
lock(); defer { unlock() }
action()
self.unlock()
}
func calculateLocked<T>(@noescape action: () -> T) -> T {
self.lock()
let result = action()
self.unlock()
return result
lock(); defer { unlock() }
return action()
}
func calculateLockedOrFail<T>(@noescape action: () throws -> T) throws -> T {
self.lock()
defer {
self.unlock()
}
lock(); defer { unlock() }
let result = try action()
return result
}