OLD | NEW |
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 "net/quic/quic_unacked_packet_map.h" | 5 #include "net/quic/quic_unacked_packet_map.h" |
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/quic_connection_stats.h" | 9 #include "net/quic/quic_connection_stats.h" |
10 #include "net/quic/quic_utils_chromium.h" | 10 #include "net/quic/quic_utils_chromium.h" |
(...skipping 20 matching lines...) Expand all Loading... |
31 index == *it->all_transmissions->rbegin()) { | 31 index == *it->all_transmissions->rbegin()) { |
32 delete it->all_transmissions; | 32 delete it->all_transmissions; |
33 } | 33 } |
34 } | 34 } |
35 } | 35 } |
36 | 36 |
37 // TODO(ianswett): Combine this method with OnPacketSent once packets are always | 37 // TODO(ianswett): Combine this method with OnPacketSent once packets are always |
38 // sent in order and the connection tracks RetransmittableFrames for longer. | 38 // sent in order and the connection tracks RetransmittableFrames for longer. |
39 void QuicUnackedPacketMap::AddPacket( | 39 void QuicUnackedPacketMap::AddPacket( |
40 const SerializedPacket& serialized_packet) { | 40 const SerializedPacket& serialized_packet) { |
41 DCHECK_EQ(least_unacked_ + unacked_packets_.size(), | 41 DCHECK_GE(serialized_packet.sequence_number, |
42 serialized_packet.sequence_number); | 42 least_unacked_ + unacked_packets_.size()); |
| 43 while (least_unacked_ + unacked_packets_.size() < |
| 44 serialized_packet.sequence_number) { |
| 45 unacked_packets_.push_back(TransmissionInfo()); |
| 46 unacked_packets_.back().is_unackable = true; |
| 47 } |
43 unacked_packets_.push_back( | 48 unacked_packets_.push_back( |
44 TransmissionInfo(serialized_packet.retransmittable_frames, | 49 TransmissionInfo(serialized_packet.retransmittable_frames, |
45 serialized_packet.sequence_number_length)); | 50 serialized_packet.sequence_number_length)); |
46 if (serialized_packet.retransmittable_frames != NULL && | 51 if (serialized_packet.retransmittable_frames != NULL && |
47 serialized_packet.retransmittable_frames->HasCryptoHandshake() | 52 serialized_packet.retransmittable_frames->HasCryptoHandshake() |
48 == IS_HANDSHAKE) { | 53 == IS_HANDSHAKE) { |
49 ++pending_crypto_packet_count_; | 54 ++pending_crypto_packet_count_; |
50 } | 55 } |
51 } | 56 } |
52 | 57 |
53 void QuicUnackedPacketMap::RemoveObsoletePackets() { | 58 void QuicUnackedPacketMap::RemoveObsoletePackets() { |
54 while (!unacked_packets_.empty()) { | 59 while (!unacked_packets_.empty()) { |
55 if (!IsPacketRemovable(least_unacked_, unacked_packets_.front())) { | 60 if (!IsPacketRemovable(least_unacked_, unacked_packets_.front())) { |
56 break; | 61 break; |
57 } | 62 } |
58 delete unacked_packets_.front().all_transmissions; | 63 delete unacked_packets_.front().all_transmissions; |
59 unacked_packets_.pop_front(); | 64 unacked_packets_.pop_front(); |
60 ++least_unacked_; | 65 ++least_unacked_; |
61 } | 66 } |
62 } | 67 } |
63 | 68 |
64 void QuicUnackedPacketMap::OnRetransmittedPacket( | 69 void QuicUnackedPacketMap::OnRetransmittedPacket( |
65 QuicPacketSequenceNumber old_sequence_number, | 70 QuicPacketSequenceNumber old_sequence_number, |
66 QuicPacketSequenceNumber new_sequence_number, | 71 QuicPacketSequenceNumber new_sequence_number, |
67 TransmissionType transmission_type) { | 72 TransmissionType transmission_type) { |
68 DCHECK_GE(old_sequence_number, least_unacked_); | 73 DCHECK_GE(old_sequence_number, least_unacked_); |
69 DCHECK_LT(old_sequence_number, least_unacked_ + unacked_packets_.size()); | 74 DCHECK_LT(old_sequence_number, least_unacked_ + unacked_packets_.size()); |
70 DCHECK_EQ(least_unacked_ + unacked_packets_.size(), new_sequence_number); | 75 DCHECK_GE(new_sequence_number, least_unacked_ + unacked_packets_.size()); |
| 76 while (least_unacked_ + unacked_packets_.size() < new_sequence_number) { |
| 77 unacked_packets_.push_back(TransmissionInfo()); |
| 78 unacked_packets_.back().is_unackable = true; |
| 79 } |
71 | 80 |
72 // TODO(ianswett): Discard and lose the packet lazily instead of immediately. | 81 // TODO(ianswett): Discard and lose the packet lazily instead of immediately. |
73 TransmissionInfo* transmission_info = | 82 TransmissionInfo* transmission_info = |
74 &unacked_packets_.at(old_sequence_number - least_unacked_); | 83 &unacked_packets_.at(old_sequence_number - least_unacked_); |
75 RetransmittableFrames* frames = transmission_info->retransmittable_frames; | 84 RetransmittableFrames* frames = transmission_info->retransmittable_frames; |
76 LOG_IF(DFATAL, frames == NULL) << "Attempt to retransmit packet with no " | 85 LOG_IF(DFATAL, frames == NULL) << "Attempt to retransmit packet with no " |
77 << "retransmittable frames: " | 86 << "retransmittable frames: " |
78 << old_sequence_number; | 87 << old_sequence_number; |
79 | 88 |
80 // We keep the old packet in the unacked packet list until it, or one of | 89 // We keep the old packet in the unacked packet list until it, or one of |
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
218 | 227 |
219 void QuicUnackedPacketMap::IncreaseLargestObserved( | 228 void QuicUnackedPacketMap::IncreaseLargestObserved( |
220 QuicPacketSequenceNumber largest_observed) { | 229 QuicPacketSequenceNumber largest_observed) { |
221 DCHECK_LE(largest_observed_, largest_observed); | 230 DCHECK_LE(largest_observed_, largest_observed); |
222 largest_observed_ = largest_observed; | 231 largest_observed_ = largest_observed; |
223 } | 232 } |
224 | 233 |
225 bool QuicUnackedPacketMap::IsPacketUseless( | 234 bool QuicUnackedPacketMap::IsPacketUseless( |
226 QuicPacketSequenceNumber sequence_number, | 235 QuicPacketSequenceNumber sequence_number, |
227 const TransmissionInfo& info) const { | 236 const TransmissionInfo& info) const { |
228 return sequence_number <= largest_observed_ && | 237 return (info.is_unackable || sequence_number <= largest_observed_) && |
229 !info.in_flight && | 238 !info.in_flight && |
230 info.retransmittable_frames == NULL && | 239 info.retransmittable_frames == NULL && |
231 info.all_transmissions == NULL; | 240 info.all_transmissions == NULL; |
232 } | 241 } |
233 | 242 |
234 bool QuicUnackedPacketMap::IsPacketRemovable( | 243 bool QuicUnackedPacketMap::IsPacketRemovable( |
235 QuicPacketSequenceNumber sequence_number, | 244 QuicPacketSequenceNumber sequence_number, |
236 const TransmissionInfo& info) const { | 245 const TransmissionInfo& info) const { |
237 return (info.is_unackable || | 246 return (info.is_unackable || |
238 sequence_number <= largest_observed_ || | 247 sequence_number <= largest_observed_ || |
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
374 TransmissionInfo* info = &unacked_packets_[sequence_number - least_unacked_]; | 383 TransmissionInfo* info = &unacked_packets_[sequence_number - least_unacked_]; |
375 DCHECK(!info->in_flight); | 384 DCHECK(!info->in_flight); |
376 DCHECK_NE(0u, info->bytes_sent); | 385 DCHECK_NE(0u, info->bytes_sent); |
377 DCHECK(info->sent_time.IsInitialized()); | 386 DCHECK(info->sent_time.IsInitialized()); |
378 | 387 |
379 bytes_in_flight_ += info->bytes_sent; | 388 bytes_in_flight_ += info->bytes_sent; |
380 info->in_flight = true; | 389 info->in_flight = true; |
381 } | 390 } |
382 | 391 |
383 } // namespace net | 392 } // namespace net |
OLD | NEW |