Skip to content

Update ConcurrentSequenceExecutor to use AutoReleasingSemaphore #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
Feb 20, 2019
Merged

Update ConcurrentSequenceExecutor to use AutoReleasingSemaphore #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
b4c894e
Update ConcurrentSequenceExecutor to use AutoReleasingSemaphore
neakor Feb 20, 2019
90fb4f4
Remove debugging code
neakor Feb 20, 2019
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
2 changes: 2 additions & 0 deletions Sources/Concurrency/AutoReleasingSemaphore.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ public class AutoReleasingSemaphore {
/// in dispatch_semaphore_wait(_:_:).
/// - returns: This function returns non-zero if a thread is woken.
/// Otherwise, zero is returned.
@discardableResult
public func signal() -> Int {
let newValue = waitingCount.decrementAndGet()
if newValue < 0 {
Expand Down Expand Up @@ -65,6 +66,7 @@ public class AutoReleasingSemaphore {
/// - parameter timeout: The amount of time in seconds to wait
/// before returning with failure.
/// - returns: The waiting result.
@discardableResult
public func wait(timeout: TimeInterval) -> DispatchTimeoutResult {
waitingCount.incrementAndGet()
return semaphore.wait(timeout: DispatchTime.now() + timeout)
Expand Down
4 changes: 2 additions & 2 deletions Sources/Concurrency/Executor/ConcurrentSequenceExecutor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public class ConcurrentSequenceExecutor: SequenceExecutor {
public init(name: String, qos: DispatchQoS = .userInitiated, shouldTrackTaskId: Bool = false, maxConcurrentTasks: Int? = nil) {
taskQueue = DispatchQueue(label: "Executor.taskQueue-\(name)", qos: qos, attributes: .concurrent)
if let maxConcurrentTasks = maxConcurrentTasks {
taskSemaphore = DispatchSemaphore(value: maxConcurrentTasks)
taskSemaphore = AutoReleasingSemaphore(value: maxConcurrentTasks)
} else {
taskSemaphore = nil
}
Expand All @@ -66,7 +66,7 @@ public class ConcurrentSequenceExecutor: SequenceExecutor {
// MARK: - Private

private let taskQueue: DispatchQueue
private let taskSemaphore: DispatchSemaphore?
private let taskSemaphore: AutoReleasingSemaphore?
private let shouldTrackTaskId: Bool

private func execute<SequenceResultType>(_ task: Task, with sequenceHandle: SynchronizedSequenceExecutionHandle<SequenceResultType>, _ execution: @escaping (Task, Any) -> SequenceExecution<SequenceResultType>) {
Expand Down