From 0912ed3c298660856db117486be1e31322c9bdf0 Mon Sep 17 00:00:00 2001
From: Crystal Jin <crystalj@meta.com>
Date: Wed, 23 Oct 2024 14:48:59 -0700
Subject: [PATCH] Clean up alwaysPTOMultiple

Summary: No longer needed

Reviewed By: kvtsoy

Differential Revision: D64730204

fbshipit-source-id: 260e07f82bb8699d7aa94c0e2eaf727828a6d5e8
---
 quic/loss/QuicLossFunctions.cpp          |  7 ------
 quic/loss/test/QuicLossFunctionsTest.cpp | 27 ------------------------
 quic/state/TransportSettings.h           |  2 --
 3 files changed, 36 deletions(-)

diff --git a/quic/loss/QuicLossFunctions.cpp b/quic/loss/QuicLossFunctions.cpp
index 66e75c92a..c77ac5c5e 100644
--- a/quic/loss/QuicLossFunctions.cpp
+++ b/quic/loss/QuicLossFunctions.cpp
@@ -100,13 +100,6 @@ void onPTOAlarm(QuicConnectionStateBase& conn) {
           packetCount[PacketNumberSpace::AppData];
     }
   }
-  if (conn.transportSettings.alwaysPtoMultiple) {
-    for (auto& numProbes : numProbePackets) {
-      if (numProbes > 0) {
-        numProbes = kPacketToSendForPTO;
-      }
-    }
-  }
 }
 
 template <class T, size_t N>
diff --git a/quic/loss/test/QuicLossFunctionsTest.cpp b/quic/loss/test/QuicLossFunctionsTest.cpp
index b16f6b08d..435f16127 100644
--- a/quic/loss/test/QuicLossFunctionsTest.cpp
+++ b/quic/loss/test/QuicLossFunctionsTest.cpp
@@ -1325,33 +1325,6 @@ TEST_F(QuicLossFunctionsTest, PTOAvoidPointless) {
   EXPECT_EQ(conn->pendingEvents.numProbePackets[PacketNumberSpace::AppData], 1);
 }
 
-TEST_F(QuicLossFunctionsTest, PTOAlwaysSendTwo) {
-  // If there is no lost data and the outstanding data is less than the
-  // kPacketToSendForPTO packets, send only the available outstanding count.
-  auto conn = createConn();
-  conn->transportSettings.alwaysPtoMultiple = true;
-
-  conn->initialWriteCipher = createNoOpAead();
-  conn->initialHeaderCipher = createNoOpHeaderCipher();
-
-  conn->handshakeWriteCipher = createNoOpAead();
-  conn->handshakeWriteHeaderCipher = createNoOpHeaderCipher();
-
-  conn->oneRttWriteCipher = createNoOpAead();
-  conn->oneRttWriteHeaderCipher = createNoOpHeaderCipher();
-
-  conn->outstandings.packetCount[PacketNumberSpace::Initial] = 1;
-  conn->outstandings.packetCount[PacketNumberSpace::Handshake] = 1;
-  conn->outstandings.packetCount[PacketNumberSpace::AppData] = 1;
-
-  onPTOAlarm(*conn);
-
-  EXPECT_EQ(conn->pendingEvents.numProbePackets[PacketNumberSpace::Initial], 2);
-  EXPECT_EQ(
-      conn->pendingEvents.numProbePackets[PacketNumberSpace::Handshake], 2);
-  EXPECT_EQ(conn->pendingEvents.numProbePackets[PacketNumberSpace::AppData], 2);
-}
-
 TEST_F(QuicLossFunctionsTest, EmptyOutstandingNoTimeout) {
   auto conn = createConn();
   EXPECT_CALL(timeout, cancelLossTimeout()).Times(1);
diff --git a/quic/state/TransportSettings.h b/quic/state/TransportSettings.h
index c2124d6cd..3dfdb0279 100644
--- a/quic/state/TransportSettings.h
+++ b/quic/state/TransportSettings.h
@@ -410,8 +410,6 @@ struct TransportSettings {
   // receiving and then processing.
   bool networkDataPerSocketRead{false};
   bool cloneAllPacketsWithCryptoFrame{false};
-  // Always send multiple PTOs even if we don't have multiple packets.
-  bool alwaysPtoMultiple{false};
   // Use a reordering threshold heuristic of inflight / 2.
   bool useInflightReorderingThreshold{false};
   // Raise read callbacks for all unidirectional streams first on data