Skip to content

Embedded: getOption(ChannelOptions.allowRemoteHalfClosure) should not fatalError #2429

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 5 commits into from
May 19, 2023
Merged

Embedded: getOption(ChannelOptions.allowRemoteHalfClosure) should not fatalError #2429

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c194bcd
Embedded: getOption(.allowRemoteHalfClosure) -> OK
felixschlegel May 17, 2023
7560113
AsyncTestingChannel: getOption(.allowRemoteHalfClosure) -> OK
felixschlegel May 19, 2023
5db105f
Synchronize access to allowRemoteHalfClosure
felixschlegel May 19, 2023
bbb27f7
Update allocation limits
felixschlegel May 19, 2023
cfd48e5
Merge branch 'main' into fs-embedded-get-option-add-allow-remote-half…
Lukasa May 19, 2023
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
Prev Previous commit
Next Next commit
Synchronize access to allowRemoteHalfClosure 
Modifications:

* add `ManagedAtomic` property `_allowRemoteHalfClosure` to
  `EmbeddedChannelCore`
* make sure that access to `allowRemoteHalfClosure` from
  `AsyncTestingChannel` and `EmbeddedChannel` is synchronized by
  accessing underlying atomic value in `channelcore`
  • Loading branch information
@felixschlegel
felixschlegel committed May 19, 2023
commit 5db105f89e0ee37e44018fdc89b04061c98c986c
9 changes: 8 additions & 1 deletion Sources/NIOEmbedded/AsyncTestingChannel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,14 @@ public final class NIOAsyncTestingChannel: Channel {
public var isActive: Bool { return channelcore.isActive }

/// - see: `ChannelOptions.Types.AllowRemoteHalfClosureOption`
public var allowRemoteHalfClosure: Bool = false
public var allowRemoteHalfClosure: Bool {
get {
return channelcore.allowRemoteHalfClosure
}
set {
channelcore.allowRemoteHalfClosure = newValue
}
}

/// - see: `Channel.closeFuture`
public var closeFuture: EventLoopFuture<Void> { return channelcore.closePromise.futureResult }
Expand Down
19 changes: 18 additions & 1 deletion Sources/NIOEmbedded/Embedded.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,18 @@ class EmbeddedChannelCore: ChannelCore {
}
}

var allowRemoteHalfClosure: Bool {
get {
return self._allowRemoteHalfClosure.load(ordering: .sequentiallyConsistent)
}
set {
self._allowRemoteHalfClosure.store(newValue, ordering: .sequentiallyConsistent)
}
}

private let _isOpen = ManagedAtomic(true)
private let _isActive = ManagedAtomic(false)
private let _allowRemoteHalfClosure = ManagedAtomic(false)

let eventLoop: EventLoop
let closePromise: EventLoopPromise<Void>
Expand Down Expand Up @@ -552,7 +562,14 @@ public final class EmbeddedChannel: Channel {
public var isActive: Bool { return channelcore.isActive }

/// - see: `ChannelOptions.Types.AllowRemoteHalfClosureOption`
public var allowRemoteHalfClosure: Bool = false
public var allowRemoteHalfClosure: Bool {
get {
return channelcore.allowRemoteHalfClosure
}
set {
channelcore.allowRemoteHalfClosure = newValue
}
}

/// - see: `Channel.closeFuture`
public var closeFuture: EventLoopFuture<Void> { return channelcore.closePromise.futureResult }
Expand Down