Skip to content

Add Sendable annotations to SelectorGeneric #3085

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
Lukasa merged 1 commit into from
Jan 24, 2025
Merged

Add Sendable annotations to SelectorGeneric #3085

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
14 changes: 10 additions & 4 deletions Sources/NIOPosix/SelectorGeneric.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import CNIOLinux
#endif

@usableFromInline
internal enum SelectorLifecycleState {
internal enum SelectorLifecycleState: Sendable {
case open
case closing
case closed
Expand Down Expand Up @@ -60,7 +60,7 @@ extension timespec {
/// If then suddenly the socket becomes both readable and writable, the eventing mechanism will tell you about that
/// fact using `[.read, .write]`.
@usableFromInline
struct SelectorEventSet: OptionSet, Equatable {
struct SelectorEventSet: OptionSet, Equatable, Sendable {

@usableFromInline
typealias RawValue = UInt8
Expand Down Expand Up @@ -404,6 +404,9 @@ extension Selector: CustomStringConvertible {
}
}

@available(*, unavailable)
extension Selector: Sendable {}

/// An event that is triggered once the `Selector` was able to select something.
@usableFromInline
struct SelectorEvent<R> {
Expand All @@ -422,6 +425,9 @@ struct SelectorEvent<R> {
}
}

@available(*, unavailable)
extension SelectorEvent: Sendable {}

extension Selector where R == NIORegistration {
/// Gently close the `Selector` after all registered `Channel`s are closed.
func closeGently(eventLoop: EventLoop) -> EventLoopFuture<Void> {
Expand Down Expand Up @@ -473,7 +479,7 @@ extension Selector where R == NIORegistration {

/// The strategy used for the `Selector`.
@usableFromInline
enum SelectorStrategy {
enum SelectorStrategy: Sendable {
/// Block until there is some IO ready to be processed or the `Selector` is explicitly woken up.
case block

Expand All @@ -489,7 +495,7 @@ enum SelectorStrategy {
/// to mark events to allow for filtering of received return values to not be delivered to a
/// new `Registration` instance that receives the same file descriptor. Ok if it wraps.
/// Needed for i.e. testWeDoNotDeliverEventsForPreviouslyClosedChannels to succeed.
@usableFromInline struct SelectorRegistrationID: Hashable {
@usableFromInline struct SelectorRegistrationID: Hashable, Sendable {
@usableFromInline var _rawValue: UInt32

@inlinable var rawValue: UInt32 {
Expand Down
Loading