Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

409953 More efficient implementation of BufferUtil.writeTo(...)

This commit is contained in:
Thomas Becker 2013-06-06 12:59:18 +02:00 committed by Joakim Erdfelt
parent 7792c1dad7
commit 928275271d
2 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jetty-util/src/main/java/org/eclipse/jetty/util/BufferUtil.java
View File

@ -84,7 +84,7 @@ import java.nio.charset.Charset;
*/
public class BufferUtil
{
static final int TEMP_BUFFER_SIZE = 4096;
static final int TEMP_BUFFER_SIZE = 512;
static final byte SPACE = 0x20;
static final byte MINUS = '-';
static final byte[] DIGIT =
@ -439,18 +439,11 @@ public class BufferUtil
else
{
byte[] bytes = new byte[TEMP_BUFFER_SIZE];
int j = 0;
for (int i = buffer.position(); i < buffer.limit(); i++)
{
bytes[j] = buffer.get(i);
j++;
if (j == TEMP_BUFFER_SIZE)
{
out.write(bytes);
j = 0;
}
while(buffer.hasRemaining()){
int byteCountToWrite = Math.min(buffer.remaining(), TEMP_BUFFER_SIZE);
buffer.get(bytes, 0, byteCountToWrite);
out.write(bytes,0 , byteCountToWrite);
}
out.write(bytes, 0, j);
}
}

30
jetty-util/src/test/java/org/eclipse/jetty/util/BufferUtilTest.java
View File

@ -241,24 +241,30 @@ public class BufferUtilTest
"ignored.")
public void testWriteToMicrobenchmark() throws IOException
{
int capacity = 1024 * 1024;
int iterations = 30;
int capacity = 1024 * 128;
int iterations = 100;
int testRuns = 10;
byte[] bytes = new byte[capacity];
new Random().nextBytes(bytes);
ByteBuffer buffer = BufferUtil.allocate(capacity);
BufferUtil.append(buffer, bytes, 0, capacity);
long start = System.nanoTime();
for (int i = 0; i < iterations; i++)
long startTest = System.nanoTime();
for (int i = 0; i < testRuns; i++)
{
ByteArrayOutputStream out = new ByteArrayOutputStream();
long startRun = System.nanoTime();
BufferUtil.writeTo(buffer.asReadOnlyBuffer(), out);
long elapsedRun = System.nanoTime() - startRun;
LOG.warn("run elapsed={}ms", elapsedRun / 1000);
assertThat("Bytes in out equal bytes in buffer", Arrays.equals(bytes, out.toByteArray()), is(true));
long start = System.nanoTime();
for (int j = 0; j < iterations; j++)
{
ByteArrayOutputStream out = new ByteArrayOutputStream();
long startRun = System.nanoTime();
BufferUtil.writeTo(buffer.asReadOnlyBuffer(), out);
long elapsedRun = System.nanoTime() - startRun;
// LOG.warn("run elapsed={}ms", elapsedRun / 1000);
assertThat("Bytes in out equal bytes in buffer", Arrays.equals(bytes, out.toByteArray()), is(true));
}
long elapsed = System.nanoTime() - start;
LOG.warn("elapsed={}ms average={}ms", elapsed / 1000, elapsed/iterations/1000);
}
long elapsed = System.nanoTime() - start;
LOG.warn("elapsed={}ms average={}ms", elapsed / 1000, elapsed/iterations/1000);
LOG.warn("overall average: {}ms", (System.nanoTime() - startTest) / testRuns / iterations / 1000);
}
@Test