From ca31b43564952ed2130a1e804abfd2398023b574 Mon Sep 17 00:00:00 2001
From: Yang Chi <yangchi@fb.com>
Date: Mon, 20 May 2019 11:17:51 -0700
Subject: [PATCH] rename timeoutBasedRetxCount to timeoutBasedRtxCount

Summary: Just to make it consistent with other var names in quic

Reviewed By: siyengar

Differential Revision: D15415528

fbshipit-source-id: 917159d6ccf86cf34612386d128d6b6d5bf62de6
---
 quic/api/QuicTransportBase.cpp               | 2 +-
 quic/api/QuicTransportFunctions.cpp          | 2 +-
 quic/api/test/QuicTransportFunctionsTest.cpp | 4 ++--
 quic/loss/QuicLossFunctions.h                | 2 +-
 quic/loss/test/QuicLossFunctionsTest.cpp     | 2 +-
 quic/state/StateData.h                       | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/quic/api/QuicTransportBase.cpp b/quic/api/QuicTransportBase.cpp
index 9d6a35286..668b39fbf 100644
--- a/quic/api/QuicTransportBase.cpp
+++ b/quic/api/QuicTransportBase.cpp
@@ -447,7 +447,7 @@ QuicSocket::TransportInfo QuicTransportBase::getTransportInfo() const {
   transportInfo.writableBytes = writableBytes;
   transportInfo.congestionWindow = congestionWindow;
   transportInfo.packetsRetransmitted = conn_->lossState.rtxCount;
-  transportInfo.timeoutBasedLoss = conn_->lossState.timeoutBasedRetxCount;
+  transportInfo.timeoutBasedLoss = conn_->lossState.timeoutBasedRtxCount;
   transportInfo.totalBytesRetransmitted =
       conn_->lossState.totalBytesRetransmitted;
   transportInfo.pto = calculatePTO(*conn_);
diff --git a/quic/api/QuicTransportFunctions.cpp b/quic/api/QuicTransportFunctions.cpp
index c9a78a768..2a3c60740 100644
--- a/quic/api/QuicTransportFunctions.cpp
+++ b/quic/api/QuicTransportFunctions.cpp
@@ -372,7 +372,7 @@ void updateConnection(
   if (pkt.associatedEvent) {
     CHECK_EQ(packetNumberSpace, PacketNumberSpace::AppData);
     ++conn.outstandingClonedPacketsCount;
-    ++conn.lossState.timeoutBasedRetxCount;
+    ++conn.lossState.timeoutBasedRtxCount;
   }
 
   auto packetIt = std::lower_bound(
diff --git a/quic/api/test/QuicTransportFunctionsTest.cpp b/quic/api/test/QuicTransportFunctionsTest.cpp
index cc832cc49..79a35f07f 100644
--- a/quic/api/test/QuicTransportFunctionsTest.cpp
+++ b/quic/api/test/QuicTransportFunctionsTest.cpp
@@ -1548,7 +1548,7 @@ TEST_F(QuicTransportFunctionsTest, TotalBytesSentUpdate) {
 TEST_F(QuicTransportFunctionsTest, TimeoutBasedRetxCountUpdate) {
   auto conn = createConn();
   auto stream = conn->streamManager->createNextBidirectionalStream().value();
-  conn->lossState.timeoutBasedRetxCount = 246;
+  conn->lossState.timeoutBasedRtxCount = 246;
   auto packet = buildEmptyPacket(*conn, PacketNumberSpace::AppData);
   RstStreamFrame rstStreamFrame(
       stream->id, GenericApplicationErrorCode::UNKNOWN, 0);
@@ -1556,7 +1556,7 @@ TEST_F(QuicTransportFunctionsTest, TimeoutBasedRetxCountUpdate) {
   PacketEvent packetEvent = 100;
   conn->outstandingPacketEvents.insert(packetEvent);
   updateConnection(*conn, packetEvent, packet.packet, TimePoint(), 500);
-  EXPECT_EQ(247, conn->lossState.timeoutBasedRetxCount);
+  EXPECT_EQ(247, conn->lossState.timeoutBasedRtxCount);
 }
 
 } // namespace test
diff --git a/quic/loss/QuicLossFunctions.h b/quic/loss/QuicLossFunctions.h
index 7c537f7e7..aa4670c2c 100644
--- a/quic/loss/QuicLossFunctions.h
+++ b/quic/loss/QuicLossFunctions.h
@@ -345,7 +345,7 @@ void onHandshakeAlarm(
       lossVisitor(conn, packet.packet, false, currentPacketNum);
       DCHECK(conn.outstandingHandshakePacketsCount);
       --conn.outstandingHandshakePacketsCount;
-      ++conn.lossState.timeoutBasedRetxCount;
+      ++conn.lossState.timeoutBasedRtxCount;
       ++conn.lossState.rtxCount;
       iter = conn.outstandingPackets.erase(iter);
     } else {
diff --git a/quic/loss/test/QuicLossFunctionsTest.cpp b/quic/loss/test/QuicLossFunctionsTest.cpp
index 8c9172f6b..8a8c565c7 100644
--- a/quic/loss/test/QuicLossFunctionsTest.cpp
+++ b/quic/loss/test/QuicLossFunctionsTest.cpp
@@ -832,7 +832,7 @@ TEST_F(
   // Half are lost
   EXPECT_EQ(5, lostPackets.size());
   EXPECT_EQ(1, conn->lossState.handshakeAlarmCount);
-  EXPECT_EQ(5, conn->lossState.timeoutBasedRetxCount);
+  EXPECT_EQ(5, conn->lossState.timeoutBasedRtxCount);
   EXPECT_EQ(conn->pendingEvents.numProbePackets, 0);
   EXPECT_EQ(5, conn->lossState.rtxCount);
 }
diff --git a/quic/state/StateData.h b/quic/state/StateData.h
index a61e670d1..6445bf4db 100644
--- a/quic/state/StateData.h
+++ b/quic/state/StateData.h
@@ -315,7 +315,7 @@ struct LossState {
   // clones, retransmitted clones, handshake and rejected zero rtt packets.
   uint32_t rtxCount{0};
   // Total number of retransmission due to PTO
-  uint32_t timeoutBasedRetxCount{0};
+  uint32_t timeoutBasedRtxCount{0};
   // Total number of PTO count
   uint32_t totalPTOCount{0};
   // Total number of bytes sent on this connection. This is after encoding.