Skip to content

Add _RecursiveLock & _Atomic for thread safety. #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 18, 2015
Merged

Add _RecursiveLock & _Atomic for thread safety. #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa3e25d
Add _RecursiveLock.
inamiy May 18, 2015
c210b51
Add _Atomic.
inamiy May 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions SwiftTask.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
1F4C76A41AD8CF40004E47C1 /* AlamofireTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F5FA35619A374E600975FB9 /* AlamofireTests.swift */; };
1F4C76A51AD8CF41004E47C1 /* AlamofireTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F5FA35619A374E600975FB9 /* AlamofireTests.swift */; };
1F6A8CA319A4E4F200369A5D /* SwiftTaskTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F46DEE3199EDF1000F97868 /* SwiftTaskTests.swift */; };
1FB3B8F31B0A194F00F78900 /* _Atomic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FB3B8F21B0A194F00F78900 /* _Atomic.swift */; };
1FB3B8F41B0A194F00F78900 /* _Atomic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FB3B8F21B0A194F00F78900 /* _Atomic.swift */; };
1FCF71121AD8CD2B007079C2 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1FCF71111AD8CD2B007079C2 /* Alamofire.framework */; };
1FCF71141AD8CD2F007079C2 /* Async.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1FCF71131AD8CD2F007079C2 /* Async.framework */; };
1FCF71161AD8CD38007079C2 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1FCF71151AD8CD38007079C2 /* Alamofire.framework */; };
Expand All @@ -31,6 +33,8 @@
48511C5B19C17563002FE03C /* RetainCycleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48511C5A19C17563002FE03C /* RetainCycleTests.swift */; };
485C31F11A1D619A00040DA3 /* TypeInferenceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 485C31F01A1D619A00040DA3 /* TypeInferenceTests.swift */; };
485C31F21A1D619A00040DA3 /* TypeInferenceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 485C31F01A1D619A00040DA3 /* TypeInferenceTests.swift */; };
487858241B09701F0022E56A /* _RecursiveLock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 487858231B09701F0022E56A /* _RecursiveLock.swift */; };
487858251B09701F0022E56A /* _RecursiveLock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 487858231B09701F0022E56A /* _RecursiveLock.swift */; };
48A1E8221A366F9C007619EB /* SwiftTask.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F46DED4199EDF1000F97868 /* SwiftTask.framework */; };
48A1E8231A366FA8007619EB /* SwiftTask.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48CD5A0C19AEE3570042B9F1 /* SwiftTask.framework */; };
48B58D7B1A6F255E0068E18C /* _StateMachine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48B58D7A1A6F255E0068E18C /* _StateMachine.swift */; };
Expand All @@ -51,6 +55,7 @@
1F46DEFA199EDF8100F97868 /* SwiftTask.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftTask.swift; sourceTree = "<group>"; };
1F46DEFC199EE2C200F97868 /* _TestCase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = _TestCase.swift; sourceTree = "<group>"; };
1F5FA35619A374E600975FB9 /* AlamofireTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlamofireTests.swift; sourceTree = "<group>"; };
1FB3B8F21B0A194F00F78900 /* _Atomic.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = _Atomic.swift; sourceTree = "<group>"; };
1FCF71111AD8CD2B007079C2 /* Alamofire.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Alamofire.framework; path = "../Carthage/Checkouts/Alamofire/build/Debug-iphoneos/Alamofire.framework"; sourceTree = "<group>"; };
1FCF71131AD8CD2F007079C2 /* Async.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Async.framework; path = "../Carthage/Checkouts/Async/build/Debug-iphoneos/Async.framework"; sourceTree = "<group>"; };
1FCF71151AD8CD38007079C2 /* Alamofire.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Alamofire.framework; path = ../Carthage/Checkouts/Alamofire/build/Debug/Alamofire.framework; sourceTree = "<group>"; };
Expand All @@ -60,6 +65,7 @@
4822F0D019D00ABF00F5F572 /* SwiftTask-iOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SwiftTask-iOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
48511C5A19C17563002FE03C /* RetainCycleTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RetainCycleTests.swift; sourceTree = "<group>"; };
485C31F01A1D619A00040DA3 /* TypeInferenceTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TypeInferenceTests.swift; sourceTree = "<group>"; };
487858231B09701F0022E56A /* _RecursiveLock.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = _RecursiveLock.swift; sourceTree = "<group>"; };
48B58D7A1A6F255E0068E18C /* _StateMachine.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = _StateMachine.swift; sourceTree = "<group>"; };
48CD5A0C19AEE3570042B9F1 /* SwiftTask.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftTask.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
Expand Down Expand Up @@ -129,6 +135,8 @@
1F46DEFA199EDF8100F97868 /* SwiftTask.swift */,
1FD7197A1AFE387C00BC38C4 /* Cancellable.swift */,
48B58D7A1A6F255E0068E18C /* _StateMachine.swift */,
487858231B09701F0022E56A /* _RecursiveLock.swift */,
1FB3B8F21B0A194F00F78900 /* _Atomic.swift */,
1F46DED7199EDF1000F97868 /* Supporting Files */,
);
path = SwiftTask;
Expand Down Expand Up @@ -345,6 +353,8 @@
1F46DEFB199EDF8100F97868 /* SwiftTask.swift in Sources */,
1FD7197B1AFE387C00BC38C4 /* Cancellable.swift in Sources */,
48B58D7B1A6F255E0068E18C /* _StateMachine.swift in Sources */,
1FB3B8F31B0A194F00F78900 /* _Atomic.swift in Sources */,
487858241B09701F0022E56A /* _RecursiveLock.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -385,6 +395,8 @@
48CD5A3C19AEEBDF0042B9F1 /* SwiftTask.swift in Sources */,
1FD7197C1AFE387C00BC38C4 /* Cancellable.swift in Sources */,
48B58D7C1A6F255E0068E18C /* _StateMachine.swift in Sources */,
1FB3B8F41B0A194F00F78900 /* _Atomic.swift in Sources */,
487858251B09701F0022E56A /* _RecursiveLock.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
132 changes: 62 additions & 70 deletions SwiftTask/SwiftTask.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,16 @@ public class Task<Progress, Value, Error>: Cancellable, Printable
internal let _paused: Bool
internal var _initClosure: _InitClosure! // retained throughout task's lifetime

public var state: TaskState { return self._machine.state }
public var state: TaskState { return self._machine.state.rawValue }

/// progress value (NOTE: always nil when `weakified = true`)
public var progress: Progress? { return self._machine.progress }
public var progress: Progress? { return self._machine.progress.rawValue }

/// fulfilled value
public var value: Value? { return self._machine.value }
public var value: Value? { return self._machine.value.rawValue }

/// rejected/cancelled tuple info
public var errorInfo: ErrorInfo? { return self._machine.errorInfo }
public var errorInfo: ErrorInfo? { return self._machine.errorInfo.rawValue }

public var name: String = "DefaultTask"

Expand Down Expand Up @@ -424,7 +424,7 @@ public class Task<Progress, Value, Error>: Cancellable, Printable
let selfMachine = self._machine

self._then(&canceller) {
let innerTask = thenClosure(selfMachine.value, selfMachine.errorInfo)
let innerTask = thenClosure(selfMachine.value.rawValue, selfMachine.errorInfo.rawValue)
_bindInnerTask(innerTask, newMachine, progress, fulfill, _reject, configure)
}

Expand Down Expand Up @@ -484,11 +484,11 @@ public class Task<Progress, Value, Error>: Cancellable, Printable

// NOTE: using `self._then()` + `selfMachine` instead of `self.then()` will reduce Task allocation
self._then(&canceller) {
if let value = selfMachine.value {
if let value = selfMachine.value.rawValue {
let innerTask = successClosure(value)
_bindInnerTask(innerTask, newMachine, progress, fulfill, _reject, configure)
}
else if let errorInfo = selfMachine.errorInfo {
else if let errorInfo = selfMachine.errorInfo.rawValue {
_reject(errorInfo)
}
}
Expand Down Expand Up @@ -534,10 +534,10 @@ public class Task<Progress, Value, Error>: Cancellable, Printable
let selfMachine = self._machine

self._then(&canceller) {
if let value = selfMachine.value {
if let value = selfMachine.value.rawValue {
fulfill(value)
}
else if let errorInfo = selfMachine.errorInfo {
else if let errorInfo = selfMachine.errorInfo.rawValue {
let innerTask = failureClosure(errorInfo)
_bindInnerTask(innerTask, newMachine, progress, fulfill, _reject, configure)
}
Expand Down Expand Up @@ -617,10 +617,10 @@ internal func _bindInnerTask<Progress2, Value2, Error>(
configure.cancel = { innerTask.cancel(); return }

// pause/cancel innerTask if descendant task is already paused/cancelled
if newMachine.state == .Paused {
if newMachine.state.rawValue == .Paused {
innerTask.pause()
}
else if newMachine.state == .Cancelled {
else if newMachine.state.rawValue == .Cancelled {
innerTask.cancel()
}
}
Expand All @@ -637,36 +637,37 @@ extension Task

var completedCount = 0
let totalCount = tasks.count
let lock = _RecursiveLock()

for task in tasks {
task.success { (value: Value) -> Void in

synchronized(self) {
completedCount++

let progressTuple = BulkProgress(completedCount: completedCount, totalCount: totalCount)
progress(progressTuple)
lock.lock()
completedCount++

let progressTuple = BulkProgress(completedCount: completedCount, totalCount: totalCount)
progress(progressTuple)

if completedCount == totalCount {
var values: [Value] = Array()

if completedCount == totalCount {
var values: [Value] = Array()

for task in tasks {
values.append(task.value!)
}

fulfill(values)
for task in tasks {
values.append(task.value!)
}

fulfill(values)
}
lock.unlock()

}.failure { (errorInfo: ErrorInfo) -> Void in

synchronized(self) {
_reject(errorInfo)

for task in tasks {
task.cancel()
}
lock.lock()
_reject(errorInfo)

for task in tasks {
task.cancel()
}
lock.unlock()
}
}

Expand All @@ -684,32 +685,33 @@ extension Task
var completedCount = 0
var rejectedCount = 0
let totalCount = tasks.count
let lock = _RecursiveLock()

for task in tasks {
task.success { (value: Value) -> Void in

synchronized(self) {
completedCount++
lock.lock()
completedCount++

if completedCount == 1 {
fulfill(value)

if completedCount == 1 {
fulfill(value)

self.cancelAll(tasks)
}
self.cancelAll(tasks)
}
lock.unlock()

}.failure { (errorInfo: ErrorInfo) -> Void in

synchronized(self) {
rejectedCount++
lock.lock()
rejectedCount++

if rejectedCount == totalCount {
var isAnyCancelled = (tasks.filter { task in task.state == .Cancelled }.count > 0)

if rejectedCount == totalCount {
var isAnyCancelled = (tasks.filter { task in task.state == .Cancelled }.count > 0)

let errorInfo = ErrorInfo(error: nil, isCancelled: isAnyCancelled) // NOTE: Task.any error returns nil (spec)
_reject(errorInfo)
}
let errorInfo = ErrorInfo(error: nil, isCancelled: isAnyCancelled) // NOTE: Task.any error returns nil (spec)
_reject(errorInfo)
}
lock.unlock()
}
}

Expand All @@ -728,28 +730,29 @@ extension Task

var completedCount = 0
let totalCount = tasks.count
let lock = _RecursiveLock()

for task in tasks {
task.then { (value: Value?, errorInfo: ErrorInfo?) -> Void in

synchronized(self) {
completedCount++

let progressTuple = BulkProgress(completedCount: completedCount, totalCount: totalCount)
progress(progressTuple)
lock.lock()
completedCount++

let progressTuple = BulkProgress(completedCount: completedCount, totalCount: totalCount)
progress(progressTuple)

if completedCount == totalCount {
var values: [Value] = Array()

if completedCount == totalCount {
var values: [Value] = Array()

for task in tasks {
if task.state == .Fulfilled {
values.append(task.value!)
}
for task in tasks {
if task.state == .Fulfilled {
values.append(task.value!)
}

fulfill(values)
}

fulfill(values)
}
lock.unlock()

}
}
Expand Down Expand Up @@ -795,15 +798,4 @@ infix operator ~ { associativity left }
public func ~ <P, V, E>(task: Task<P, V, E>, tryCount: Int) -> Task<P, V, E>
{
return task.try(tryCount)
}

//--------------------------------------------------
// MARK: - Utility
//--------------------------------------------------

internal func synchronized(object: AnyObject, closure: Void -> Void)
{
objc_sync_enter(object)
closure()
objc_sync_exit(object)
}
47 changes: 47 additions & 0 deletions SwiftTask/_Atomic.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
//
// _Atomic.swift
// SwiftTask
//
// Created by Yasuhiro Inami on 2015/05/18.
// Copyright (c) 2015年 Yasuhiro Inami. All rights reserved.
//

import Darwin

internal final class _Atomic<T>
{
private var spinlock = OS_SPINLOCK_INIT
private var _rawValue: T

internal var rawValue: T
{
get {
lock()
let rawValue = self._rawValue
unlock()

return rawValue
}

set(newValue) {
lock()
self._rawValue = newValue
unlock()
}
}

init(_ rawValue: T)
{
self._rawValue = rawValue
}

private func lock()
{
withUnsafeMutablePointer(&self.spinlock, OSSpinLockLock)
}

private func unlock()
{
withUnsafeMutablePointer(&self.spinlock, OSSpinLockUnlock)
}
}
41 changes: 41 additions & 0 deletions SwiftTask/_RecursiveLock.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
//
// _RecursiveLock.swift
// SwiftTask
//
// Created by Yasuhiro Inami on 2015/05/18.
// Copyright (c) 2015年 Yasuhiro Inami. All rights reserved.
//

import Darwin

internal final class _RecursiveLock
{
private let mutex: UnsafeMutablePointer<pthread_mutex_t>
private let attribute: UnsafeMutablePointer<pthread_mutexattr_t>

internal init()
{
self.mutex = UnsafeMutablePointer.alloc(sizeof(pthread_mutex_t))
self.attribute = UnsafeMutablePointer.alloc(sizeof(pthread_mutexattr_t))

pthread_mutexattr_init(self.attribute)
pthread_mutexattr_settype(self.attribute, PTHREAD_MUTEX_RECURSIVE)
pthread_mutex_init(self.mutex, self.attribute)
}

deinit
{
pthread_mutexattr_destroy(self.attribute)
pthread_mutex_destroy(self.mutex)
}

internal func lock()
{
pthread_mutex_lock(self.mutex)
}

internal func unlock()
{
pthread_mutex_unlock(self.mutex)
}
}
Loading