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

Use calculated header size for QpackEncoder buffer allocation. 

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
Lachlan Roberts 2021-03-09 17:21:43 +11:00 committed by Simone Bordet
parent 191b1af880
commit f9606770b3
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jetty-http3/http3-qpack/src/main/java/org/eclipse/jetty/http3/qpack/QpackEncoder.java
View File

@ -300,8 +300,16 @@ public class QpackEncoder implements Dumpable
deltaBase = signBit ? requiredInsertCount - base - 1 : base - requiredInsertCount; deltaBase = signBit ? requiredInsertCount - base - 1 : base - requiredInsertCount;
} }
// TODO: Calculate the size required. // Calculate the size required. TODO: it may be more efficient to just use a buffer of MAX_HEADER_SIZE?
ByteBuffer buffer = _bufferPool.acquire(1024, false); int spaceRequired = 0;
spaceRequired += 1 + NBitInteger.octectsNeeded(8, encodedInsertCount);
spaceRequired += 1 + NBitInteger.octectsNeeded(7, deltaBase);
for (EncodableEntry encodableEntry : encodableEntries)
{
spaceRequired += encodableEntry.getRequiredSize(base);
}
ByteBuffer buffer = _bufferPool.acquire(spaceRequired, false);
int pos = BufferUtil.flipToFill(buffer); int pos = BufferUtil.flipToFill(buffer);
// Encode the Field Section Prefix into the ByteBuffer. // Encode the Field Section Prefix into the ByteBuffer.

16
jetty-http3/http3-qpack/src/test/java/org/eclipse/jetty/http3/qpack/EvictionTest.java
View File

@ -66,14 +66,14 @@ public class EvictionTest
_decoder.decode(streamId, encodedFields); _decoder.decode(streamId, encodedFields);
HttpFields result = _decoderHandler.getHttpFields(); HttpFields result = _decoderHandler.getHttpFields();
System.err.println("encoder: "); // System.err.println("encoder: ");
System.err.println(_encoder.dump()); // System.err.println(_encoder.dump());
System.err.println(); // System.err.println();
System.err.println("decoder: "); // System.err.println("decoder: ");
System.err.println(_decoder.dump()); // System.err.println(_decoder.dump());
System.err.println(); // System.err.println();
System.err.println("===================="); // System.err.println("====================");
System.err.println(); // System.err.println();
assertThat(result, is(httpFields)); assertThat(result, is(httpFields));
} }