-
Notifications
You must be signed in to change notification settings - Fork 125
Buffer channelRead
s in ResponseStreamState
until the next channelReadComplete
#388
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.
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
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
154 changes: 154 additions & 0 deletions
154
Sources/AsyncHTTPClient/ConnectionPool/HTTPRequestStateMachine+Demand.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,154 @@ | ||
//===----------------------------------------------------------------------===// | ||
// | ||
// This source file is part of the AsyncHTTPClient open source project | ||
// | ||
// Copyright (c) 2021 Apple Inc. and the AsyncHTTPClient project authors | ||
// Licensed under Apache License v2.0 | ||
// | ||
// See LICENSE.txt for license information | ||
// See CONTRIBUTORS.txt for the list of AsyncHTTPClient project authors | ||
// | ||
// SPDX-License-Identifier: Apache-2.0 | ||
// | ||
//===----------------------------------------------------------------------===// | ||
|
||
import NIO | ||
|
||
extension HTTPRequestStateMachine { | ||
/// A sub state for receiving a response events. Stores whether the consumer has either signaled demand and whether the | ||
/// channel has issued `read` events. | ||
struct ResponseStreamState { | ||
private enum State { | ||
/// The state machines expects further writes to `channelRead`. The writes are appended to the buffer. | ||
case waitingForBytes(CircularBuffer<ByteBuffer>) | ||
/// The state machines expects a call to `demandMoreResponseBodyParts` or `read`. The buffer is | ||
/// empty. It is preserved for performance reasons. | ||
case waitingForReadOrDemand(CircularBuffer<ByteBuffer>) | ||
/// The state machines expects a call to `read`. The buffer is empty. It is preserved for performance reasons. | ||
case waitingForRead(CircularBuffer<ByteBuffer>) | ||
/// The state machines expects a call to `demandMoreResponseBodyParts`. The buffer is empty. It is | ||
/// preserved for performance reasons. | ||
case waitingForDemand(CircularBuffer<ByteBuffer>) | ||
|
||
case modifying | ||
} | ||
|
||
enum Action { | ||
case read | ||
case wait | ||
} | ||
|
||
private var state: State | ||
|
||
init(expectingBody: Bool) { | ||
self.state = .waitingForBytes(CircularBuffer(initialCapacity: expectingBody ? 16 : 0)) | ||
} | ||
|
||
mutating func receivedBodyPart(_ body: ByteBuffer) { | ||
switch self.state { | ||
case .waitingForBytes(var buffer): | ||
self.state = .modifying | ||
buffer.append(body) | ||
self.state = .waitingForBytes(buffer) | ||
|
||
case .waitingForRead, | ||
.waitingForDemand, | ||
.waitingForReadOrDemand: | ||
preconditionFailure("How can we receive a body part, after a channelReadComplete, but no read has been forwarded yet. Invalid state: \(self.state)") | ||
|
||
case .modifying: | ||
preconditionFailure("Invalid state: \(self.state)") | ||
} | ||
} | ||
|
||
mutating func channelReadComplete() -> CircularBuffer<ByteBuffer>? { | ||
switch self.state { | ||
case .waitingForBytes(let buffer): | ||
if buffer.isEmpty { | ||
self.state = .waitingForRead(buffer) | ||
return nil | ||
} else { | ||
var newBuffer = buffer | ||
newBuffer.removeAll(keepingCapacity: true) | ||
self.state = .waitingForReadOrDemand(newBuffer) | ||
return buffer | ||
} | ||
|
||
case .waitingForRead, | ||
.waitingForDemand, | ||
.waitingForReadOrDemand: | ||
preconditionFailure("How can we receive a body part, after a channelReadComplete, but no read has been forwarded yet. Invalid state: \(self.state)") | ||
|
||
case .modifying: | ||
preconditionFailure("Invalid state: \(self.state)") | ||
} | ||
} | ||
|
||
mutating func demandMoreResponseBodyParts() -> Action { | ||
switch self.state { | ||
case .waitingForDemand(let buffer): | ||
self.state = .waitingForBytes(buffer) | ||
return .read | ||
|
||
case .waitingForReadOrDemand(let buffer): | ||
self.state = .waitingForRead(buffer) | ||
return .wait | ||
|
||
case .waitingForRead: | ||
// if we are `waitingForRead`, no action needs to be taken. Demand was already signalled | ||
// once we receive the next `read`, we will forward it, right away | ||
return .wait | ||
|
||
case .waitingForBytes: | ||
// if we are `.waitingForBytes`, no action needs to be taken. As soon as we receive | ||
// the next channelReadComplete we will forward all buffered data | ||
return .wait | ||
|
||
case .modifying: | ||
preconditionFailure("Invalid state: \(self.state)") | ||
} | ||
} | ||
|
||
mutating func read() -> Action { | ||
switch self.state { | ||
case .waitingForBytes: | ||
// This should never happen. But we don't want to precondition this behavior. Let's just | ||
// pass the read event on | ||
return .read | ||
|
||
case .waitingForReadOrDemand(let buffer): | ||
self.state = .waitingForDemand(buffer) | ||
return .wait | ||
|
||
case .waitingForRead(let buffer): | ||
self.state = .waitingForBytes(buffer) | ||
return .read | ||
|
||
case .waitingForDemand: | ||
// we have already received a read event. We will issue it as soon as we received demand | ||
// from the consumer | ||
return .wait | ||
|
||
case .modifying: | ||
preconditionFailure("Invalid state: \(self.state)") | ||
} | ||
} | ||
|
||
mutating func end() -> CircularBuffer<ByteBuffer> { | ||
switch self.state { | ||
case .waitingForBytes(let buffer): | ||
// This should never happen. But we don't want to precondition this behavior. Let's just | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This comment is wrong. |
||
// pass the read event on | ||
return buffer | ||
|
||
case .waitingForReadOrDemand, | ||
.waitingForRead, | ||
.waitingForDemand: | ||
preconditionFailure("How can we receive a body end, after a channelReadComplete, but no read has been forwarded yet. Invalid state: \(self.state)") | ||
|
||
case .modifying: | ||
preconditionFailure("Invalid state: \(self.state)") | ||
} | ||
} | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Given that there is no such thing as an empty circular buffer (
initialCapacity: 0
still allocates) we may as well skip the branch and just always set16
.