Issue #5048 - Review temporary buffer usage #5091
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| // | ||
| // ======================================================================== | ||
| // Copyright (c) 1995-2020 Mort Bay Consulting Pty Ltd and others. | ||
| // ------------------------------------------------------------------------ | ||
| // All rights reserved. This program and the accompanying materials | ||
| // are made available under the terms of the Eclipse Public License v1.0 | ||
| // and Apache License v2.0 which accompanies this distribution. | ||
| // | ||
| // The Eclipse Public License is available at | ||
| // http://www.eclipse.org/legal/epl-v10.html | ||
| // | ||
| // The Apache License v2.0 is available at | ||
| // http://www.opensource.org/licenses/apache2.0.php | ||
| // | ||
| // You may elect to redistribute this code under either of these licenses. | ||
| // ======================================================================== | ||
| // | ||
|
|
||
| package org.eclipse.jetty.io; | ||
|
|
||
| import java.io.IOException; | ||
| import java.io.InputStream; | ||
| import java.nio.ByteBuffer; | ||
|
|
||
| import org.eclipse.jetty.util.BufferUtil; | ||
| import org.eclipse.jetty.util.resource.Resource; | ||
|
|
||
| public class ByteBufferPoolUtil | ||
| { | ||
| public static ByteBuffer resourceToBuffer(Resource resource, boolean direct, ByteBufferPool bufferPool) throws IOException | ||
| { | ||
| long len = resource.length(); | ||
| if (len < 0) | ||
| throw new IllegalArgumentException("invalid resource: " + resource + " len=" + len); | ||
|
|
||
| if (len > Integer.MAX_VALUE) | ||
| { | ||
| // This method cannot handle resources of this size. | ||
| return null; | ||
| } | ||
|
|
||
| int ilen = (int)len; | ||
| ByteBuffer buffer; | ||
| if (bufferPool != null) | ||
| buffer = bufferPool.acquire(ilen, direct); | ||
| else | ||
| buffer = direct ? BufferUtil.allocateDirect(ilen) : BufferUtil.allocate(ilen); | ||
|
|
||
| int pos = BufferUtil.flipToFill(buffer); | ||
| if (resource.getFile() != null) | ||
| BufferUtil.readFrom(resource.getFile(), buffer); | ||
| else | ||
| { | ||
| try (InputStream is = resource.getInputStream()) | ||
| { | ||
| BufferUtil.readFrom(is, ilen, buffer); | ||
|
There was a problem hiding this comment. It is the temporary buffers like the one used inside There was a problem hiding this comment. Also I think we can use our context to use bigger temp buffers inside |
||
| } | ||
| } | ||
| BufferUtil.flipToFlush(buffer, pos); | ||
|
|
||
| return buffer; | ||
| } | ||
| } | ||
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is the lifecycle of a
ResourceHttpContent? Can it be put into a cache? If so, couldgetIndirectBufferbe called again and again, and the list of allocated buffers get longer and longer with release never called or called in the distant future? Is release always called?I'd be perhaps more included to have a
ByteBuffer getIndirectBuffer(ByteBufferPool pool)method that the caller can pass in their pool and then be responsible for doing the release themselves.