Skip to content
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

Make CompletedCondtion optional, should improve memory usage slightly. #25

Merged
merged 1 commit into from
Jun 1, 2016
Merged

Make CompletedCondtion optional, should improve memory usage slightly. #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 26 additions & 8 deletions Sources/BoltsSwift/Task.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public final class Task<TResult> {
public typealias Continuation = () -> Void

private let synchronizationQueue = dispatch_queue_create("com.bolts.task", DISPATCH_QUEUE_CONCURRENT)
private let completedCondition = NSCondition()
private var _completedCondition: NSCondition?

private var _state: TaskState<TResult> = .Pending()
private var _continuations: [Continuation] = Array()
Expand Down Expand Up @@ -206,14 +206,30 @@ public final class Task<TResult> {
if NSThread.isMainThread() {
debugPrint("Warning: A long-running operation is being executed on the main thread waiting on \(self).")
}
if completed {

var conditon: NSCondition?
dispatch_barrier_sync(synchronizationQueue) {
if case .Pending = self._state {
conditon = self._completedCondition ?? NSCondition()
self._completedCondition = conditon
}
}

guard let condition = conditon else {
// Task should have been completed
precondition(completed)
return
}
completedCondition.lock()

condition.lock()
while !completed {
completedCondition.wait()
condition.wait()
}
condition.unlock()

dispatch_barrier_sync(synchronizationQueue) {
self._completedCondition = nil
}
completedCondition.unlock()
}

// MARK: State Change
Expand All @@ -222,21 +238,23 @@ public final class Task<TResult> {
var stateChanged = false

var continuations: [Continuation]?
var completedCondition: NSCondition?
dispatch_barrier_sync(synchronizationQueue) {
switch self._state {
case .Pending():
stateChanged = true
self._state = state
continuations = self._continuations
completedCondition = self._completedCondition
self._continuations.removeAll()
default:
break
}
}
if stateChanged {
completedCondition.lock()
completedCondition.broadcast()
completedCondition.unlock()
completedCondition?.lock()
completedCondition?.broadcast()
completedCondition?.unlock()

for continuation in continuations! {
continuation()
Expand Down