Remove OnConnectionAddedToTimeWaitList to reduce the complexity of QuicTimeWaitListManager. This method does nothing in production right now. PiperOrigin-RevId: 715453538
diff --git a/quiche/quic/core/quic_dispatcher.cc b/quiche/quic/core/quic_dispatcher.cc index cf9ce47..a29e49b 100644 --- a/quiche/quic/core/quic_dispatcher.cc +++ b/quiche/quic/core/quic_dispatcher.cc
@@ -1037,12 +1037,6 @@ reference_counted_session_map_.erase(server_connection_id); } -void QuicDispatcher::OnConnectionAddedToTimeWaitList( - QuicConnectionId server_connection_id) { - QUIC_DLOG(INFO) << "Connection " << server_connection_id - << " added to time wait list."; -} - void QuicDispatcher::StatelesslyTerminateConnection( const QuicSocketAddress& self_address, const QuicSocketAddress& peer_address,
diff --git a/quiche/quic/core/quic_dispatcher.h b/quiche/quic/core/quic_dispatcher.h index 3214a69..3a38087 100644 --- a/quiche/quic/core/quic_dispatcher.h +++ b/quiche/quic/core/quic_dispatcher.h
@@ -136,12 +136,6 @@ QUICHE_DCHECK(false); } - // QuicTimeWaitListManager::Visitor interface implementation - // Called whenever the time wait list manager adds a new connection to the - // time-wait list. - void OnConnectionAddedToTimeWaitList( - QuicConnectionId server_connection_id) override; - using ReferenceCountedSessionMap = absl::flat_hash_map<QuicConnectionId, std::shared_ptr<QuicSession>, QuicConnectionIdHash>;
diff --git a/quiche/quic/core/quic_time_wait_list_manager.cc b/quiche/quic/core/quic_time_wait_list_manager.cc index 5b31654..f776390 100644 --- a/quiche/quic/core/quic_time_wait_list_manager.cc +++ b/quiche/quic/core/quic_time_wait_list_manager.cc
@@ -135,11 +135,6 @@ int64_t max_connections = GetQuicFlag(quic_time_wait_list_max_connections); QUICHE_DCHECK(connection_id_map_.empty() || num_connections() < static_cast<size_t>(max_connections)); - if (new_connection_id) { - for (const auto& cid : info.active_connection_ids) { - visitor_->OnConnectionAddedToTimeWaitList(cid); - } - } AddConnectionIdDataToMap(canonical_connection_id, num_packets, action, std::move(info)); }
diff --git a/quiche/quic/core/quic_time_wait_list_manager.h b/quiche/quic/core/quic_time_wait_list_manager.h index 377346e..87371ce 100644 --- a/quiche/quic/core/quic_time_wait_list_manager.h +++ b/quiche/quic/core/quic_time_wait_list_manager.h
@@ -82,10 +82,6 @@ class QUICHE_EXPORT Visitor : public QuicSession::Visitor { public: - // Called after the given connection is added to the time-wait list. - virtual void OnConnectionAddedToTimeWaitList( - QuicConnectionId connection_id) = 0; - void OnPathDegrading() override {} };
diff --git a/quiche/quic/core/quic_time_wait_list_manager_test.cc b/quiche/quic/core/quic_time_wait_list_manager_test.cc index 48ef545..2a4b2f8 100644 --- a/quiche/quic/core/quic_time_wait_list_manager_test.cc +++ b/quiche/quic/core/quic_time_wait_list_manager_test.cc
@@ -218,7 +218,6 @@ TEST_F(QuicTimeWaitListManagerTest, CheckConnectionIdInTimeWait) { EXPECT_FALSE(IsConnectionIdInTimeWait(connection_id_)); - EXPECT_CALL(visitor_, OnConnectionAddedToTimeWaitList(connection_id_)); AddConnectionId(connection_id_, QuicTimeWaitListManager::DO_NOTHING); EXPECT_EQ(1u, time_wait_list_manager_.num_connections()); EXPECT_TRUE(IsConnectionIdInTimeWait(connection_id_)); @@ -226,7 +225,6 @@ TEST_F(QuicTimeWaitListManagerTest, CheckStatelessConnectionIdInTimeWait) { EXPECT_FALSE(IsConnectionIdInTimeWait(connection_id_)); - EXPECT_CALL(visitor_, OnConnectionAddedToTimeWaitList(connection_id_)); AddStatelessConnectionId(connection_id_); EXPECT_EQ(1u, time_wait_list_manager_.num_connections()); EXPECT_TRUE(IsConnectionIdInTimeWait(connection_id_)); @@ -300,7 +298,6 @@ TEST_F(QuicTimeWaitListManagerTest, SendConnectionClose) { const size_t kConnectionCloseLength = 100; - EXPECT_CALL(visitor_, OnConnectionAddedToTimeWaitList(connection_id_)); std::vector<std::unique_ptr<QuicEncryptedPacket>> termination_packets; termination_packets.push_back( std::unique_ptr<QuicEncryptedPacket>(new QuicEncryptedPacket( @@ -317,7 +314,6 @@ TEST_F(QuicTimeWaitListManagerTest, SendTwoConnectionCloses) { const size_t kConnectionCloseLength = 100; - EXPECT_CALL(visitor_, OnConnectionAddedToTimeWaitList(connection_id_)); std::vector<std::unique_ptr<QuicEncryptedPacket>> termination_packets; termination_packets.push_back( std::unique_ptr<QuicEncryptedPacket>(new QuicEncryptedPacket( @@ -337,7 +333,6 @@ } TEST_F(QuicTimeWaitListManagerTest, SendPublicReset) { - EXPECT_CALL(visitor_, OnConnectionAddedToTimeWaitList(connection_id_)); AddConnectionId(connection_id_, QuicTimeWaitListManager::SEND_STATELESS_RESET); EXPECT_CALL(writer_, @@ -349,7 +344,6 @@ } TEST_F(QuicTimeWaitListManagerTest, SendPublicResetWithExponentialBackOff) { - EXPECT_CALL(visitor_, OnConnectionAddedToTimeWaitList(connection_id_)); AddConnectionId(connection_id_, QuicTimeWaitListManager::SEND_STATELESS_RESET); EXPECT_EQ(1u, time_wait_list_manager_.num_connections()); @@ -371,7 +365,6 @@ } TEST_F(QuicTimeWaitListManagerTest, NoPublicResetForStatelessConnections) { - EXPECT_CALL(visitor_, OnConnectionAddedToTimeWaitList(connection_id_)); AddStatelessConnectionId(connection_id_); EXPECT_CALL(writer_, @@ -388,7 +381,6 @@ // Add connection_ids such that their expiry time is time_wait_period_. for (uint64_t conn_id = 1; conn_id <= kOldConnectionIdCount; ++conn_id) { QuicConnectionId connection_id = TestConnectionId(conn_id); - EXPECT_CALL(visitor_, OnConnectionAddedToTimeWaitList(connection_id)); AddConnectionId(connection_id, QuicTimeWaitListManager::DO_NOTHING); } EXPECT_EQ(kOldConnectionIdCount, time_wait_list_manager_.num_connections()); @@ -401,7 +393,6 @@ for (uint64_t conn_id = kOldConnectionIdCount + 1; conn_id <= kConnectionIdCount; ++conn_id) { QuicConnectionId connection_id = TestConnectionId(conn_id); - EXPECT_CALL(visitor_, OnConnectionAddedToTimeWaitList(connection_id)); AddConnectionId(connection_id, QuicTimeWaitListManager::DO_NOTHING); } EXPECT_EQ(kConnectionIdCount, time_wait_list_manager_.num_connections()); @@ -430,8 +421,6 @@ CleanUpOldConnectionIdsForMultipleConnectionIdsPerConnection) { connection_id_ = TestConnectionId(7); const size_t kConnectionCloseLength = 100; - EXPECT_CALL(visitor_, OnConnectionAddedToTimeWaitList(connection_id_)); - EXPECT_CALL(visitor_, OnConnectionAddedToTimeWaitList(TestConnectionId(8))); std::vector<std::unique_ptr<QuicEncryptedPacket>> termination_packets; termination_packets.push_back( std::unique_ptr<QuicEncryptedPacket>(new QuicEncryptedPacket( @@ -464,7 +453,6 @@ TEST_F(QuicTimeWaitListManagerTest, SendQueuedPackets) { QuicConnectionId connection_id = TestConnectionId(1); - EXPECT_CALL(visitor_, OnConnectionAddedToTimeWaitList(connection_id)); AddConnectionId(connection_id, QuicTimeWaitListManager::SEND_STATELESS_RESET); std::unique_ptr<QuicEncryptedPacket> packet(ConstructEncryptedPacket( connection_id, EmptyQuicConnectionId(), /*packet_number=*/234)); @@ -489,7 +477,6 @@ // write packet should not be called since we are write blocked but the // should be queued. QuicConnectionId other_connection_id = TestConnectionId(2); - EXPECT_CALL(visitor_, OnConnectionAddedToTimeWaitList(other_connection_id)); AddConnectionId(other_connection_id, QuicTimeWaitListManager::SEND_STATELESS_RESET); std::unique_ptr<QuicEncryptedPacket> other_packet(ConstructEncryptedPacket( @@ -514,7 +501,6 @@ TEST_F(QuicTimeWaitListManagerTest, AddConnectionIdTwice) { // Add connection_ids such that their expiry time is time_wait_period_. - EXPECT_CALL(visitor_, OnConnectionAddedToTimeWaitList(connection_id_)); AddConnectionId(connection_id_, QuicTimeWaitListManager::DO_NOTHING); EXPECT_TRUE(IsConnectionIdInTimeWait(connection_id_)); const size_t kConnectionCloseLength = 100; @@ -557,10 +543,8 @@ // 1 will hash lower than 2, but we add it later. They should come out in the // add order, not hash order. - EXPECT_CALL(visitor_, OnConnectionAddedToTimeWaitList(connection_id1)); AddConnectionId(connection_id1, QuicTimeWaitListManager::DO_NOTHING); clock_.AdvanceTime(QuicTime::Delta::FromMicroseconds(10)); - EXPECT_CALL(visitor_, OnConnectionAddedToTimeWaitList(connection_id2)); AddConnectionId(connection_id2, QuicTimeWaitListManager::DO_NOTHING); EXPECT_EQ(2u, time_wait_list_manager_.num_connections()); @@ -589,8 +573,6 @@ ++current_conn_id; QuicConnectionId current_connection_id = TestConnectionId(current_conn_id); EXPECT_FALSE(IsConnectionIdInTimeWait(current_connection_id)); - EXPECT_CALL(visitor_, - OnConnectionAddedToTimeWaitList(current_connection_id)); AddConnectionId(current_connection_id, QuicTimeWaitListManager::DO_NOTHING); EXPECT_EQ(current_conn_id, time_wait_list_manager_.num_connections()); EXPECT_TRUE(IsConnectionIdInTimeWait(current_connection_id)); @@ -605,8 +587,6 @@ TestConnectionId(current_conn_id - kMaxConnections); EXPECT_TRUE(IsConnectionIdInTimeWait(id_to_evict)); EXPECT_FALSE(IsConnectionIdInTimeWait(current_connection_id)); - EXPECT_CALL(visitor_, - OnConnectionAddedToTimeWaitList(current_connection_id)); AddConnectionId(current_connection_id, QuicTimeWaitListManager::DO_NOTHING); EXPECT_EQ(static_cast<size_t>(kMaxConnections), time_wait_list_manager_.num_connections()); @@ -627,8 +607,6 @@ ++current_conn_id; QuicConnectionId current_connection_id = TestConnectionId(current_conn_id); EXPECT_FALSE(IsConnectionIdInTimeWait(current_connection_id)); - EXPECT_CALL(visitor_, - OnConnectionAddedToTimeWaitList(current_connection_id)); AddConnectionId(current_connection_id, QuicTimeWaitListManager::DO_NOTHING); // Verify time wait list always has 1 connection. EXPECT_EQ(1u, time_wait_list_manager_.num_connections()); @@ -643,7 +621,6 @@ // added as termination packet for an IETF connection ID. However, a short // header packet is received later. const size_t kConnectionCloseLength = 100; - EXPECT_CALL(visitor_, OnConnectionAddedToTimeWaitList(connection_id_)); std::vector<std::unique_ptr<QuicEncryptedPacket>> termination_packets; termination_packets.push_back( std::unique_ptr<QuicEncryptedPacket>(new QuicEncryptedPacket( @@ -668,7 +645,6 @@ TEST_F(QuicTimeWaitListManagerTest, SendConnectionClosePacketsInResponseToShortHeaders) { const size_t kConnectionCloseLength = 100; - EXPECT_CALL(visitor_, OnConnectionAddedToTimeWaitList(connection_id_)); std::vector<std::unique_ptr<QuicEncryptedPacket>> termination_packets; termination_packets.push_back( std::unique_ptr<QuicEncryptedPacket>(new QuicEncryptedPacket( @@ -693,8 +669,6 @@ SendConnectionClosePacketsForMultipleConnectionIds) { connection_id_ = TestConnectionId(7); const size_t kConnectionCloseLength = 100; - EXPECT_CALL(visitor_, OnConnectionAddedToTimeWaitList(connection_id_)); - EXPECT_CALL(visitor_, OnConnectionAddedToTimeWaitList(TestConnectionId(8))); std::vector<std::unique_ptr<QuicEncryptedPacket>> termination_packets; termination_packets.push_back( std::unique_ptr<QuicEncryptedPacket>(new QuicEncryptedPacket(
diff --git a/quiche/quic/test_tools/mock_quic_session_visitor.h b/quiche/quic/test_tools/mock_quic_session_visitor.h index ab230b4..3ef812d 100644 --- a/quiche/quic/test_tools/mock_quic_session_visitor.h +++ b/quiche/quic/test_tools/mock_quic_session_visitor.h
@@ -33,8 +33,6 @@ (override)); MOCK_METHOD(void, OnConnectionIdRetired, (const quic::QuicConnectionId& server_connection_id), (override)); - MOCK_METHOD(void, OnConnectionAddedToTimeWaitList, - (QuicConnectionId connection_id), (override)); MOCK_METHOD(void, OnServerPreferredAddressAvailable, (const QuicSocketAddress& server_preferred_address), (override)); };