Stop calling read(...) if we were not able to fill the whole buffer. #296
Conversation
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
Member
Author
|
This also gives a small perf improvement for HTTP benchmarks. |
weissi
reviewed
Apr 10, 2018
Sources/NIO/SocketChannel.swift
Outdated
| result = .some | ||
|
|
||
| if buffer.writableBytes > 0 { | ||
| // If we not filled the whole buffer with read(...) we should stop reading and wait until we get notified again. |
Member
There was a problem hiding this comment.
grammar nit: 'If we did not fill the whole buffer' ...
weissi
approved these changes
Apr 10, 2018
Member
weissi
left a comment
weissi
left a comment
There was a problem hiding this comment.
looks good to me. Approved because you can ignore the grammar nit if you want ;)
normanmaurer
force-pushed
the
read_change
branch
from
88dc0f8 to
cbca34f
Compare
Member
Author
|
@weissi never! Fixed it 👍 |
Lukasa
reviewed
Apr 10, 2018
Tests/NIOTests/ChannelTests.swift
Outdated
|
|
||
| func errorCaught(ctx: ChannelHandlerContext, error: Error) { | ||
| XCTAssertEqual(.read, self.state) | ||
| XCTAssertTrue(.read == self.state || .readComplete == self.state) |
Contributor
There was a problem hiding this comment.
Why is this non-deterministic?
Member
Author
There was a problem hiding this comment.
actually I think .readComplete == is the only one we need to test... let me fix
Motivation: If we not filled the whole buffer with read(...) we should stop reading and wait until we get notified again. Otherwise chances are good that the next read(...) call will either read nothing or only a very small amount of data. Also this will allow us to call fireChannelReadComplete() which may give the user the chance to flush out all pending writes. Modifications: Stop reading and wait for next wakup when we not fill the whole buffer. Result: Less wasted read calls and early chance of flushing out pending data.
normanmaurer
force-pushed
the
read_change
branch
from
00c1317 to
f0f1a05
Compare
Member
Author
|
@Lukasa addressed |
Contributor
|
Rebase and merge when ready. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Motivation:
If we not filled the whole buffer with read(...) we should stop reading and wait until we get notified again. Otherwise chances are good that the next read(...) call will either read nothing or only a very small amount of data.
Also this will allow us to call fireChannelReadComplete() which may give the user the chance to flush out all pending writes.
Modifications:
Stop reading and wait for next wakup when we not fill the whole buffer.
Result:
Less wasted read calls and early chance of flushing out pending data.