lib/mvfst
1
0
Fork 0
mirror of https://github.com/facebookincubator/mvfst.git synced 2025-11-10 21:22:20 +03:00
Code Activity

Use folly::small_vector for ack blocks

Browse Source 
Summary: By modifying `IntervalSet` a bit we can make it so it takes a `folly::small_vector` as the container. We expect that for real traffic there will not generally be a lot of ACK blocks per frame, so optimize for that.

Reviewed By: siyengar

Differential Revision: D18919975

fbshipit-source-id: 199a2ea9ba5003382e2d7d99fc7a6de7e8aafdca
This commit is contained in:
Matt Joras
2019-12-12 12:04:23 -08:00
committed by Facebook Github Bot
parent f8e162931b
commit f041ec17ef
15 changed files with 71 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
quic/codec/test/QuicWriteCodecTest.cpp
View File

@@ -571,7 +571,7 @@ TEST_F(QuicWriteCodecTest, AckFrameGapExceedsRepresentation) {
PacketNum max = std::numeric_limits<uint64_t>::max();
// Can't use max directly, because it will exceed interval set's
// representation.
IntervalSet<PacketNum> ackBlocks = {{max - 10, max - 10}, {1, 1}};
WriteAckFrame::AckBlocks ackBlocks = {{max - 10, max - 10}, {1, 1}};
EXPECT_THROW(
writeAckFrame(
AckFrameMetaData(ackBlocks, 0us, kDefaultAckDelayExponent),
@@ -589,7 +589,7 @@ TEST_F(QuicWriteCodecTest, AckFrameVeryLargeAckRange) {
// There is 1 gap => each represented by 8 bytes => 8 bytes
// total 11 bytes
PacketNum largest = (uint64_t)1 << 55;
IntervalSet<PacketNum> ackBlocks = {{1, largest}};
WriteAckFrame::AckBlocks ackBlocks = {{1, largest}};
AckFrameMetaData ackMetadata(ackBlocks, 0us, kDefaultAckDelayExponent);
auto ackFrameWriteResult = *writeAckFrame(ackMetadata, pktBuilder);
@@ -617,7 +617,7 @@ TEST_F(QuicWriteCodecTest, AckFrameNotEnoughForAnything) {
// There are 2 gaps => each represented by 2 bytes => 4 bytes
// 1 byte for first ack block length, then 2 bytes for each pair => 5 bytes
// total 15 bytes
IntervalSet<PacketNum> ackBlocks = {{1000, 1000}, {500, 700}, {100, 200}};
WriteAckFrame::AckBlocks ackBlocks = {{1000, 1000}, {500, 700}, {100, 200}};
// 4 btyes are just not enough for anything
AckFrameMetaData ackMetadata(ackBlocks, 555us, kDefaultAckDelayExponent);
@@ -630,7 +630,7 @@ TEST_F(QuicWriteCodecTest, WriteSimpleAckFrame) {
MockQuicPacketBuilder pktBuilder;
setupCommonExpects(pktBuilder);
auto ackDelay = 111us;
IntervalSet<PacketNum> ackBlocks = {{501, 1000}, {101, 400}};
WriteAckFrame::AckBlocks ackBlocks = {{501, 1000}, {101, 400}};
AckFrameMetaData meta(ackBlocks, ackDelay, kDefaultAckDelayExponent);
// 1 type byte,
@@ -675,7 +675,7 @@ TEST_F(QuicWriteCodecTest, WriteAckFrameWillSaveAckDelay) {
MockQuicPacketBuilder pktBuilder;
setupCommonExpects(pktBuilder);
auto ackDelay = 111us;
IntervalSet<PacketNum> ackBlocks = {{501, 1000}, {101, 400}};
WriteAckFrame::AckBlocks ackBlocks = {{501, 1000}, {101, 400}};
AckFrameMetaData meta(ackBlocks, ackDelay, kDefaultAckDelayExponent);
writeAckFrame(meta, pktBuilder);
@@ -703,7 +703,7 @@ TEST_F(QuicWriteCodecTest, VerifyNumAckBlocksSizeAccounted) {
auto gap = 2;
PacketNum largest = 1000;
PacketNum currentEnd = largest - blockLength - gap;
IntervalSet<PacketNum> ackBlocks;
WriteAckFrame::AckBlocks ackBlocks;
for (int i = 0; i < 64; i++) {
CHECK_GE(currentEnd, blockLength);
ackBlocks.insert({currentEnd - blockLength, currentEnd});
@@ -730,7 +730,7 @@ TEST_F(QuicWriteCodecTest, WriteWithDifferentAckDelayExponent) {
MockQuicPacketBuilder pktBuilder;
setupCommonExpects(pktBuilder);
IntervalSet<PacketNum> ackBlocks{{1000, 1000}};
WriteAckFrame::AckBlocks ackBlocks{{1000, 1000}};
uint8_t ackDelayExponent = 6;
AckFrameMetaData ackMetadata(ackBlocks, 1240us, ackDelayExponent);
@@ -753,7 +753,7 @@ TEST_F(QuicWriteCodecTest, WriteExponentInLongHeaderPacket) {
MockQuicPacketBuilder pktBuilder;
setupCommonExpects(pktBuilder);
IntervalSet<PacketNum> ackBlocks{{1000, 1000}};
WriteAckFrame::AckBlocks ackBlocks{{1000, 1000}};
uint8_t ackDelayExponent = 6;
AckFrameMetaData ackMetadata(ackBlocks, 1240us, ackDelayExponent);
@@ -783,7 +783,7 @@ TEST_F(QuicWriteCodecTest, OnlyAckLargestPacket) {
// 1 byte for ack block count
// 1 byte for first ack block length
// total 7 bytes
IntervalSet<PacketNum> ackBlocks{{1000, 1000}};
WriteAckFrame::AckBlocks ackBlocks{{1000, 1000}};
AckFrameMetaData ackMetadata(ackBlocks, 555us, kDefaultAckDelayExponent);
// No AckBlock is added to the metadata. There will still be one block
@@ -827,7 +827,7 @@ TEST_F(QuicWriteCodecTest, WriteSomeAckBlocks) {
// 1 byte for first ack block length
// each additional ack block 1 byte gap + 1 byte length => 2 bytes
// total 7 bytes
IntervalSet<PacketNum> testAckBlocks;
WriteAckFrame::AckBlocks testAckBlocks;
PacketNum currentEnd = 1000;
auto blockLength = 5;
auto gap = 10;
@@ -871,7 +871,7 @@ TEST_F(QuicWriteCodecTest, NoSpaceForAckBlockSection) {
// 2 bytes for largest acked, 2 bytes for ack delay => 4 bytes
// 1 byte for num ack blocks
// 1 byte for first ack block length
IntervalSet<PacketNum> ackBlocks = {{1000, 1000}, {701, 900}, {501, 600}};
WriteAckFrame::AckBlocks ackBlocks = {{1000, 1000}, {701, 900}, {501, 600}};
AckFrameMetaData ackMetadata(ackBlocks, 555us, kDefaultAckDelayExponent);
auto ackFrameWriteResult = writeAckFrame(ackMetadata, pktBuilder);
EXPECT_FALSE(ackFrameWriteResult.hasValue());
@@ -886,7 +886,7 @@ TEST_F(QuicWriteCodecTest, OnlyHasSpaceForFirstAckBlock) {
// 2 bytes for largest acked, 2 bytes for ack delay => 4 bytes
// 1 byte for num ack blocks
// 1 byte for first ack block length
IntervalSet<PacketNum> ackBlocks = {{1000, 1000}, {701, 900}, {501, 600}};
WriteAckFrame::AckBlocks ackBlocks = {{1000, 1000}, {701, 900}, {501, 600}};
AckFrameMetaData ackMetadata(ackBlocks, 555us, kDefaultAckDelayExponent);
auto ackFrameWriteResult = *writeAckFrame(ackMetadata, pktBuilder);