Skip to content

Remove unnecessary promise allocation in Selector.closeGently(...) #237

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 1 commit into from
Mar 26, 2018
Merged

Remove unnecessary promise allocation in Selector.closeGently(...) #237

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
8 changes: 2 additions & 6 deletions Sources/NIO/Selector.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,10 +487,8 @@ struct SelectorEvent<R> {
internal extension Selector where R == NIORegistration {
/// Gently close the `Selector` after all registered `Channel`s are closed.
internal func closeGently(eventLoop: EventLoop) -> EventLoopFuture<Void> {
let p0: EventLoopPromise<Void> = eventLoop.newPromise()
guard self.lifecycleState == .open else {
p0.fail(error: IOError(errnoCode: EBADF, reason: "can't close selector gently as it's \(self.lifecycleState)."))
return p0.futureResult
return eventLoop.newFailedFuture(error: IOError(errnoCode: EBADF, reason: "can't close selector gently as it's \(self.lifecycleState)."))
}

let futures: [EventLoopFuture<Void>] = self.registrations.map { (_, reg: NIORegistration) -> EventLoopFuture<Void> in
Expand All @@ -514,11 +512,9 @@ internal extension Selector where R == NIORegistration {
}

guard futures.count > 0 else {
p0.succeed(result: ())
return p0.futureResult
return eventLoop.newSucceededFuture(result: ())
}

p0.succeed(result: ())
return EventLoopFuture<Void>.andAll(futures, eventLoop: eventLoop)
}
}
Expand Down