From 9cdb1cd251f6b9fcb6f5a2e179789ab3f10e579e Mon Sep 17 00:00:00 2001 From: Aman Sharma Date: Fri, 12 Apr 2024 16:29:04 -0700 Subject: [PATCH] Remove unused fields in OutstandingPacketMetadata [2/n] Summary: Neither QUIC not TransportMonitor is using the `packetsInflight` field of the `OutstandingPacketMetadata` Reviewed By: hanidamlaj Differential Revision: D55926288 fbshipit-source-id: 32efd66add1e6374a8d3446ff635fe582b36e644 --- quic/api/QuicTransportFunctions.cpp | 1 - quic/api/test/QuicPacketSchedulerTest.cpp | 3 -- quic/api/test/QuicTransportFunctionsTest.cpp | 4 -- quic/api/test/QuicTypedTransportTest.cpp | 5 --- quic/codec/test/QuicPacketRebuilderTest.cpp | 1 - quic/common/test/TestPacketBuilders.cpp | 1 - quic/common/test/TestUtils.cpp | 2 - quic/congestion_control/test/CopaTest.cpp | 2 - quic/congestion_control/test/NewRenoTest.cpp | 3 -- quic/loss/test/QuicLossFunctionsTest.cpp | 5 --- quic/state/OutstandingPacket.h | 8 ---- quic/state/test/AckHandlersTest.cpp | 40 -------------------- quic/state/test/OutstandingPacketTest.cpp | 8 ---- quic/state/test/QuicStateFunctionsTest.cpp | 5 --- quic/state/test/StateDataTest.cpp | 3 -- 15 files changed, 91 deletions(-) diff --git a/quic/api/QuicTransportFunctions.cpp b/quic/api/QuicTransportFunctions.cpp index 5df58d968..b48bd49a8 100644 --- a/quic/api/QuicTransportFunctions.cpp +++ b/quic/api/QuicTransportFunctions.cpp @@ -893,7 +893,6 @@ void updateConnection( // conn.outstandings.numOutstanding() + 1 since we're emplacing here conn.lossState.totalBytesSent, conn.lossState.inflightBytes + encodedSize, - conn.outstandings.numOutstanding() + 1, conn.lossState, conn.writeCount, std::move(detailsPerStream), diff --git a/quic/api/test/QuicPacketSchedulerTest.cpp b/quic/api/test/QuicPacketSchedulerTest.cpp index 8167378ce..3cdf9875f 100644 --- a/quic/api/test/QuicPacketSchedulerTest.cpp +++ b/quic/api/test/QuicPacketSchedulerTest.cpp @@ -48,7 +48,6 @@ PacketNum addInitialOutstandingPacket(QuicConnectionStateBase& conn) { true, 0, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); @@ -77,7 +76,6 @@ PacketNum addHandshakeOutstandingPacket(QuicConnectionStateBase& conn) { true, 0, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); @@ -101,7 +99,6 @@ PacketNum addOutstandingPacket(QuicConnectionStateBase& conn) { false, 0, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); diff --git a/quic/api/test/QuicTransportFunctionsTest.cpp b/quic/api/test/QuicTransportFunctionsTest.cpp index 69fe51dfc..14fcabfcf 100644 --- a/quic/api/test/QuicTransportFunctionsTest.cpp +++ b/quic/api/test/QuicTransportFunctionsTest.cpp @@ -1421,10 +1421,6 @@ TEST_F(QuicTransportFunctionsTest, TestUpdateConnectionWithBytesStats) { 16000 + 555, getFirstOutstandingPacket(*conn, PacketNumberSpace::Handshake) ->metadata.inflightBytes); - EXPECT_EQ( - 1, - getFirstOutstandingPacket(*conn, PacketNumberSpace::Handshake) - ->metadata.packetsInflight); EXPECT_EQ( 555, getFirstOutstandingPacket(*conn, PacketNumberSpace::Handshake) diff --git a/quic/api/test/QuicTypedTransportTest.cpp b/quic/api/test/QuicTypedTransportTest.cpp index 55f9039ec..a9ee7239a 100644 --- a/quic/api/test/QuicTypedTransportTest.cpp +++ b/quic/api/test/QuicTypedTransportTest.cpp @@ -631,7 +631,6 @@ TYPED_TEST( .Times(1) .WillOnce(Invoke([&](auto& outstandingPacket) { EXPECT_EQ(4, outstandingPacket.metadata.totalPacketsSent); - EXPECT_EQ(1, outstandingPacket.metadata.packetsInflight); EXPECT_EQ(3, outstandingPacket.metadata.writeCount); })); @@ -687,12 +686,10 @@ TYPED_TEST( .Times(2) .WillOnce(Invoke([&](auto& outstandingPacket) { EXPECT_EQ(4, outstandingPacket.metadata.totalPacketsSent); - EXPECT_EQ(1, outstandingPacket.metadata.packetsInflight); EXPECT_EQ(3, outstandingPacket.metadata.writeCount); })) .WillOnce(Invoke([&](auto& outstandingPacket) { EXPECT_EQ(5, outstandingPacket.metadata.totalPacketsSent); - EXPECT_EQ(2, outstandingPacket.metadata.packetsInflight); EXPECT_EQ(4, outstandingPacket.metadata.writeCount); })); @@ -772,7 +769,6 @@ TYPED_TEST(QuicTypedTransportAfterStartTest, TotalAppLimitedTime) { .Times(2) .WillOnce(Invoke([&](auto& outstandingPacket) { EXPECT_EQ(4, outstandingPacket.metadata.totalPacketsSent); - EXPECT_EQ(1, outstandingPacket.metadata.packetsInflight); EXPECT_EQ(3, outstandingPacket.metadata.writeCount); EXPECT_NE(0us, outstandingPacket.metadata.totalAppLimitedTimeUsecs); firstPacketTotalAppLimitedTimeUsecs = @@ -780,7 +776,6 @@ TYPED_TEST(QuicTypedTransportAfterStartTest, TotalAppLimitedTime) { })) .WillOnce(Invoke([&](auto& outstandingPacket) { EXPECT_EQ(5, outstandingPacket.metadata.totalPacketsSent); - EXPECT_EQ(2, outstandingPacket.metadata.packetsInflight); EXPECT_EQ(3, outstandingPacket.metadata.writeCount); EXPECT_EQ( firstPacketTotalAppLimitedTimeUsecs, diff --git a/quic/codec/test/QuicPacketRebuilderTest.cpp b/quic/codec/test/QuicPacketRebuilderTest.cpp index 91710f854..591f45cbb 100644 --- a/quic/codec/test/QuicPacketRebuilderTest.cpp +++ b/quic/codec/test/QuicPacketRebuilderTest.cpp @@ -36,7 +36,6 @@ OutstandingPacketWrapper makeDummyOutstandingPacket( false, totalBytesSentOnConnection, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); diff --git a/quic/common/test/TestPacketBuilders.cpp b/quic/common/test/TestPacketBuilders.cpp index 98aa599c9..527efd7c2 100644 --- a/quic/common/test/TestPacketBuilders.cpp +++ b/quic/common/test/TestPacketBuilders.cpp @@ -238,7 +238,6 @@ OutstandingPacketWrapper OutstandingPacketBuilder::build() && { *CHECK_NOTNULL(maybeIsHandshake.get_pointer()), *CHECK_NOTNULL(maybeTotalBytesSent.get_pointer()), *CHECK_NOTNULL(maybeInflightBytes.get_pointer()), - *CHECK_NOTNULL(maybePacketsInflight.get_pointer()), CHECK_NOTNULL(maybeLossState.get_pointer())->get(), *CHECK_NOTNULL(maybeWriteCount.get_pointer()), *CHECK_NOTNULL(maybeDetailsPerStream.get_pointer()), diff --git a/quic/common/test/TestUtils.cpp b/quic/common/test/TestUtils.cpp index 4a3c7488b..03578caeb 100644 --- a/quic/common/test/TestUtils.cpp +++ b/quic/common/test/TestUtils.cpp @@ -545,7 +545,6 @@ OutstandingPacketWrapper makeTestingWritePacket( false, totalBytesSent, inflightBytes, - 0, LossState(), writeCount, OutstandingPacketMetadata::DetailsPerStream()); @@ -580,7 +579,6 @@ CongestionController::AckEvent makeAck( false /* isHandshake */, 0 /* totalBytesSent */, 0 /* inflightBytes */, - 0 /* numOutstanding */, LossState() /* lossState */, 0 /* writeCount */, OutstandingPacketMetadata::DetailsPerStream())) diff --git a/quic/congestion_control/test/CopaTest.cpp b/quic/congestion_control/test/CopaTest.cpp index 23331c7ec..f62fdfe66 100644 --- a/quic/congestion_control/test/CopaTest.cpp +++ b/quic/congestion_control/test/CopaTest.cpp @@ -37,7 +37,6 @@ class CopaTest : public Test { false, totalSentBytes, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream())); @@ -63,7 +62,6 @@ class CopaTest : public Test { false, totalSent, inflight, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); diff --git a/quic/congestion_control/test/NewRenoTest.cpp b/quic/congestion_control/test/NewRenoTest.cpp index 882f02dbe..c2f85a2cd 100644 --- a/quic/congestion_control/test/NewRenoTest.cpp +++ b/quic/congestion_control/test/NewRenoTest.cpp @@ -33,7 +33,6 @@ CongestionController::LossEvent createLossEvent( false, 10, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream())); @@ -68,7 +67,6 @@ CongestionController::AckEvent createAckEvent( false, ackedSize, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()))); @@ -91,7 +89,6 @@ OutstandingPacketWrapper createPacket( false, size, inflight, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); diff --git a/quic/loss/test/QuicLossFunctionsTest.cpp b/quic/loss/test/QuicLossFunctionsTest.cpp index b44b9d0d6..e3a0257d7 100644 --- a/quic/loss/test/QuicLossFunctionsTest.cpp +++ b/quic/loss/test/QuicLossFunctionsTest.cpp @@ -266,7 +266,6 @@ PacketNum QuicLossFunctionsTest::sendPacket( isHandshake, encodedSize, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); @@ -797,7 +796,6 @@ TEST_F(QuicLossFunctionsTest, TestHandleAckForLoss) { false, 0, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); @@ -1856,7 +1854,6 @@ TEST_F(QuicLossFunctionsTest, PersistentCongestionAckOutsideWindow) { false /* isHandshake */, 0 /* totalBytesSent */, 0 /* inflightBytes */, - 0 /* numOutstanding */, LossState() /* lossState */, 0 /* writeCount */, OutstandingPacketMetadata::DetailsPerStream())) @@ -1891,7 +1888,6 @@ TEST_F(QuicLossFunctionsTest, PersistentCongestionAckInsideWindow) { false /* isHandshake */, 0 /* totalBytesSent */, 0 /* inflightBytes */, - 0 /* numOutstanding */, LossState() /* lossState */, 0 /* writeCount */, OutstandingPacketMetadata::DetailsPerStream())) @@ -1925,7 +1921,6 @@ TEST_F(QuicLossFunctionsTest, PersistentCongestionNoPTO) { false /* isHandshake */, 0 /* totalBytesSent */, 0 /* inflightBytes */, - 0 /* numOutstanding */, LossState() /* lossState */, 0 /* writeCount */, OutstandingPacketMetadata::DetailsPerStream())) diff --git a/quic/state/OutstandingPacket.h b/quic/state/OutstandingPacket.h index 72036ad2b..19a3e74cb 100644 --- a/quic/state/OutstandingPacket.h +++ b/quic/state/OutstandingPacket.h @@ -30,8 +30,6 @@ struct OutstandingPacketMetadata { // Bytes in flight on this connection including this packet itself when this // packet is sent. uint64_t inflightBytes; - // Packets in flight on this connection including this packet itself. - uint64_t packetsInflight; // Total number of packets sent on this connection. uint32_t totalPacketsSent{0}; // Total number of ack-eliciting packets sent on this connection. @@ -123,7 +121,6 @@ struct OutstandingPacketMetadata { bool isHandshakeIn, uint64_t totalBytesSentIn, uint64_t inflightBytesIn, - uint64_t packetsInflightIn, const LossState& lossStateIn, uint64_t writeCount, DetailsPerStream detailsPerStream, @@ -134,7 +131,6 @@ struct OutstandingPacketMetadata { isHandshake(isHandshakeIn), totalBytesSent(totalBytesSentIn), inflightBytes(inflightBytesIn), - packetsInflight(packetsInflightIn), totalPacketsSent(lossStateIn.totalPacketsSent), totalAckElicitingPacketsSent(lossStateIn.totalAckElicitingPacketsSent), writeCount(writeCount), @@ -210,7 +206,6 @@ struct OutstandingPacket { bool isHandshakeIn, uint64_t totalBytesSentIn, uint64_t inflightBytesIn, - uint64_t packetsInflightIn, const LossState& lossStateIn, uint64_t writeCount, Metadata::DetailsPerStream detailsPerStream, @@ -223,7 +218,6 @@ struct OutstandingPacket { isHandshakeIn, totalBytesSentIn, inflightBytesIn, - packetsInflightIn, lossStateIn, writeCount, std::move(detailsPerStream), @@ -246,7 +240,6 @@ struct OutstandingPacketWrapper : OutstandingPacket { bool isHandshakeIn, uint64_t totalBytesSentIn, uint64_t inflightBytesIn, - uint64_t packetsInflightIn, const LossState& lossStateIn, uint64_t writeCount, Metadata::DetailsPerStream detailsPerStream, @@ -261,7 +254,6 @@ struct OutstandingPacketWrapper : OutstandingPacket { isHandshakeIn, totalBytesSentIn, inflightBytesIn, - packetsInflightIn, lossStateIn, writeCount, std::move(detailsPerStream), diff --git a/quic/state/test/AckHandlersTest.cpp b/quic/state/test/AckHandlersTest.cpp index 6fec6c505..a0e7551d7 100644 --- a/quic/state/test/AckHandlersTest.cpp +++ b/quic/state/test/AckHandlersTest.cpp @@ -74,7 +74,6 @@ auto emplacePackets( false /* handshake */, packetNum, packetNum + 1, - packetNum + 1, quic::LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); @@ -194,7 +193,6 @@ TEST_P(AckHandlersTest, TestAckMultipleSequentialBlocks) { false, packetNum, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); @@ -289,7 +287,6 @@ TEST_P(AckHandlersTest, TestSpuriousLossFullRemoval) { false /* handshake */, 0, 1, - 1, quic::LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); @@ -369,7 +366,6 @@ TEST_P(AckHandlersTest, TestSpuriousLossSplitMiddleRemoval) { false /* handshake */, 0, 1, - 1, quic::LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); @@ -455,7 +451,6 @@ TEST_P(AckHandlersTest, TestSpuriousLossTrimFrontRemoval) { false /* handshake */, 0, 1, - 1, quic::LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); @@ -538,7 +533,6 @@ TEST_P(AckHandlersTest, TestSpuriousLossSplitFrontRemoval) { false /* handshake */, 0, 1, - 1, quic::LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); @@ -624,7 +618,6 @@ TEST_P(AckHandlersTest, TestPacketDestructionAcks) { false, packetNum, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream(), @@ -707,7 +700,6 @@ TEST_P(AckHandlersTest, TestPacketDestructionSpuriousLoss) { false, packetNum, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream(), @@ -771,7 +763,6 @@ TEST_P(AckHandlersTest, TestPacketDestructionSpuriousLoss) { false, packetNum, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream(), @@ -844,7 +835,6 @@ TEST_P(AckHandlersTest, TestPacketDestructionBigDeque) { false, packetNum, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream(), @@ -949,7 +939,6 @@ TEST_P(AckHandlersTest, TestAckMultipleSequentialBlocksLoss) { false, packetNum, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); @@ -1105,7 +1094,6 @@ TEST_P(AckHandlersTest, TestAckBlocksWithGaps) { false, packetNum, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); @@ -1223,7 +1211,6 @@ TEST_P(AckHandlersTest, TestNonSequentialPacketNumbers) { false, packetNum, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); @@ -1246,7 +1233,6 @@ TEST_P(AckHandlersTest, TestNonSequentialPacketNumbers) { false, packetNum, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); @@ -1343,7 +1329,6 @@ TEST_P(AckHandlersTest, AckVisitorForAckTest) { false, 0, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); @@ -1366,7 +1351,6 @@ TEST_P(AckHandlersTest, AckVisitorForAckTest) { false, 0, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); @@ -1440,7 +1424,6 @@ TEST_P(AckHandlersTest, NoNewAckedPacket) { false, 0, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); @@ -1499,7 +1482,6 @@ TEST_P(AckHandlersTest, AckPacketNumDoesNotExist) { false, 0, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); @@ -1517,7 +1499,6 @@ TEST_P(AckHandlersTest, AckPacketNumDoesNotExist) { false, 0, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); @@ -1561,7 +1542,6 @@ TEST_P(AckHandlersTest, TestHandshakeCounterUpdate) { packetNum % 2 && GetParam().pnSpace != PacketNumberSpace::AppData, packetNum / 2, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); @@ -1773,7 +1753,6 @@ TEST_P(AckHandlersTest, NoSkipAckVisitor) { false, 1, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); @@ -1838,7 +1817,6 @@ TEST_P(AckHandlersTest, SkipAckVisitor) { false, 1, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); @@ -1901,7 +1879,6 @@ TEST_P(AckHandlersTest, MultiplePacketProcessors) { false, 1 * (packetNum + 1), 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); @@ -1962,7 +1939,6 @@ TEST_P(AckHandlersTest, NoDoubleProcess) { false, 1, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); @@ -1976,7 +1952,6 @@ TEST_P(AckHandlersTest, NoDoubleProcess) { false, 1, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); @@ -2042,7 +2017,6 @@ TEST_P(AckHandlersTest, ClonedPacketsCounter) { false, 1, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); @@ -2060,7 +2034,6 @@ TEST_P(AckHandlersTest, ClonedPacketsCounter) { false, 1, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); @@ -2113,7 +2086,6 @@ TEST_P(AckHandlersTest, UpdateMaxAckDelay) { false, 1, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); @@ -2189,7 +2161,6 @@ TEST_P(AckHandlersTest, AckNotOutstandingButLoss) { false, 1, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); @@ -2241,7 +2212,6 @@ TEST_P(AckHandlersTest, UpdatePendingAckStates) { false, conn.lossState.totalBytesSent + 111, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); @@ -2310,7 +2280,6 @@ TEST_P(AckHandlersTest, AckEventCreation) { false /* isHandshakeIn */, 1 * (packetNum + 1) /* totalBytesSentIn */, 0 /* inflightBytesIn */, - 0 /* packetsInflightIn */, LossState(), getWriteCount(packetNum) /* writeCountIn */, OutstandingPacketMetadata::DetailsPerStream()); @@ -2444,7 +2413,6 @@ TEST_P(AckHandlersTest, AckEventCreationSingleWrite) { false /* isHandshakeIn */, 1 * (packetNum + 1) /* totalBytesSentIn */, 0 /* inflightBytesIn */, - 0 /* packetsInflightIn */, LossState(), getWriteCount(packetNum) /* writeCountIn */, OutstandingPacketMetadata::DetailsPerStream()); @@ -2576,7 +2544,6 @@ TEST_P(AckHandlersTest, AckEventCreationNoCongestionController) { false /* isHandshakeIn */, 1 * (packetNum + 1) /* totalBytesSentIn */, 0 /* inflightBytesIn */, - 0 /* packetsInflightIn */, LossState(), getWriteCount(packetNum) /* writeCountIn */, OutstandingPacketMetadata::DetailsPerStream()); @@ -3316,7 +3283,6 @@ TEST_P(AckHandlersTest, AckEventCreationInvalidAckDelay) { false /* isHandshakeIn */, 1 * (packetNum + 1) /* totalBytesSentIn */, 0 /* inflightBytesIn */, - 0 /* packetsInflightIn */, LossState(), getWriteCount(packetNum) /* writeCountIn */, OutstandingPacketMetadata::DetailsPerStream()); @@ -3423,7 +3389,6 @@ TEST_P(AckHandlersTest, AckEventCreationRttMinusAckDelayIsZero) { false /* isHandshakeIn */, 1 * (packetNum + 1) /* totalBytesSentIn */, 0 /* inflightBytesIn */, - 0 /* packetsInflightIn */, LossState(), getWriteCount(packetNum) /* writeCountIn */, OutstandingPacketMetadata::DetailsPerStream()); @@ -3537,7 +3502,6 @@ TEST_P(AckHandlersTest, AckEventCreationReorderingLargestPacketAcked) { false /* isHandshakeIn */, 1 * (packetNum + 1) /* totalBytesSentIn */, 0 /* inflightBytesIn */, - 0 /* packetsInflightIn */, LossState(), getWriteCount(packetNum) /* writeCountIn */, OutstandingPacketMetadata::DetailsPerStream()); @@ -3773,7 +3737,6 @@ TEST_P(AckHandlersTest, AckEventCreationNoMatchingPacketDueToLoss) { false /* isHandshakeIn */, 1 * (packetNum + 1) /* totalBytesSentIn */, 0 /* inflightBytesIn */, - 0 /* packetsInflightIn */, LossState(), getWriteCount(packetNum) /* writeCountIn */, OutstandingPacketMetadata::DetailsPerStream()); @@ -3917,7 +3880,6 @@ TEST_P(AckHandlersTest, ImplictAckEventCreation) { false /* isHandshakeIn */, 1 * (packetNum + 1) /* totalBytesSentIn */, 0 /* inflightBytesIn */, - packetNum + 1 /* packetsInflightIn */, LossState(), getWriteCount(packetNum) /* writeCountIn */, OutstandingPacketMetadata::DetailsPerStream()); @@ -4020,7 +3982,6 @@ TEST_P(AckHandlersTest, ObserverRttSample) { false /* handshake */, packetNum, packetNum + 1, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); @@ -4302,7 +4263,6 @@ TEST_P(AckHandlersTest, SubMicrosecondRTT) { false, 0, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); diff --git a/quic/state/test/OutstandingPacketTest.cpp b/quic/state/test/OutstandingPacketTest.cpp index 136659f01..669c48adf 100644 --- a/quic/state/test/OutstandingPacketTest.cpp +++ b/quic/state/test/OutstandingPacketTest.cpp @@ -51,7 +51,6 @@ TEST(OutstandingPacketTest, BasicPacketDestructionCallback) { false, packetNum, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream(), @@ -102,7 +101,6 @@ TEST(OutstandingPacketTest, BasicPacketDestructionDequeDestroy) { false, packetNum, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream(), @@ -143,7 +141,6 @@ TEST(OutstandingPacketTest, BasicPacketDestructionNoCallback) { false, packetNum, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream(), @@ -180,7 +177,6 @@ TEST(OutstandingPacketTest, PacketMoveConstuctorCallback) { false, packetNum, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream(), @@ -224,7 +220,6 @@ TEST(OutstandingPacketTest, PacketMoveAssignCallback) { false, packetNum, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream(), @@ -268,7 +263,6 @@ TEST(OutstandingPacketTest, PacketMoveAssignExistingPacketCallback) { false, packetNum, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream(), @@ -289,7 +283,6 @@ TEST(OutstandingPacketTest, PacketMoveAssignExistingPacketCallback) { false, packetNum + 1, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream(), @@ -343,7 +336,6 @@ TEST(OutstandingPacketTest, DequeMoveAssignPacketDestructionCallback) { false, packetNum, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream(), diff --git a/quic/state/test/QuicStateFunctionsTest.cpp b/quic/state/test/QuicStateFunctionsTest.cpp index 1c598f332..f8f15d9ce 100644 --- a/quic/state/test/QuicStateFunctionsTest.cpp +++ b/quic/state/test/QuicStateFunctionsTest.cpp @@ -1094,7 +1094,6 @@ TEST_F(QuicStateFunctionsTest, GetOutstandingPackets) { false, 0, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); @@ -1106,7 +1105,6 @@ TEST_F(QuicStateFunctionsTest, GetOutstandingPackets) { false, 0, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); @@ -1118,7 +1116,6 @@ TEST_F(QuicStateFunctionsTest, GetOutstandingPackets) { false, 0, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); @@ -1130,7 +1127,6 @@ TEST_F(QuicStateFunctionsTest, GetOutstandingPackets) { false, 0, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); @@ -1142,7 +1138,6 @@ TEST_F(QuicStateFunctionsTest, GetOutstandingPackets) { false, 0, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); diff --git a/quic/state/test/StateDataTest.cpp b/quic/state/test/StateDataTest.cpp index 9a5236b60..a4d102e6c 100644 --- a/quic/state/test/StateDataTest.cpp +++ b/quic/state/test/StateDataTest.cpp @@ -153,7 +153,6 @@ TEST_F(StateDataTest, SingleLostPacketEvent) { false, 1234, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); @@ -178,7 +177,6 @@ TEST_F(StateDataTest, MultipleLostPacketsEvent) { false, 1234, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream()); @@ -197,7 +195,6 @@ TEST_F(StateDataTest, MultipleLostPacketsEvent) { false, 1357, 0, - 0, LossState(), 0, OutstandingPacketMetadata::DetailsPerStream());