lib/mvfst
1
0
Fork 0
mirror of https://github.com/facebookincubator/mvfst.git synced 2025-08-01 01:44:22 +03:00
Code Activity

Remove unused fields in OutstandingPacketMetadata [1/n]

Browse Source 
Summary: Neither QUIC not TransportMonitor is using the `totalBodyBytesSent` field of the `OutstandingPacketMetadata`

Reviewed By: hanidamlaj

Differential Revision: D55897240

fbshipit-source-id: 521f8a016f838dd1fe0593daa7a4e45c4fd222cf
This commit is contained in:
Aman Sharma
2024-04-12 14:19:16 -07:00
committed by Facebook GitHub Bot
parent a438ef331f
commit 5fc474a2f9
14 changed files with 0 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
quic/api/QuicTransportFunctions.cpp
View File

@ -892,7 +892,6 @@ void updateConnection(
// conn.lossState.inflightBytes isn't updated until below
// conn.outstandings.numOutstanding() + 1 since we're emplacing here
conn.lossState.totalBytesSent,
conn.lossState.totalBodyBytesSent,
conn.lossState.inflightBytes + encodedSize,
conn.outstandings.numOutstanding() + 1,
conn.lossState,

3
quic/api/test/QuicPacketSchedulerTest.cpp
View File

@ -49,7 +49,6 @@ PacketNum addInitialOutstandingPacket(QuicConnectionStateBase& conn) {
0,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream());
@ -79,7 +78,6 @@ PacketNum addHandshakeOutstandingPacket(QuicConnectionStateBase& conn) {
0,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream());
@ -104,7 +102,6 @@ PacketNum addOutstandingPacket(QuicConnectionStateBase& conn) {
0,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream());

4
quic/api/test/QuicTransportFunctionsTest.cpp
View File

@ -1417,10 +1417,6 @@ TEST_F(QuicTransportFunctionsTest, TestUpdateConnectionWithBytesStats) {
13579 + 555,
getFirstOutstandingPacket(*conn, PacketNumberSpace::Handshake)
->metadata.totalBytesSent);
EXPECT_EQ(
13000 + 500,
getFirstOutstandingPacket(*conn, PacketNumberSpace::Handshake)
->metadata.totalBodyBytesSent);
EXPECT_EQ(
16000 + 555,
getFirstOutstandingPacket(*conn, PacketNumberSpace::Handshake)

1
quic/codec/test/QuicPacketRebuilderTest.cpp
View File

@ -37,7 +37,6 @@ OutstandingPacketWrapper makeDummyOutstandingPacket(
totalBytesSentOnConnection,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream());

1
quic/common/test/TestPacketBuilders.cpp
View File

@ -237,7 +237,6 @@ OutstandingPacketWrapper OutstandingPacketBuilder::build() && {
*CHECK_NOTNULL(maybeEncodedBodySize.get_pointer()),
*CHECK_NOTNULL(maybeIsHandshake.get_pointer()),
*CHECK_NOTNULL(maybeTotalBytesSent.get_pointer()),
*CHECK_NOTNULL(maybeTotalBodyBytesSent.get_pointer()),
*CHECK_NOTNULL(maybeInflightBytes.get_pointer()),
*CHECK_NOTNULL(maybePacketsInflight.get_pointer()),
CHECK_NOTNULL(maybeLossState.get_pointer())->get(),

2
quic/common/test/TestUtils.cpp
View File

@ -544,7 +544,6 @@ OutstandingPacketWrapper makeTestingWritePacket(
0,
false,
totalBytesSent,
0,
inflightBytes,
0,
LossState(),
@ -580,7 +579,6 @@ CongestionController::AckEvent makeAck(
ackedSize /* encodedBodySize */,
false /* isHandshake */,
0 /* totalBytesSent */,
0 /* totalBodyBytesSent */,
0 /* inflightBytes */,
0 /* numOutstanding */,
LossState() /* lossState */,

2
quic/congestion_control/test/CopaTest.cpp
View File

@ -38,7 +38,6 @@ class CopaTest : public Test {
totalSentBytes,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream()));
@ -63,7 +62,6 @@ class CopaTest : public Test {
0,
false,
totalSent,
0,
inflight,
0,
LossState(),

3
quic/congestion_control/test/NewRenoTest.cpp
View File

@ -34,7 +34,6 @@ CongestionController::LossEvent createLossEvent(
10,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream()));
@ -70,7 +69,6 @@ CongestionController::AckEvent createAckEvent(
ackedSize,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream())));
@ -92,7 +90,6 @@ OutstandingPacketWrapper createPacket(
0,
false,
size,
0,
inflight,
0,
LossState(),

5
quic/loss/test/QuicLossFunctionsTest.cpp
View File

@ -265,7 +265,6 @@ PacketNum QuicLossFunctionsTest::sendPacket(
encodedBodySize,
isHandshake,
encodedSize,
encodedBodySize,
0,
0,
LossState(),
@ -799,7 +798,6 @@ TEST_F(QuicLossFunctionsTest, TestHandleAckForLoss) {
0,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream());
@ -1857,7 +1855,6 @@ TEST_F(QuicLossFunctionsTest, PersistentCongestionAckOutsideWindow) {
0 /* encodedBodySize */,
false /* isHandshake */,
0 /* totalBytesSent */,
0 /* totalBodyBytesSent */,
0 /* inflightBytes */,
0 /* numOutstanding */,
LossState() /* lossState */,
@ -1893,7 +1890,6 @@ TEST_F(QuicLossFunctionsTest, PersistentCongestionAckInsideWindow) {
0 /* encodedBodySize */,
false /* isHandshake */,
0 /* totalBytesSent */,
0 /* totalBodyBytesSent */,
0 /* inflightBytes */,
0 /* numOutstanding */,
LossState() /* lossState */,
@ -1928,7 +1924,6 @@ TEST_F(QuicLossFunctionsTest, PersistentCongestionNoPTO) {
0 /* encodedBodySize */,
false /* isHandshake */,
0 /* totalBytesSent */,
0 /* totalBodyBytesSent */,
0 /* inflightBytes */,
0 /* numOutstanding */,
LossState() /* lossState */,

9
quic/state/OutstandingPacket.h
View File

@ -27,9 +27,6 @@ struct OutstandingPacketMetadata {
// Total sent bytes on this connection including this packet itself when this
// packet is sent.
uint64_t totalBytesSent;
// Total sent body bytes on this connection including this packet itself when
// this packet is sent.
uint64_t totalBodyBytesSent;
// Bytes in flight on this connection including this packet itself when this
// packet is sent.
uint64_t inflightBytes;
@ -125,7 +122,6 @@ struct OutstandingPacketMetadata {
uint32_t encodedBodySizeIn,
bool isHandshakeIn,
uint64_t totalBytesSentIn,
uint64_t totalBodyBytesSentIn,
uint64_t inflightBytesIn,
uint64_t packetsInflightIn,
const LossState& lossStateIn,
@ -137,7 +133,6 @@ struct OutstandingPacketMetadata {
encodedBodySize(encodedBodySizeIn),
isHandshake(isHandshakeIn),
totalBytesSent(totalBytesSentIn),
totalBodyBytesSent(totalBodyBytesSentIn),
inflightBytes(inflightBytesIn),
packetsInflight(packetsInflightIn),
totalPacketsSent(lossStateIn.totalPacketsSent),
@ -214,7 +209,6 @@ struct OutstandingPacket {
uint32_t encodedBodySizeIn,
bool isHandshakeIn,
uint64_t totalBytesSentIn,
uint64_t totalBodyBytesSentIn,
uint64_t inflightBytesIn,
uint64_t packetsInflightIn,
const LossState& lossStateIn,
@ -228,7 +222,6 @@ struct OutstandingPacket {
encodedBodySizeIn,
isHandshakeIn,
totalBytesSentIn,
totalBodyBytesSentIn,
inflightBytesIn,
packetsInflightIn,
lossStateIn,
@ -252,7 +245,6 @@ struct OutstandingPacketWrapper : OutstandingPacket {
uint32_t encodedBodySizeIn,
bool isHandshakeIn,
uint64_t totalBytesSentIn,
uint64_t totalBodyBytesSentIn,
uint64_t inflightBytesIn,
uint64_t packetsInflightIn,
const LossState& lossStateIn,
@ -268,7 +260,6 @@ struct OutstandingPacketWrapper : OutstandingPacket {
encodedBodySizeIn,
isHandshakeIn,
totalBytesSentIn,
totalBodyBytesSentIn,
inflightBytesIn,
packetsInflightIn,
lossStateIn,

40
quic/state/test/AckHandlersTest.cpp
View File

@ -73,7 +73,6 @@ auto emplacePackets(
0,
false /* handshake */,
packetNum,
0,
packetNum + 1,
packetNum + 1,
quic::LossState(),
@ -196,7 +195,6 @@ TEST_P(AckHandlersTest, TestAckMultipleSequentialBlocks) {
packetNum,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream());
@ -290,7 +288,6 @@ TEST_P(AckHandlersTest, TestSpuriousLossFullRemoval) {
0,
false /* handshake */,
0,
0,
1,
1,
quic::LossState(),
@ -371,7 +368,6 @@ TEST_P(AckHandlersTest, TestSpuriousLossSplitMiddleRemoval) {
0,
false /* handshake */,
0,
0,
1,
1,
quic::LossState(),
@ -458,7 +454,6 @@ TEST_P(AckHandlersTest, TestSpuriousLossTrimFrontRemoval) {
0,
false /* handshake */,
0,
0,
1,
1,
quic::LossState(),
@ -542,7 +537,6 @@ TEST_P(AckHandlersTest, TestSpuriousLossSplitFrontRemoval) {
0,
false /* handshake */,
0,
0,
1,
1,
quic::LossState(),
@ -631,7 +625,6 @@ TEST_P(AckHandlersTest, TestPacketDestructionAcks) {
packetNum,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream(),
@ -715,7 +708,6 @@ TEST_P(AckHandlersTest, TestPacketDestructionSpuriousLoss) {
packetNum,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream(),
@ -780,7 +772,6 @@ TEST_P(AckHandlersTest, TestPacketDestructionSpuriousLoss) {
packetNum,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream(),
@ -854,7 +845,6 @@ TEST_P(AckHandlersTest, TestPacketDestructionBigDeque) {
packetNum,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream(),
@ -960,7 +950,6 @@ TEST_P(AckHandlersTest, TestAckMultipleSequentialBlocksLoss) {
packetNum,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream());
@ -1117,7 +1106,6 @@ TEST_P(AckHandlersTest, TestAckBlocksWithGaps) {
packetNum,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream());
@ -1236,7 +1224,6 @@ TEST_P(AckHandlersTest, TestNonSequentialPacketNumbers) {
packetNum,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream());
@ -1260,7 +1247,6 @@ TEST_P(AckHandlersTest, TestNonSequentialPacketNumbers) {
packetNum,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream());
@ -1358,7 +1344,6 @@ TEST_P(AckHandlersTest, AckVisitorForAckTest) {
0,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream());
@ -1382,7 +1367,6 @@ TEST_P(AckHandlersTest, AckVisitorForAckTest) {
0,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream());
@ -1457,7 +1441,6 @@ TEST_P(AckHandlersTest, NoNewAckedPacket) {
0,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream());
@ -1517,7 +1500,6 @@ TEST_P(AckHandlersTest, AckPacketNumDoesNotExist) {
0,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream());
@ -1536,7 +1518,6 @@ TEST_P(AckHandlersTest, AckPacketNumDoesNotExist) {
0,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream());
@ -1581,7 +1562,6 @@ TEST_P(AckHandlersTest, TestHandshakeCounterUpdate) {
packetNum / 2,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream());
@ -1794,7 +1774,6 @@ TEST_P(AckHandlersTest, NoSkipAckVisitor) {
1,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream());
@ -1860,7 +1839,6 @@ TEST_P(AckHandlersTest, SkipAckVisitor) {
1,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream());
@ -1924,7 +1902,6 @@ TEST_P(AckHandlersTest, MultiplePacketProcessors) {
1 * (packetNum + 1),
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream());
@ -1986,7 +1963,6 @@ TEST_P(AckHandlersTest, NoDoubleProcess) {
1,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream());
@ -2001,7 +1977,6 @@ TEST_P(AckHandlersTest, NoDoubleProcess) {
1,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream());
@ -2068,7 +2043,6 @@ TEST_P(AckHandlersTest, ClonedPacketsCounter) {
1,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream());
@ -2087,7 +2061,6 @@ TEST_P(AckHandlersTest, ClonedPacketsCounter) {
1,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream());
@ -2141,7 +2114,6 @@ TEST_P(AckHandlersTest, UpdateMaxAckDelay) {
1,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream());
@ -2218,7 +2190,6 @@ TEST_P(AckHandlersTest, AckNotOutstandingButLoss) {
1,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream());
@ -2269,7 +2240,6 @@ TEST_P(AckHandlersTest, UpdatePendingAckStates) {
100,
false,
conn.lossState.totalBytesSent + 111,
conn.lossState.totalBodyBytesSent + 100,
0,
0,
LossState(),
@ -2339,7 +2309,6 @@ TEST_P(AckHandlersTest, AckEventCreation) {
0 /* encodedBodySizeIn */,
false /* isHandshakeIn */,
1 * (packetNum + 1) /* totalBytesSentIn */,
0 /* totalBodyBytesSentIn */,
0 /* inflightBytesIn */,
0 /* packetsInflightIn */,
LossState(),
@ -2474,7 +2443,6 @@ TEST_P(AckHandlersTest, AckEventCreationSingleWrite) {
0 /* encodedBodySizeIn */,
false /* isHandshakeIn */,
1 * (packetNum + 1) /* totalBytesSentIn */,
0 /* totalBodyBytesSentIn */,
0 /* inflightBytesIn */,
0 /* packetsInflightIn */,
LossState(),
@ -2607,7 +2575,6 @@ TEST_P(AckHandlersTest, AckEventCreationNoCongestionController) {
0 /* encodedBodySizeIn */,
false /* isHandshakeIn */,
1 * (packetNum + 1) /* totalBytesSentIn */,
0 /* totalBodyBytesSentIn */,
0 /* inflightBytesIn */,
0 /* packetsInflightIn */,
LossState(),
@ -3348,7 +3315,6 @@ TEST_P(AckHandlersTest, AckEventCreationInvalidAckDelay) {
0 /* encodedBodySizeIn */,
false /* isHandshakeIn */,
1 * (packetNum + 1) /* totalBytesSentIn */,
0 /* totalBodyBytesSentIn */,
0 /* inflightBytesIn */,
0 /* packetsInflightIn */,
LossState(),
@ -3456,7 +3422,6 @@ TEST_P(AckHandlersTest, AckEventCreationRttMinusAckDelayIsZero) {
0 /* encodedBodySizeIn */,
false /* isHandshakeIn */,
1 * (packetNum + 1) /* totalBytesSentIn */,
0 /* totalBodyBytesSentIn */,
0 /* inflightBytesIn */,
0 /* packetsInflightIn */,
LossState(),
@ -3571,7 +3536,6 @@ TEST_P(AckHandlersTest, AckEventCreationReorderingLargestPacketAcked) {
0 /* encodedBodySizeIn */,
false /* isHandshakeIn */,
1 * (packetNum + 1) /* totalBytesSentIn */,
0 /* totalBodyBytesSentIn */,
0 /* inflightBytesIn */,
0 /* packetsInflightIn */,
LossState(),
@ -3808,7 +3772,6 @@ TEST_P(AckHandlersTest, AckEventCreationNoMatchingPacketDueToLoss) {
0 /* encodedBodySizeIn */,
false /* isHandshakeIn */,
1 * (packetNum + 1) /* totalBytesSentIn */,
0 /* totalBodyBytesSentIn */,
0 /* inflightBytesIn */,
0 /* packetsInflightIn */,
LossState(),
@ -3953,7 +3916,6 @@ TEST_P(AckHandlersTest, ImplictAckEventCreation) {
0 /* encodedBodySizeIn */,
false /* isHandshakeIn */,
1 * (packetNum + 1) /* totalBytesSentIn */,
0 /* totalBodyBytesSentIn */,
0 /* inflightBytesIn */,
packetNum + 1 /* packetsInflightIn */,
LossState(),
@ -4057,7 +4019,6 @@ TEST_P(AckHandlersTest, ObserverRttSample) {
0,
false /* handshake */,
packetNum,
0,
packetNum + 1,
0,
LossState(),
@ -4342,7 +4303,6 @@ TEST_P(AckHandlersTest, SubMicrosecondRTT) {
0,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream());

8
quic/state/test/OutstandingPacketTest.cpp
View File

@ -52,7 +52,6 @@ TEST(OutstandingPacketTest, BasicPacketDestructionCallback) {
packetNum,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream(),
@ -104,7 +103,6 @@ TEST(OutstandingPacketTest, BasicPacketDestructionDequeDestroy) {
packetNum,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream(),
@ -146,7 +144,6 @@ TEST(OutstandingPacketTest, BasicPacketDestructionNoCallback) {
packetNum,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream(),
@ -184,7 +181,6 @@ TEST(OutstandingPacketTest, PacketMoveConstuctorCallback) {
packetNum,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream(),
@ -229,7 +225,6 @@ TEST(OutstandingPacketTest, PacketMoveAssignCallback) {
packetNum,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream(),
@ -274,7 +269,6 @@ TEST(OutstandingPacketTest, PacketMoveAssignExistingPacketCallback) {
packetNum,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream(),
@ -296,7 +290,6 @@ TEST(OutstandingPacketTest, PacketMoveAssignExistingPacketCallback) {
packetNum + 1,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream(),
@ -351,7 +344,6 @@ TEST(OutstandingPacketTest, DequeMoveAssignPacketDestructionCallback) {
packetNum,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream(),

5
quic/state/test/QuicStateFunctionsTest.cpp
View File

@ -1095,7 +1095,6 @@ TEST_F(QuicStateFunctionsTest, GetOutstandingPackets) {
0,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream());
@ -1108,7 +1107,6 @@ TEST_F(QuicStateFunctionsTest, GetOutstandingPackets) {
0,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream());
@ -1121,7 +1119,6 @@ TEST_F(QuicStateFunctionsTest, GetOutstandingPackets) {
0,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream());
@ -1134,7 +1131,6 @@ TEST_F(QuicStateFunctionsTest, GetOutstandingPackets) {
0,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream());
@ -1147,7 +1143,6 @@ TEST_F(QuicStateFunctionsTest, GetOutstandingPackets) {
0,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream());

3
quic/state/test/StateDataTest.cpp
View File

@ -154,7 +154,6 @@ TEST_F(StateDataTest, SingleLostPacketEvent) {
1234,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream());
@ -180,7 +179,6 @@ TEST_F(StateDataTest, MultipleLostPacketsEvent) {
1234,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream());
@ -200,7 +198,6 @@ TEST_F(StateDataTest, MultipleLostPacketsEvent) {
1357,
0,
0,
0,
LossState(),
0,
OutstandingPacketMetadata::DetailsPerStream());