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

Remove unused fields in OutstandingPacketMetadata [4/n]

Browse Source 
Summary: Neither QUIC nor TransportMonitor uses `totalPacketsSent`

Reviewed By: hanidamlaj

Differential Revision: D55937296

fbshipit-source-id: 1c4de9196adede0e391a92f1ea89a9e5d09b5ca8
This commit is contained in:
Aman Sharma
2024-04-15 17:51:53 -07:00
committed by Facebook GitHub Bot
parent d0270692a7
commit a09c81fc96
3 changed files with 90 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1429,10 +1429,6 @@ TEST_F(QuicTransportFunctionsTest, TestUpdateConnectionWithBytesStats) {
500, 500,
getFirstOutstandingPacket(*conn, PacketNumberSpace::Handshake) getFirstOutstandingPacket(*conn, PacketNumberSpace::Handshake)
->metadata.encodedBodySize); ->metadata.encodedBodySize);
EXPECT_EQ(
20 + 1,
getFirstOutstandingPacket(*conn, PacketNumberSpace::Handshake)
->metadata.totalPacketsSent);
EXPECT_EQ( EXPECT_EQ(
15 + 1, 15 + 1,
getFirstOutstandingPacket(*conn, PacketNumberSpace::Handshake) getFirstOutstandingPacket(*conn, PacketNumberSpace::Handshake)
@@ -1767,12 +1763,10 @@ TEST_F(QuicTransportFunctionsTest, StreamDetailsSingleStream) {
frameOffset, frameOffset + frameLen - 1))))); frameOffset, frameOffset + frameLen - 1)))));
const auto pktMatcher = testing::Field( const auto pktMatcher = testing::Field(
&OutstandingPacketWrapper::metadata, &OutstandingPacketWrapper::metadata,
testing::AllOf( testing::AllOf(testing::Field(
testing::Field( &OutstandingPacketMetadata::detailsPerStream,
&OutstandingPacketMetadata::totalPacketsSent, testing::Eq(1)), testing::UnorderedElementsAre(streamMatcher))));
testing::Field(
&OutstandingPacketMetadata::detailsPerStream,
testing::UnorderedElementsAre(streamMatcher))));
EXPECT_THAT(conn->outstandings.packets, ElementsAre(pktMatcher)); EXPECT_THAT(conn->outstandings.packets, ElementsAre(pktMatcher));
} }
@@ -1810,12 +1804,10 @@ TEST_F(QuicTransportFunctionsTest, StreamDetailsSingleStreamMultipleFrames) {
testing::ElementsAre(Interval<uint64_t>(0, 14))))); testing::ElementsAre(Interval<uint64_t>(0, 14)))));
const auto pktMatcher = testing::Field( const auto pktMatcher = testing::Field(
&OutstandingPacketWrapper::metadata, &OutstandingPacketWrapper::metadata,
testing::AllOf( testing::AllOf(testing::Field(
testing::Field( &OutstandingPacketMetadata::detailsPerStream,
&OutstandingPacketMetadata::totalPacketsSent, testing::Eq(1)), testing::UnorderedElementsAre(streamMatcher))));
testing::Field(
&OutstandingPacketMetadata::detailsPerStream,
testing::UnorderedElementsAre(streamMatcher))));
EXPECT_THAT(conn->outstandings.packets, ElementsAre(pktMatcher)); EXPECT_THAT(conn->outstandings.packets, ElementsAre(pktMatcher));
} }
@@ -1857,12 +1849,10 @@ TEST_F(QuicTransportFunctionsTest, StreamDetailsSingleStreamRetransmit) {
frame1Offset, frame1Offset + frame1Len - 1))))); frame1Offset, frame1Offset + frame1Len - 1)))));
const auto pktMatcher = testing::Field( const auto pktMatcher = testing::Field(
&OutstandingPacketWrapper::metadata, &OutstandingPacketWrapper::metadata,
testing::AllOf( testing::AllOf(testing::Field(
testing::Field( &OutstandingPacketMetadata::detailsPerStream,
&OutstandingPacketMetadata::totalPacketsSent, testing::Eq(1)), testing::UnorderedElementsAre(streamMatcher))));
testing::Field(
&OutstandingPacketMetadata::detailsPerStream,
testing::UnorderedElementsAre(streamMatcher))));
EXPECT_THAT(conn->outstandings.packets, Contains(pktMatcher)); EXPECT_THAT(conn->outstandings.packets, Contains(pktMatcher));
} }
@@ -1896,12 +1886,10 @@ TEST_F(QuicTransportFunctionsTest, StreamDetailsSingleStreamRetransmit) {
frame1Offset, frame1Offset + frame1Len - 1))))); frame1Offset, frame1Offset + frame1Len - 1)))));
const auto pktMatcher = testing::Field( const auto pktMatcher = testing::Field(
&OutstandingPacketWrapper::metadata, &OutstandingPacketWrapper::metadata,
testing::AllOf( testing::AllOf(testing::Field(
testing::Field( &OutstandingPacketMetadata::detailsPerStream,
&OutstandingPacketMetadata::totalPacketsSent, testing::Eq(2)), testing::UnorderedElementsAre(streamMatcher))));
testing::Field(
&OutstandingPacketMetadata::detailsPerStream,
testing::UnorderedElementsAre(streamMatcher))));
EXPECT_THAT(conn->outstandings.packets, Contains(pktMatcher)); EXPECT_THAT(conn->outstandings.packets, Contains(pktMatcher));
} }
@@ -1942,12 +1930,10 @@ TEST_F(QuicTransportFunctionsTest, StreamDetailsSingleStreamRetransmit) {
frame1Offset, frame2Offset + frame2Len - 1))))); frame1Offset, frame2Offset + frame2Len - 1)))));
const auto pktMatcher = testing::Field( const auto pktMatcher = testing::Field(
&OutstandingPacketWrapper::metadata, &OutstandingPacketWrapper::metadata,
testing::AllOf( testing::AllOf(testing::Field(
testing::Field( &OutstandingPacketMetadata::detailsPerStream,
&OutstandingPacketMetadata::totalPacketsSent, testing::Eq(3)), testing::UnorderedElementsAre(streamMatcher))));
testing::Field(
&OutstandingPacketMetadata::detailsPerStream,
testing::UnorderedElementsAre(streamMatcher))));
EXPECT_THAT(conn->outstandings.packets, Contains(pktMatcher)); EXPECT_THAT(conn->outstandings.packets, Contains(pktMatcher));
} }
@@ -1983,12 +1969,10 @@ TEST_F(QuicTransportFunctionsTest, StreamDetailsSingleStreamRetransmit) {
frame1Offset, frame2Offset + frame2Len - 1))))); frame1Offset, frame2Offset + frame2Len - 1)))));
const auto pktMatcher = testing::Field( const auto pktMatcher = testing::Field(
&OutstandingPacketWrapper::metadata, &OutstandingPacketWrapper::metadata,
testing::AllOf( testing::AllOf(testing::Field(
testing::Field( &OutstandingPacketMetadata::detailsPerStream,
&OutstandingPacketMetadata::totalPacketsSent, testing::Eq(4)), testing::UnorderedElementsAre(streamMatcher))));
testing::Field(
&OutstandingPacketMetadata::detailsPerStream,
testing::UnorderedElementsAre(streamMatcher))));
EXPECT_THAT(conn->outstandings.packets, Contains(pktMatcher)); EXPECT_THAT(conn->outstandings.packets, Contains(pktMatcher));
} }
} }
@@ -2050,22 +2034,18 @@ TEST_F(QuicTransportFunctionsTest, StreamDetailsSingleStreamFinWithRetransmit) {
const auto pkt1Matcher = testing::Field( const auto pkt1Matcher = testing::Field(
&OutstandingPacketWrapper::metadata, &OutstandingPacketWrapper::metadata,
testing::AllOf( testing::AllOf(testing::Field(
testing::Field( &OutstandingPacketMetadata::detailsPerStream,
&OutstandingPacketMetadata::totalPacketsSent, testing::Eq(1)), testing::UnorderedElementsAre(
testing::Field( getStreamDetailsMatcher(frame1Offset)))));
&OutstandingPacketMetadata::detailsPerStream,
testing::UnorderedElementsAre(
getStreamDetailsMatcher(frame1Offset)))));
const auto pkt2Matcher = testing::Field( const auto pkt2Matcher = testing::Field(
&OutstandingPacketWrapper::metadata, &OutstandingPacketWrapper::metadata,
testing::AllOf( testing::AllOf(testing::Field(
testing::Field( &OutstandingPacketMetadata::detailsPerStream,
&OutstandingPacketMetadata::totalPacketsSent, testing::Eq(2)), testing::UnorderedElementsAre(
testing::Field( getStreamDetailsMatcher(frame2Offset)))));
&OutstandingPacketMetadata::detailsPerStream,
testing::UnorderedElementsAre(
getStreamDetailsMatcher(frame2Offset)))));
EXPECT_THAT( EXPECT_THAT(
conn->outstandings.packets, ElementsAre(pkt1Matcher, pkt2Matcher)); conn->outstandings.packets, ElementsAre(pkt1Matcher, pkt2Matcher));
} }
@@ -2104,12 +2084,10 @@ TEST_F(QuicTransportFunctionsTest, StreamDetailsSingleStreamFinWithRetransmit) {
const auto pkt3Matcher = testing::Field( const auto pkt3Matcher = testing::Field(
&OutstandingPacketWrapper::metadata, &OutstandingPacketWrapper::metadata,
testing::AllOf( testing::AllOf(testing::Field(
testing::Field( &OutstandingPacketMetadata::detailsPerStream,
&OutstandingPacketMetadata::totalPacketsSent, testing::Eq(3)), testing::UnorderedElementsAre(streamDetailsMatcher))));
testing::Field(
&OutstandingPacketMetadata::detailsPerStream,
testing::UnorderedElementsAre(streamDetailsMatcher))));
EXPECT_THAT(conn->outstandings.packets, Contains(pkt3Matcher)); EXPECT_THAT(conn->outstandings.packets, Contains(pkt3Matcher));
} }
} }
@@ -2188,31 +2166,25 @@ TEST_F(
const auto pkt1Matcher = testing::Field( const auto pkt1Matcher = testing::Field(
&OutstandingPacketWrapper::metadata, &OutstandingPacketWrapper::metadata,
testing::AllOf( testing::AllOf(testing::Field(
testing::Field( &OutstandingPacketMetadata::detailsPerStream,
&OutstandingPacketMetadata::totalPacketsSent, testing::Eq(1)), testing::UnorderedElementsAre(
testing::Field( getStreamDetailsMatcher(frame1Offset)))));
&OutstandingPacketMetadata::detailsPerStream,
testing::UnorderedElementsAre(
getStreamDetailsMatcher(frame1Offset)))));
const auto pkt2Matcher = testing::Field( const auto pkt2Matcher = testing::Field(
&OutstandingPacketWrapper::metadata, &OutstandingPacketWrapper::metadata,
testing::AllOf( testing::AllOf(testing::Field(
testing::Field( &OutstandingPacketMetadata::detailsPerStream,
&OutstandingPacketMetadata::totalPacketsSent, testing::Eq(2)), testing::UnorderedElementsAre(
testing::Field( getStreamDetailsMatcher(frame2Offset)))));
&OutstandingPacketMetadata::detailsPerStream,
testing::UnorderedElementsAre(
getStreamDetailsMatcher(frame2Offset)))));
const auto pkt3Matcher = testing::Field( const auto pkt3Matcher = testing::Field(
&OutstandingPacketWrapper::metadata, &OutstandingPacketWrapper::metadata,
testing::AllOf( testing::AllOf(testing::Field(
testing::Field( &OutstandingPacketMetadata::detailsPerStream,
&OutstandingPacketMetadata::totalPacketsSent, testing::Eq(3)), testing::UnorderedElementsAre(
testing::Field( getStreamDetailsMatcher(frame3Offset)))));
&OutstandingPacketMetadata::detailsPerStream,
testing::UnorderedElementsAre(
getStreamDetailsMatcher(frame3Offset)))));
EXPECT_THAT( EXPECT_THAT(
conn->outstandings.packets, conn->outstandings.packets,
ElementsAre(pkt1Matcher, pkt2Matcher, pkt3Matcher)); ElementsAre(pkt1Matcher, pkt2Matcher, pkt3Matcher));
@@ -2254,12 +2226,10 @@ TEST_F(
const auto pkt4Matcher = testing::Field( const auto pkt4Matcher = testing::Field(
&OutstandingPacketWrapper::metadata, &OutstandingPacketWrapper::metadata,
testing::AllOf( testing::AllOf(testing::Field(
testing::Field( &OutstandingPacketMetadata::detailsPerStream,
&OutstandingPacketMetadata::totalPacketsSent, testing::Eq(4)), testing::UnorderedElementsAre(streamDetailsMatcher))));
testing::Field(
&OutstandingPacketMetadata::detailsPerStream,
testing::UnorderedElementsAre(streamDetailsMatcher))));
EXPECT_THAT(conn->outstandings.packets, Contains(pkt4Matcher)); EXPECT_THAT(conn->outstandings.packets, Contains(pkt4Matcher));
} }
} }
@@ -2340,31 +2310,25 @@ TEST_F(
const auto pkt1Matcher = testing::Field( const auto pkt1Matcher = testing::Field(
&OutstandingPacketWrapper::metadata, &OutstandingPacketWrapper::metadata,
testing::AllOf( testing::AllOf(testing::Field(
testing::Field( &OutstandingPacketMetadata::detailsPerStream,
&OutstandingPacketMetadata::totalPacketsSent, testing::Eq(1)), testing::UnorderedElementsAre(
testing::Field( getStreamDetailsMatcher(frame1Offset)))));
&OutstandingPacketMetadata::detailsPerStream,
testing::UnorderedElementsAre(
getStreamDetailsMatcher(frame1Offset)))));
const auto pkt2Matcher = testing::Field( const auto pkt2Matcher = testing::Field(
&OutstandingPacketWrapper::metadata, &OutstandingPacketWrapper::metadata,
testing::AllOf( testing::AllOf(testing::Field(
testing::Field( &OutstandingPacketMetadata::detailsPerStream,
&OutstandingPacketMetadata::totalPacketsSent, testing::Eq(2)), testing::UnorderedElementsAre(
testing::Field( getStreamDetailsMatcher(frame2Offset)))));
&OutstandingPacketMetadata::detailsPerStream,
testing::UnorderedElementsAre(
getStreamDetailsMatcher(frame2Offset)))));
const auto pkt3Matcher = testing::Field( const auto pkt3Matcher = testing::Field(
&OutstandingPacketWrapper::metadata, &OutstandingPacketWrapper::metadata,
testing::AllOf( testing::AllOf(testing::Field(
testing::Field( &OutstandingPacketMetadata::detailsPerStream,
&OutstandingPacketMetadata::totalPacketsSent, testing::Eq(3)), testing::UnorderedElementsAre(
testing::Field( getStreamDetailsMatcher(frame3Offset)))));
&OutstandingPacketMetadata::detailsPerStream,
testing::UnorderedElementsAre(
getStreamDetailsMatcher(frame3Offset)))));
EXPECT_THAT( EXPECT_THAT(
conn->outstandings.packets, conn->outstandings.packets,
ElementsAre(pkt1Matcher, pkt2Matcher, pkt3Matcher)); ElementsAre(pkt1Matcher, pkt2Matcher, pkt3Matcher));
@@ -2406,12 +2370,10 @@ TEST_F(
const auto pkt4Matcher = testing::Field( const auto pkt4Matcher = testing::Field(
&OutstandingPacketWrapper::metadata, &OutstandingPacketWrapper::metadata,
testing::AllOf( testing::AllOf(testing::Field(
testing::Field( &OutstandingPacketMetadata::detailsPerStream,
&OutstandingPacketMetadata::totalPacketsSent, testing::Eq(4)), testing::UnorderedElementsAre(streamDetailsMatcher))));
testing::Field(
&OutstandingPacketMetadata::detailsPerStream,
testing::UnorderedElementsAre(streamDetailsMatcher))));
EXPECT_THAT(conn->outstandings.packets, Contains(pkt4Matcher)); EXPECT_THAT(conn->outstandings.packets, Contains(pkt4Matcher));
} }
} }
@@ -2508,15 +2470,13 @@ TEST_F(QuicTransportFunctionsTest, StreamDetailsMultipleStreams) {
const auto pktMatcher = testing::Field( const auto pktMatcher = testing::Field(
&OutstandingPacketWrapper::metadata, &OutstandingPacketWrapper::metadata,
testing::AllOf( testing::AllOf(testing::Field(
testing::Field( &OutstandingPacketMetadata::detailsPerStream,
&OutstandingPacketMetadata::totalPacketsSent, testing::Eq(1)), testing::UnorderedElementsAre(
testing::Field( stream1DetailsMatcher,
&OutstandingPacketMetadata::detailsPerStream, stream2DetailsMatcher,
testing::UnorderedElementsAre( stream3DetailsMatcher))));
stream1DetailsMatcher,
stream2DetailsMatcher,
stream3DetailsMatcher))));
EXPECT_THAT(conn->outstandings.packets, ElementsAre(pktMatcher)); EXPECT_THAT(conn->outstandings.packets, ElementsAre(pktMatcher));
} }
@@ -2577,15 +2537,13 @@ TEST_F(QuicTransportFunctionsTest, StreamDetailsMultipleStreams) {
const auto pktMatcher = testing::Field( const auto pktMatcher = testing::Field(
&OutstandingPacketWrapper::metadata, &OutstandingPacketWrapper::metadata,
testing::AllOf( testing::AllOf(testing::Field(
testing::Field( &OutstandingPacketMetadata::detailsPerStream,
&OutstandingPacketMetadata::totalPacketsSent, testing::Eq(2)), testing::UnorderedElementsAre(
testing::Field( stream1DetailsMatcher,
&OutstandingPacketMetadata::detailsPerStream, stream2DetailsMatcher,
testing::UnorderedElementsAre( stream3DetailsMatcher))));
stream1DetailsMatcher,
stream2DetailsMatcher,
stream3DetailsMatcher))));
EXPECT_THAT(conn->outstandings.packets, Contains(pktMatcher)); EXPECT_THAT(conn->outstandings.packets, Contains(pktMatcher));
} }
} }

5
quic/api/test/QuicTypedTransportTest.cpp
View File

@@ -630,7 +630,6 @@ TYPED_TEST(
EXPECT_CALL(*rawPacketProcessor, onPacketSent(_)) EXPECT_CALL(*rawPacketProcessor, onPacketSent(_))
.Times(1) .Times(1)
.WillOnce(Invoke([&](auto& outstandingPacket) { .WillOnce(Invoke([&](auto& outstandingPacket) {
EXPECT_EQ(4, outstandingPacket.metadata.totalPacketsSent);
EXPECT_EQ(3, outstandingPacket.metadata.writeCount); EXPECT_EQ(3, outstandingPacket.metadata.writeCount);
})); }));
@@ -685,11 +684,9 @@ TYPED_TEST(
EXPECT_CALL(*rawPacketProcessor, onPacketSent(_)) EXPECT_CALL(*rawPacketProcessor, onPacketSent(_))
.Times(2) .Times(2)
.WillOnce(Invoke([&](auto& outstandingPacket) { .WillOnce(Invoke([&](auto& outstandingPacket) {
EXPECT_EQ(4, outstandingPacket.metadata.totalPacketsSent);
EXPECT_EQ(3, outstandingPacket.metadata.writeCount); EXPECT_EQ(3, outstandingPacket.metadata.writeCount);
})) }))
.WillOnce(Invoke([&](auto& outstandingPacket) { .WillOnce(Invoke([&](auto& outstandingPacket) {
EXPECT_EQ(5, outstandingPacket.metadata.totalPacketsSent);
EXPECT_EQ(4, outstandingPacket.metadata.writeCount); EXPECT_EQ(4, outstandingPacket.metadata.writeCount);
})); }));
@@ -768,14 +765,12 @@ TYPED_TEST(QuicTypedTransportAfterStartTest, TotalAppLimitedTime) {
EXPECT_CALL(*rawPacketProcessor, onPacketSent(_)) EXPECT_CALL(*rawPacketProcessor, onPacketSent(_))
.Times(2) .Times(2)
.WillOnce(Invoke([&](auto& outstandingPacket) { .WillOnce(Invoke([&](auto& outstandingPacket) {
EXPECT_EQ(4, outstandingPacket.metadata.totalPacketsSent);
EXPECT_EQ(3, outstandingPacket.metadata.writeCount); EXPECT_EQ(3, outstandingPacket.metadata.writeCount);
EXPECT_NE(0us, outstandingPacket.metadata.totalAppLimitedTimeUsecs); EXPECT_NE(0us, outstandingPacket.metadata.totalAppLimitedTimeUsecs);
firstPacketTotalAppLimitedTimeUsecs = firstPacketTotalAppLimitedTimeUsecs =
outstandingPacket.metadata.totalAppLimitedTimeUsecs; outstandingPacket.metadata.totalAppLimitedTimeUsecs;
})) }))
.WillOnce(Invoke([&](auto& outstandingPacket) { .WillOnce(Invoke([&](auto& outstandingPacket) {
EXPECT_EQ(5, outstandingPacket.metadata.totalPacketsSent);
EXPECT_EQ(3, outstandingPacket.metadata.writeCount); EXPECT_EQ(3, outstandingPacket.metadata.writeCount);
EXPECT_EQ( EXPECT_EQ(
firstPacketTotalAppLimitedTimeUsecs, firstPacketTotalAppLimitedTimeUsecs,

3
quic/state/OutstandingPacket.h
View File

@@ -30,8 +30,6 @@ struct OutstandingPacketMetadata {
// Bytes in flight on this connection including this packet itself when this // Bytes in flight on this connection including this packet itself when this
// packet is sent. // packet is sent.
uint64_t inflightBytes; uint64_t inflightBytes;
// Total number of packets sent on this connection.
uint32_t totalPacketsSent{0};
// Total number of ack-eliciting packets sent on this connection. // Total number of ack-eliciting packets sent on this connection.
uint32_t totalAckElicitingPacketsSent{0}; uint32_t totalAckElicitingPacketsSent{0};
// Write Count is the value of the monotonically increasing counter which // Write Count is the value of the monotonically increasing counter which
@@ -127,7 +125,6 @@ struct OutstandingPacketMetadata {
isHandshake(isHandshakeIn), isHandshake(isHandshakeIn),
totalBytesSent(totalBytesSentIn), totalBytesSent(totalBytesSentIn),
inflightBytes(inflightBytesIn), inflightBytes(inflightBytesIn),
totalPacketsSent(lossStateIn.totalPacketsSent),
totalAckElicitingPacketsSent(lossStateIn.totalAckElicitingPacketsSent), totalAckElicitingPacketsSent(lossStateIn.totalAckElicitingPacketsSent),
writeCount(writeCount), writeCount(writeCount),
detailsPerStream(std::move(detailsPerStream)), detailsPerStream(std::move(detailsPerStream)),