Reuse byte buffers in BufferingResponseListener #12691
Open
Conversation
This file contains 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
wendigo
force-pushed
the
serafin/buffering
branch
from
a919e29 to
e6b700d
Compare
|
@sbordet ptal |
gregw
requested changes
Jan 10, 2025
| */ | ||
| public BufferingResponseListener(ByteBufferPool byteBufferPool, int maxLength) | ||
| { | ||
| this.buffer = new ByteBufferAccumulator(requireNonNull(byteBufferPool, "byteBufferPool is null"), true); |
There was a problem hiding this comment.
Suggested change
| this.buffer = new ByteBufferAccumulator(requireNonNull(byteBufferPool, "byteBufferPool is null"), true); | |
| this.buffer = new ByteBufferAccumulator(Objects.requireNonNullElse(byteBufferPool, ByteBufferPool.NON_POOLING), true); |
| @@ -55,6 +59,18 @@ public BufferingResponseListener() | |||
| */ | |||
| public BufferingResponseListener(int maxLength) | |||
| { | |||
| this(ByteBufferPool.NON_POOLING, maxLength); | |||
There was a problem hiding this comment.
Suggested change
| this(ByteBufferPool.NON_POOLING, maxLength); | |
| this(null, maxLength); |
See below
| @@ -36,7 +39,8 @@ | |||
| public abstract class BufferingResponseListener implements Listener | |||
| { | |||
| private final int maxLength; | |||
| private ByteBuffer buffer; | |||
| private final ByteBufferAccumulator buffer; | |||
There was a problem hiding this comment.
This class is deprecated in 12.0. In 12.1 it should probably be a org.eclipse.jetty.io.RetainableByteBuffer.DynamicCapacity
Perhaps it is best to rebase this PR to 12.1 and use that class. 12.1 will soon be the main branch.
Comment on lines
+193
to
+208
| return new ByteArrayInputStream(toByteArray()); | ||
| } | ||
|
|
||
| private byte[] toByteArray() | ||
| { | ||
| synchronized (buffer) | ||
| { | ||
| try (ByteBufferAccumulator buffer = this.buffer) | ||
| { | ||
| if (buffer.getLength() == 0) | ||
| result = new byte[0]; | ||
| else | ||
| result = buffer.toByteArray(); | ||
| } | ||
| } | ||
| return result; |
There was a problem hiding this comment.
ideally we would not have to copy all the retained buffers to a single buffer just to stream as a InputStream. We should have a mechanism to do this without this extra copy.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #12687