Improve HttpOutput.print()
#12530
Open
Improve HttpOutput.print()
#12530
+47
−70
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
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
lorban
commented
Nov 13, 2024
| } | ||
| finally | ||
| { | ||
| out.release(); |
There was a problem hiding this comment.
If the above write() call is async, out.release() may be called before the write is done.
sbordet
requested changes
Nov 13, 2024
| _encoder.offer(encoder); | ||
| } | ||
| byte[] bytes = s.getBytes(charset); | ||
| IORunnable r = eoln ? () -> write("\r\n".getBytes(StandardCharsets.UTF_8)) : null; |
There was a problem hiding this comment.
Use ASCII for \r\n.
The write of this IORunnable could remain pending, so you cannot notify callback until this write is complete.
There was a problem hiding this comment.
Better yet, use IO.CRLF_BYTES
There was a problem hiding this comment.
and call the variable onComplete
gregw
requested changes
Nov 13, 2024
| @@ -799,8 +809,27 @@ public void write(byte[] b, int off, int len) throws IOException | |||
|
|
|||
| if (async) | |||
| { | |||
| IORunnable copy = onComplete; | |||
There was a problem hiding this comment.
is copy the right name? It confused me. How about just doOnComplete or runOnComplete?
| @@ -820,6 +849,10 @@ public void write(byte[] b, int off, int len) throws IOException | |||
| if (len > 0 && !last && len <= _commitSize && len <= maximizeAggregateSpace()) | |||
| { | |||
| BufferUtil.append(byteBuffer, b, off, len); | |||
| IORunnable copy = onComplete; | |||
| _encoder.offer(encoder); | ||
| } | ||
| byte[] bytes = s.getBytes(charset); | ||
| IORunnable r = eoln ? () -> write("\r\n".getBytes(StandardCharsets.UTF_8)) : null; |
There was a problem hiding this comment.
Better yet, use IO.CRLF_BYTES
| _encoder.offer(encoder); | ||
| } | ||
| byte[] bytes = s.getBytes(charset); | ||
| IORunnable r = eoln ? () -> write("\r\n".getBytes(StandardCharsets.UTF_8)) : null; |
There was a problem hiding this comment.
and call the variable onComplete
…tty-12.1.x/faster-HttpOutput-print
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.
Prototype / WIP.
This PR improves
HttpOutput.print()by simplifying it, avoiding copies when needed and fixing a too early buffer release.