Fix epoll spliceTo file descriptor with offset#9369
Merged
normanmaurer merged 1 commit intonetty:4.1from Jul 16, 2019
Merged
Conversation
Motivation The AbstractEpollStreamChannel::spliceTo(FileDescriptor, ...) methods take an offset parameter but this was effectively ignored due to what looks like a typo in the corresponding JNI function impl. Instead it would always use the file's own native offset. Modification - Fix typo in netty_epoll_native_splice0() and offset accounting in AbstractEpollStreamChannel::SpliceFdTask. - Modify unit test to include an invocation of the public spliceTo method using non-zero offset. Result spliceTo FD methods work as expected when an offset is provided.
|
Can one of the admins verify this patch? |
franz1981
approved these changes
Jul 15, 2019
Member
|
@netty-bot test this please |
normanmaurer
approved these changes
Jul 15, 2019
normanmaurer
pushed a commit
that referenced
this pull request
Jul 16, 2019
Motivation The AbstractEpollStreamChannel::spliceTo(FileDescriptor, ...) methods take an offset parameter but this was effectively ignored due to what looks like a typo in the corresponding JNI function impl. Instead it would always use the file's own native offset. Modification - Fix typo in netty_epoll_native_splice0() and offset accounting in AbstractEpollStreamChannel::SpliceFdTask. - Modify unit test to include an invocation of the public spliceTo method using non-zero offset. Result spliceTo FD methods work as expected when an offset is provided.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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
The
AbstractEpollStreamChannel::spliceTo(FileDescriptor, ...)methods take an offset parameter but this was effectively ignored due to what looks like a typo in the corresponding JNI function impl. Instead it would always use the file's own native offset.Modification
netty_epoll_native_splice0()and offset accounting inAbstractEpollStreamChannel::SpliceFdTask.spliceTomethod using non-zero offset.Result
spliceToFD methods work as expected when an offset is provided. Note this does change the prior behaviour in that the file's native offset was previously modified but will now be unchanged - we could make a further modification to preserve that though if necessary.