Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(150)

Side by Side Diff: net/quic/congestion_control/tcp_loss_algorithm_test.cc

Issue 302783003: Rename QUIC's TransmissionInfo pending to in_flight and the associated (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <algorithm> 5 #include <algorithm>
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/stl_util.h" 8 #include "base/stl_util.h"
9 #include "net/quic/congestion_control/rtt_stats.h" 9 #include "net/quic/congestion_control/rtt_stats.h"
10 #include "net/quic/congestion_control/tcp_loss_algorithm.h" 10 #include "net/quic/congestion_control/tcp_loss_algorithm.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 MockClock clock_; 49 MockClock clock_;
50 }; 50 };
51 51
52 TEST_F(TcpLossAlgorithmTest, NackRetransmit1Packet) { 52 TEST_F(TcpLossAlgorithmTest, NackRetransmit1Packet) {
53 const size_t kNumSentPackets = 5; 53 const size_t kNumSentPackets = 5;
54 // Transmit 5 packets. 54 // Transmit 5 packets.
55 for (size_t i = 1; i <= kNumSentPackets; ++i) { 55 for (size_t i = 1; i <= kNumSentPackets; ++i) {
56 SendDataPacket(i); 56 SendDataPacket(i);
57 } 57 }
58 // No loss on one ack. 58 // No loss on one ack.
59 unacked_packets_.SetNotPending(2); 59 unacked_packets_.RemoveFromInFlight(2);
60 unacked_packets_.NackPacket(1, 1); 60 unacked_packets_.NackPacket(1, 1);
61 VerifyLosses(2, NULL, 0); 61 VerifyLosses(2, NULL, 0);
62 // No loss on two acks. 62 // No loss on two acks.
63 unacked_packets_.SetNotPending(3); 63 unacked_packets_.RemoveFromInFlight(3);
64 unacked_packets_.NackPacket(1, 2); 64 unacked_packets_.NackPacket(1, 2);
65 VerifyLosses(3, NULL, 0); 65 VerifyLosses(3, NULL, 0);
66 // Loss on three acks. 66 // Loss on three acks.
67 unacked_packets_.SetNotPending(4); 67 unacked_packets_.RemoveFromInFlight(4);
68 unacked_packets_.NackPacket(1, 3); 68 unacked_packets_.NackPacket(1, 3);
69 QuicPacketSequenceNumber lost[] = { 1 }; 69 QuicPacketSequenceNumber lost[] = { 1 };
70 VerifyLosses(4, lost, arraysize(lost)); 70 VerifyLosses(4, lost, arraysize(lost));
71 EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout()); 71 EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout());
72 } 72 }
73 73
74 // A stretch ack is an ack that covers more than 1 packet of previously 74 // A stretch ack is an ack that covers more than 1 packet of previously
75 // unacknowledged data. 75 // unacknowledged data.
76 TEST_F(TcpLossAlgorithmTest, NackRetransmit1PacketWith1StretchAck) { 76 TEST_F(TcpLossAlgorithmTest, NackRetransmit1PacketWith1StretchAck) {
77 const size_t kNumSentPackets = 10; 77 const size_t kNumSentPackets = 10;
78 // Transmit 10 packets. 78 // Transmit 10 packets.
79 for (size_t i = 1; i <= kNumSentPackets; ++i) { 79 for (size_t i = 1; i <= kNumSentPackets; ++i) {
80 SendDataPacket(i); 80 SendDataPacket(i);
81 } 81 }
82 82
83 // Nack the first packet 3 times in a single StretchAck. 83 // Nack the first packet 3 times in a single StretchAck.
84 unacked_packets_.NackPacket(1, 3); 84 unacked_packets_.NackPacket(1, 3);
85 unacked_packets_.SetNotPending(2); 85 unacked_packets_.RemoveFromInFlight(2);
86 unacked_packets_.SetNotPending(3); 86 unacked_packets_.RemoveFromInFlight(3);
87 unacked_packets_.SetNotPending(4); 87 unacked_packets_.RemoveFromInFlight(4);
88 QuicPacketSequenceNumber lost[] = { 1 }; 88 QuicPacketSequenceNumber lost[] = { 1 };
89 VerifyLosses(4, lost, arraysize(lost)); 89 VerifyLosses(4, lost, arraysize(lost));
90 EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout()); 90 EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout());
91 } 91 }
92 92
93 // Ack a packet 3 packets ahead, causing a retransmit. 93 // Ack a packet 3 packets ahead, causing a retransmit.
94 TEST_F(TcpLossAlgorithmTest, NackRetransmit1PacketSingleAck) { 94 TEST_F(TcpLossAlgorithmTest, NackRetransmit1PacketSingleAck) {
95 const size_t kNumSentPackets = 10; 95 const size_t kNumSentPackets = 10;
96 // Transmit 10 packets. 96 // Transmit 10 packets.
97 for (size_t i = 1; i <= kNumSentPackets; ++i) { 97 for (size_t i = 1; i <= kNumSentPackets; ++i) {
98 SendDataPacket(i); 98 SendDataPacket(i);
99 } 99 }
100 100
101 // Nack the first packet 3 times in an AckFrame with three missing packets. 101 // Nack the first packet 3 times in an AckFrame with three missing packets.
102 unacked_packets_.NackPacket(1, 3); 102 unacked_packets_.NackPacket(1, 3);
103 unacked_packets_.NackPacket(2, 2); 103 unacked_packets_.NackPacket(2, 2);
104 unacked_packets_.NackPacket(3, 1); 104 unacked_packets_.NackPacket(3, 1);
105 unacked_packets_.SetNotPending(4); 105 unacked_packets_.RemoveFromInFlight(4);
106 QuicPacketSequenceNumber lost[] = { 1 }; 106 QuicPacketSequenceNumber lost[] = { 1 };
107 VerifyLosses(4, lost, arraysize(lost)); 107 VerifyLosses(4, lost, arraysize(lost));
108 EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout()); 108 EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout());
109 } 109 }
110 110
111 TEST_F(TcpLossAlgorithmTest, EarlyRetransmit1Packet) { 111 TEST_F(TcpLossAlgorithmTest, EarlyRetransmit1Packet) {
112 const size_t kNumSentPackets = 2; 112 const size_t kNumSentPackets = 2;
113 // Transmit 2 packets. 113 // Transmit 2 packets.
114 for (size_t i = 1; i <= kNumSentPackets; ++i) { 114 for (size_t i = 1; i <= kNumSentPackets; ++i) {
115 SendDataPacket(i); 115 SendDataPacket(i);
116 } 116 }
117 // Early retransmit when the final packet gets acked and the first is nacked. 117 // Early retransmit when the final packet gets acked and the first is nacked.
118 unacked_packets_.SetNotPending(2); 118 unacked_packets_.RemoveFromInFlight(2);
119 unacked_packets_.NackPacket(1, 1); 119 unacked_packets_.NackPacket(1, 1);
120 VerifyLosses(2, NULL, 0); 120 VerifyLosses(2, NULL, 0);
121 EXPECT_EQ(clock_.Now().Add(rtt_stats_.SmoothedRtt().Multiply(1.25)), 121 EXPECT_EQ(clock_.Now().Add(rtt_stats_.SmoothedRtt().Multiply(1.25)),
122 loss_algorithm_.GetLossTimeout()); 122 loss_algorithm_.GetLossTimeout());
123 123
124 clock_.AdvanceTime(rtt_stats_.latest_rtt().Multiply(1.25)); 124 clock_.AdvanceTime(rtt_stats_.latest_rtt().Multiply(1.25));
125 QuicPacketSequenceNumber lost[] = { 1 }; 125 QuicPacketSequenceNumber lost[] = { 1 };
126 VerifyLosses(2, lost, arraysize(lost)); 126 VerifyLosses(2, lost, arraysize(lost));
127 EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout()); 127 EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout());
128 } 128 }
129 129
130 TEST_F(TcpLossAlgorithmTest, EarlyRetransmitAllPackets) { 130 TEST_F(TcpLossAlgorithmTest, EarlyRetransmitAllPackets) {
131 const size_t kNumSentPackets = 5; 131 const size_t kNumSentPackets = 5;
132 for (size_t i = 1; i <= kNumSentPackets; ++i) { 132 for (size_t i = 1; i <= kNumSentPackets; ++i) {
133 SendDataPacket(i); 133 SendDataPacket(i);
134 // Advance the time 1/4 RTT between 3 and 4. 134 // Advance the time 1/4 RTT between 3 and 4.
135 if (i == 3) { 135 if (i == 3) {
136 clock_.AdvanceTime(rtt_stats_.SmoothedRtt().Multiply(0.25)); 136 clock_.AdvanceTime(rtt_stats_.SmoothedRtt().Multiply(0.25));
137 } 137 }
138 } 138 }
139 139
140 // Early retransmit when the final packet gets acked and 1.25 RTTs have 140 // Early retransmit when the final packet gets acked and 1.25 RTTs have
141 // elapsed since the packets were sent. 141 // elapsed since the packets were sent.
142 unacked_packets_.SetNotPending(kNumSentPackets); 142 unacked_packets_.RemoveFromInFlight(kNumSentPackets);
143 // This simulates a single ack following multiple missing packets with FACK. 143 // This simulates a single ack following multiple missing packets with FACK.
144 for (size_t i = 1; i < kNumSentPackets; ++i) { 144 for (size_t i = 1; i < kNumSentPackets; ++i) {
145 unacked_packets_.NackPacket(i, kNumSentPackets - i); 145 unacked_packets_.NackPacket(i, kNumSentPackets - i);
146 } 146 }
147 QuicPacketSequenceNumber lost[] = { 1, 2 }; 147 QuicPacketSequenceNumber lost[] = { 1, 2 };
148 VerifyLosses(kNumSentPackets, lost, arraysize(lost)); 148 VerifyLosses(kNumSentPackets, lost, arraysize(lost));
149 // The time has already advanced 1/4 an RTT, so ensure the timeout is set 149 // The time has already advanced 1/4 an RTT, so ensure the timeout is set
150 // 1.25 RTTs after the earliest pending packet(3), not the last(4). 150 // 1.25 RTTs after the earliest pending packet(3), not the last(4).
151 EXPECT_EQ(clock_.Now().Add(rtt_stats_.SmoothedRtt()), 151 EXPECT_EQ(clock_.Now().Add(rtt_stats_.SmoothedRtt()),
152 loss_algorithm_.GetLossTimeout()); 152 loss_algorithm_.GetLossTimeout());
(...skipping 13 matching lines...) Expand all
166 const size_t kNumSentPackets = 2; 166 const size_t kNumSentPackets = 2;
167 // Transmit 2 packets. 167 // Transmit 2 packets.
168 for (size_t i = 1; i <= kNumSentPackets; ++i) { 168 for (size_t i = 1; i <= kNumSentPackets; ++i) {
169 SendDataPacket(i); 169 SendDataPacket(i);
170 } 170 }
171 // Neuter packet 1. 171 // Neuter packet 1.
172 unacked_packets_.RemoveRetransmittability(1); 172 unacked_packets_.RemoveRetransmittability(1);
173 173
174 // Early retransmit when the final packet gets acked and the first is nacked. 174 // Early retransmit when the final packet gets acked and the first is nacked.
175 unacked_packets_.IncreaseLargestObserved(2); 175 unacked_packets_.IncreaseLargestObserved(2);
176 unacked_packets_.SetNotPending(2); 176 unacked_packets_.RemoveFromInFlight(2);
177 unacked_packets_.NackPacket(1, 1); 177 unacked_packets_.NackPacket(1, 1);
178 VerifyLosses(2, NULL, 0); 178 VerifyLosses(2, NULL, 0);
179 EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout()); 179 EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout());
180 } 180 }
181 181
182 } // namespace test 182 } // namespace test
183 } // namespace net 183 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/congestion_control/tcp_loss_algorithm.cc ('k') | net/quic/congestion_control/time_loss_algorithm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698