Use allocator when constructing ByteBufHolder sub-types or use Unpool…#9377
Merged
normanmaurer merged 3 commits into4.1from Jul 18, 2019
Merged
Use allocator when constructing ByteBufHolder sub-types or use Unpool…#9377normanmaurer merged 3 commits into4.1from
normanmaurer merged 3 commits into4.1from
Conversation
…ed.EMPTY_BUFFER where possible Motivation: In many places Netty uses Unpooled.buffer(0) while should use EMPTY_BUFFER. We can't change this due to back compatibility in the constructors but can use Unpooled.EMPTY_BUFFER in some cases to ensure we not allocate at all. In others we can directly use the allocator either from the Channel / ChannelHandlerContext or the request / response. Modification: - Use Unpooled.EMPTY_BUFFER where possible - Use allocator where possible Result: Fixes #9345 for websockets and http package
Member
Author
|
@doom369 PTAL as an alternative fix. |
doom369
reviewed
Jul 16, 2019
| * @param data The data to encode | ||
| * @return An encoded string containing the data | ||
| */ | ||
| @SuppressJava6Requirement(reason = "Guarded with java version check") |
Contributor
There was a problem hiding this comment.
wow, I didn't know you can do that :)
Contributor
|
@normanmaurer as cleanup it is ok. However, it doesn't fully fixes #9345. For example, |
Member
Author
|
@doom369 I agree it doesn't 100 % fix all of it but I think for a patch release it is an acceptable tradeoff... I am not sure I understand why using a wrapped buffer is a problem tho. |
Contributor
|
Hm, you are right. Not sure why I dig into it. |
Member
Author
|
@netty-bot test this please |
Member
Author
|
@doom369 so what you think about this as "first step" ? |
Contributor
|
@normanmaurer looks good. This PR should fix heap allocation for our flow. If I didn't miss anything. |
Member
Author
|
@doom369 so can you approve ? |
doom369
approved these changes
Jul 17, 2019
normanmaurer
added a commit
that referenced
this pull request
Jul 18, 2019
#9377) Motivation: In many places Netty uses Unpooled.buffer(0) while should use EMPTY_BUFFER. We can't change this due to back compatibility in the constructors but can use Unpooled.EMPTY_BUFFER in some cases to ensure we not allocate at all. In others we can directly use the allocator either from the Channel / ChannelHandlerContext or the request / response. Modification: - Use Unpooled.EMPTY_BUFFER where possible - Use allocator where possible Result: Fixes #9345 for websockets and http package
njhill
reviewed
Jul 18, 2019
| buffer.release(); | ||
|
|
||
| ByteBuf buffer = ctx.alloc().buffer(buf.length()); | ||
| buffer.writeCharSequence(buf.toString(), CharsetUtil.UTF_8); |
Merged
normanmaurer
pushed a commit
that referenced
this pull request
Nov 6, 2019
Motivation: After fix #9377 some websocket examples work incorrect Modification: Replace `Unpooled.EMPTY_BUFFER` to `ctx.alloc().buffer(0)` for responses with possible content Result: Examples work
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
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.
…ed.EMPTY_BUFFER where possible
Motivation:
In many places Netty uses Unpooled.buffer(0) while should use EMPTY_BUFFER. We can't change this due to back compatibility in the constructors but can use Unpooled.EMPTY_BUFFER in some cases to ensure we not allocate at all. In others we can directly use the allocator either from the Channel / ChannelHandlerContext or the request / response.
Modification:
Result:
Fixes #9345 for websockets and http package