Skip to content

Commit

Permalink
Merge branch 'main' into shared-yield-id-generator
Browse files Browse the repository at this point in the history
  • Loading branch information
@glbrntt
glbrntt authored Jul 8, 2024
2 parents 95f909a + 9b86559 commit 0026472
Show file tree
Hide file tree
Showing 21 changed files with 210 additions and 156 deletions.
4 changes: 2 additions & 2 deletions Sources/NIOCore/AsyncChannel/AsyncChannelOutboundWriterHandler.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ internal final class NIOAsyncChannelOutboundWriterHandler<OutboundOut: Sendable>
@inlinable
func handlerRemoved(context: ChannelHandlerContext) {
self.context = nil
self.sink?.finish(error: ChannelError.ioOnClosedChannel)
self.sink?.finish(error: ChannelError._ioOnClosedChannel)
self.writer = nil
}

Expand All @@ -150,7 +150,7 @@ internal final class NIOAsyncChannelOutboundWriterHandler<OutboundOut: Sendable>

@inlinable
func channelInactive(context: ChannelHandlerContext) {
self.sink?.finish(error: ChannelError.ioOnClosedChannel)
self.sink?.finish(error: ChannelError._ioOnClosedChannel)
context.fireChannelInactive()
}

Expand Down
13 changes: 12 additions & 1 deletion Sources/NIOCore/Channel.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ extension Channel {
}

public func registerAlreadyConfigured0(promise: EventLoopPromise<Void>?) {
promise?.fail(ChannelError.operationUnsupported)
promise?.fail(ChannelError._operationUnsupported)
}

public func triggerUserOutboundEvent(_ event: Any, promise: EventLoopPromise<Void>?) {
Expand Down Expand Up @@ -373,6 +373,17 @@ public enum ChannelError: Error {
case unremovableHandler
}

extension ChannelError {
// 'any Error' is unconditionally boxed, avoid allocating per use by statically boxing them.
static let _alreadyClosed: any Error = ChannelError.alreadyClosed
static let _inputClosed: any Error = ChannelError.inputClosed
@usableFromInline
static let _ioOnClosedChannel: any Error = ChannelError.ioOnClosedChannel
static let _operationUnsupported: any Error = ChannelError.operationUnsupported
static let _outputClosed: any Error = ChannelError.outputClosed
static let _unremovableHandler: any Error = ChannelError.unremovableHandler
}

extension ChannelError: Equatable { }

/// The removal of a `ChannelHandler` using `ChannelPipeline.removeHandler` has been attempted more than once.
Expand Down
44 changes: 22 additions & 22 deletions Sources/NIOCore/ChannelPipeline.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ public final class ChannelPipeline: ChannelInvoker {
self.eventLoop.assertInEventLoop()

if self.destroyed {
return .failure(ChannelError.ioOnClosedChannel)
return .failure(ChannelError._ioOnClosedChannel)
}

switch position {
Expand Down Expand Up @@ -247,7 +247,7 @@ public final class ChannelPipeline: ChannelInvoker {
operation: (ChannelHandlerContext, ChannelHandlerContext) -> Void) -> Result<Void, Error> {
self.eventLoop.assertInEventLoop()
if self.destroyed {
return .failure(ChannelError.ioOnClosedChannel)
return .failure(ChannelError._ioOnClosedChannel)
}

guard let context = self.contextForPredicate0({ $0.handler === relativeHandler }) else {
Expand Down Expand Up @@ -280,7 +280,7 @@ public final class ChannelPipeline: ChannelInvoker {
self.eventLoop.assertInEventLoop()

if self.destroyed {
return .failure(ChannelError.ioOnClosedChannel)
return .failure(ChannelError._ioOnClosedChannel)
}

let context = ChannelHandlerContext(name: name ?? nextName(), handler: handler, pipeline: self)
Expand Down Expand Up @@ -416,7 +416,7 @@ public final class ChannelPipeline: ChannelInvoker {
/// - promise: An `EventLoopPromise` that will complete when the `ChannelHandler` is removed.
public func removeHandler(context: ChannelHandlerContext, promise: EventLoopPromise<Void>?) {
guard context.handler is RemovableChannelHandler else {
promise?.fail(ChannelError.unremovableHandler)
promise?.fail(ChannelError._unremovableHandler)
return
}
func removeHandler0() {
Expand Down Expand Up @@ -826,7 +826,7 @@ public final class ChannelPipeline: ChannelInvoker {
if let firstOutboundCtx = firstOutboundCtx {
firstOutboundCtx.invokeClose(mode: mode, promise: promise)
} else {
promise?.fail(ChannelError.alreadyClosed)
promise?.fail(ChannelError._alreadyClosed)
}
}

Expand All @@ -846,47 +846,47 @@ public final class ChannelPipeline: ChannelInvoker {
if let firstOutboundCtx = firstOutboundCtx {
firstOutboundCtx.invokeWrite(data, promise: promise)
} else {
promise?.fail(ChannelError.ioOnClosedChannel)
promise?.fail(ChannelError._ioOnClosedChannel)
}
}

private func writeAndFlush0(_ data: NIOAny, promise: EventLoopPromise<Void>?) {
if let firstOutboundCtx = firstOutboundCtx {
firstOutboundCtx.invokeWriteAndFlush(data, promise: promise)
} else {
promise?.fail(ChannelError.ioOnClosedChannel)
promise?.fail(ChannelError._ioOnClosedChannel)
}
}

private func bind0(to address: SocketAddress, promise: EventLoopPromise<Void>?) {
if let firstOutboundCtx = firstOutboundCtx {
firstOutboundCtx.invokeBind(to: address, promise: promise)
} else {
promise?.fail(ChannelError.ioOnClosedChannel)
promise?.fail(ChannelError._ioOnClosedChannel)
}
}

private func connect0(to address: SocketAddress, promise: EventLoopPromise<Void>?) {
if let firstOutboundCtx = firstOutboundCtx {
firstOutboundCtx.invokeConnect(to: address, promise: promise)
} else {
promise?.fail(ChannelError.ioOnClosedChannel)
promise?.fail(ChannelError._ioOnClosedChannel)
}
}

private func register0(promise: EventLoopPromise<Void>?) {
if let firstOutboundCtx = firstOutboundCtx {
firstOutboundCtx.invokeRegister(promise: promise)
} else {
promise?.fail(ChannelError.ioOnClosedChannel)
promise?.fail(ChannelError._ioOnClosedChannel)
}
}

private func triggerUserOutboundEvent0(_ event: Any, promise: EventLoopPromise<Void>?) {
if let firstOutboundCtx = firstOutboundCtx {
firstOutboundCtx.invokeTriggerUserOutboundEvent(event, promise: promise)
} else {
promise?.fail(ChannelError.ioOnClosedChannel)
promise?.fail(ChannelError._ioOnClosedChannel)
}
}

Expand Down Expand Up @@ -1378,14 +1378,14 @@ extension ChannelPipeline.Position: Sendable {}

private extension CloseMode {
/// Returns the error to fail outstanding operations writes with.
var error: ChannelError {
var error: any Error {
switch self {
case .all:
return .ioOnClosedChannel
return ChannelError._ioOnClosedChannel
case .output:
return .outputClosed
return ChannelError._outputClosed
case .input:
return .inputClosed
return ChannelError._inputClosed
}
}
}
Expand Down Expand Up @@ -1577,7 +1577,7 @@ public final class ChannelHandlerContext: ChannelInvoker {
if let outboundNext = self.prev {
outboundNext.invokeRegister(promise: promise)
} else {
promise?.fail(ChannelError.ioOnClosedChannel)
promise?.fail(ChannelError._ioOnClosedChannel)
}
}

Expand All @@ -1591,7 +1591,7 @@ public final class ChannelHandlerContext: ChannelInvoker {
if let outboundNext = self.prev {
outboundNext.invokeBind(to: address, promise: promise)
} else {
promise?.fail(ChannelError.ioOnClosedChannel)
promise?.fail(ChannelError._ioOnClosedChannel)
}
}

Expand All @@ -1605,7 +1605,7 @@ public final class ChannelHandlerContext: ChannelInvoker {
if let outboundNext = self.prev {
outboundNext.invokeConnect(to: address, promise: promise)
} else {
promise?.fail(ChannelError.ioOnClosedChannel)
promise?.fail(ChannelError._ioOnClosedChannel)
}
}

Expand All @@ -1620,7 +1620,7 @@ public final class ChannelHandlerContext: ChannelInvoker {
if let outboundNext = self.prev {
outboundNext.invokeWrite(data, promise: promise)
} else {
promise?.fail(ChannelError.ioOnClosedChannel)
promise?.fail(ChannelError._ioOnClosedChannel)
}
}

Expand All @@ -1647,7 +1647,7 @@ public final class ChannelHandlerContext: ChannelInvoker {
if let outboundNext = self.prev {
outboundNext.invokeWriteAndFlush(data, promise: promise)
} else {
promise?.fail(ChannelError.ioOnClosedChannel)
promise?.fail(ChannelError._ioOnClosedChannel)
}
}

Expand All @@ -1671,7 +1671,7 @@ public final class ChannelHandlerContext: ChannelInvoker {
if let outboundNext = self.prev {
outboundNext.invokeClose(mode: mode, promise: promise)
} else {
promise?.fail(ChannelError.alreadyClosed)
promise?.fail(ChannelError._alreadyClosed)
}
}

Expand All @@ -1684,7 +1684,7 @@ public final class ChannelHandlerContext: ChannelInvoker {
if let outboundNext = self.prev {
outboundNext.invokeTriggerUserOutboundEvent(event, promise: promise)
} else {
promise?.fail(ChannelError.ioOnClosedChannel)
promise?.fail(ChannelError._ioOnClosedChannel)
}
}

Expand Down
22 changes: 11 additions & 11 deletions Sources/NIOCore/DeadChannel.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,31 +17,31 @@
/// all operations.
private final class DeadChannelCore: ChannelCore {
func localAddress0() throws -> SocketAddress {
throw ChannelError.ioOnClosedChannel
throw ChannelError._ioOnClosedChannel
}

func remoteAddress0() throws -> SocketAddress {
throw ChannelError.ioOnClosedChannel
throw ChannelError._ioOnClosedChannel
}

func register0(promise: EventLoopPromise<Void>?) {
promise?.fail(ChannelError.ioOnClosedChannel)
promise?.fail(ChannelError._ioOnClosedChannel)
}

func registerAlreadyConfigured0(promise: EventLoopPromise<Void>?) {
promise?.fail(ChannelError.ioOnClosedChannel)
promise?.fail(ChannelError._ioOnClosedChannel)
}

func bind0(to: SocketAddress, promise: EventLoopPromise<Void>?) {
promise?.fail(ChannelError.ioOnClosedChannel)
promise?.fail(ChannelError._ioOnClosedChannel)
}

func connect0(to: SocketAddress, promise: EventLoopPromise<Void>?) {
promise?.fail(ChannelError.ioOnClosedChannel)
promise?.fail(ChannelError._ioOnClosedChannel)
}

func write0(_ data: NIOAny, promise: EventLoopPromise<Void>?) {
promise?.fail(ChannelError.ioOnClosedChannel)
promise?.fail(ChannelError._ioOnClosedChannel)
}

func flush0() {
Expand All @@ -51,11 +51,11 @@ private final class DeadChannelCore: ChannelCore {
}

func close0(error: Error, mode: CloseMode, promise: EventLoopPromise<Void>?) {
promise?.fail(ChannelError.alreadyClosed)
promise?.fail(ChannelError._alreadyClosed)
}

func triggerUserOutboundEvent0(_ event: Any, promise: EventLoopPromise<Void>?) {
promise?.fail(ChannelError.ioOnClosedChannel)
promise?.fail(ChannelError._ioOnClosedChannel)
}

func channelRead0(_ data: NIOAny) {
Expand Down Expand Up @@ -104,11 +104,11 @@ internal final class DeadChannel: Channel, @unchecked Sendable {
let parent: Channel? = nil

func setOption<Option: ChannelOption>(_ option: Option, value: Option.Value) -> EventLoopFuture<Void> {
return self.pipeline.eventLoop.makeFailedFuture(ChannelError.ioOnClosedChannel)
return self.pipeline.eventLoop.makeFailedFuture(ChannelError._ioOnClosedChannel)
}

func getOption<Option: ChannelOption>(_ option: Option) -> EventLoopFuture<Option.Value> {
return eventLoop.makeFailedFuture(ChannelError.ioOnClosedChannel)
return eventLoop.makeFailedFuture(ChannelError._ioOnClosedChannel)
}

let isWritable = false
Expand Down
9 changes: 7 additions & 2 deletions Sources/NIOCore/EventLoop.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public struct Scheduled<T> {
@usableFromInline typealias CancelationCallback = @Sendable () -> Void
/* private but usableFromInline */ @usableFromInline let _promise: EventLoopPromise<T>
/* private but usableFromInline */ @usableFromInline let _cancellationTask: CancelationCallback

@inlinable
@preconcurrency
public init(promise: EventLoopPromise<T>, cancellationTask: @escaping @Sendable () -> Void) {
Expand All @@ -40,7 +40,7 @@ public struct Scheduled<T> {
/// This means that cancellation is not guaranteed.
@inlinable
public func cancel() {
self._promise.fail(EventLoopError.cancelled)
self._promise.fail(EventLoopError._cancelled)
self._cancellationTask()
}

Expand Down Expand Up @@ -1219,6 +1219,11 @@ public enum EventLoopError: Error {
case shutdownFailed
}

extension EventLoopError {
@usableFromInline
static let _cancelled: any Error = EventLoopError.cancelled
}

extension EventLoopError: CustomStringConvertible {
public var description: String {
switch self {
Expand Down
8 changes: 4 additions & 4 deletions Sources/NIOPosix/BSDSocketAPIPosix.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ extension NIOBSDSocket {
option_value: &segmentSize,
option_len: socklen_t(MemoryLayout<CInt>.size))
#else
throw ChannelError.operationUnsupported
throw ChannelError._operationUnsupported
#endif
}

Expand All @@ -294,7 +294,7 @@ extension NIOBSDSocket {
}
return segmentSize
#else
throw ChannelError.operationUnsupported
throw ChannelError._operationUnsupported
#endif
}

Expand All @@ -307,7 +307,7 @@ extension NIOBSDSocket {
option_value: &isEnabled,
option_len: socklen_t(MemoryLayout<CInt>.size))
#else
throw ChannelError.operationUnsupported
throw ChannelError._operationUnsupported
#endif
}

Expand All @@ -324,7 +324,7 @@ extension NIOBSDSocket {
}
return enabled != 0
#else
throw ChannelError.operationUnsupported
throw ChannelError._operationUnsupported
#endif
}
}
Expand Down
Loading

0 comments on commit 0026472

Please sign in to comment.