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

Unified Diff: net/quic/quic_unacked_packet_map.cc

Issue 960913004: Remove dead method QuicUnackedPacketMap::RestoreInFlight. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@deprecating_FLAG_attach_ack_notifiers_to_packets_86688595
Patch Set: Created 5 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/quic/quic_unacked_packet_map.h ('k') | net/quic/quic_unacked_packet_map_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_unacked_packet_map.cc
diff --git a/net/quic/quic_unacked_packet_map.cc b/net/quic/quic_unacked_packet_map.cc
index 25e2a8afaf3b62561d7f4bad79c3fb63c4ff818a..f45e44234a7eb7bc2f23c4d61fc7e60a4a865d6b 100644
--- a/net/quic/quic_unacked_packet_map.cc
+++ b/net/quic/quic_unacked_packet_map.cc
@@ -201,10 +201,9 @@ void QuicUnackedPacketMap::RemoveRetransmittability(
}
// TODO(ianswett): Consider adding a check to ensure there are retransmittable
// frames associated with this packet.
- for (SequenceNumberList::const_iterator it = all_transmissions->begin();
- it != all_transmissions->end(); ++it) {
+ for (QuicPacketSequenceNumber sequence_number : *all_transmissions) {
TransmissionInfo* transmission_info =
- &unacked_packets_[*it - least_unacked_];
+ &unacked_packets_[sequence_number - least_unacked_];
MaybeRemoveRetransmittableFrames(transmission_info);
transmission_info->all_transmissions = nullptr;
}
@@ -218,10 +217,9 @@ void QuicUnackedPacketMap::RemoveAckability(TransmissionInfo* info) {
if (all_transmissions == nullptr) {
return;
}
- for (SequenceNumberList::const_iterator it = all_transmissions->begin();
- it != all_transmissions->end(); ++it) {
+ for (QuicPacketSequenceNumber sequence_number : *all_transmissions) {
TransmissionInfo* transmission_info =
- &unacked_packets_[*it - least_unacked_];
+ &unacked_packets_[sequence_number - least_unacked_];
transmission_info->all_transmissions = nullptr;
transmission_info->is_unackable = true;
}
@@ -255,14 +253,12 @@ bool QuicUnackedPacketMap::IsPacketUsefulForMeasuringRtt(
}
bool QuicUnackedPacketMap::IsPacketUsefulForCongestionControl(
- QuicPacketSequenceNumber sequence_number,
const TransmissionInfo& info) const {
// Packet contributes to congestion control if it is considered inflight.
return info.in_flight;
}
bool QuicUnackedPacketMap::IsPacketUsefulForRetransmittableData(
- QuicPacketSequenceNumber sequence_number,
const TransmissionInfo& info) const {
// Packet may have retransmittable frames, or the data may have been
// retransmitted with a new sequence number.
@@ -274,8 +270,8 @@ bool QuicUnackedPacketMap::IsPacketUseless(
QuicPacketSequenceNumber sequence_number,
const TransmissionInfo& info) const {
return !IsPacketUsefulForMeasuringRtt(sequence_number, info) &&
- !IsPacketUsefulForCongestionControl(sequence_number, info) &&
- !IsPacketUsefulForRetransmittableData(sequence_number, info);
+ !IsPacketUsefulForCongestionControl(info) &&
+ !IsPacketUsefulForRetransmittableData(info);
}
bool QuicUnackedPacketMap::IsPacketRemovable(
@@ -283,8 +279,8 @@ bool QuicUnackedPacketMap::IsPacketRemovable(
const TransmissionInfo& info) const {
return (!IsPacketUsefulForMeasuringRtt(sequence_number, info) ||
unacked_packets_.size() > kMaxTcpCongestionWindow) &&
- !IsPacketUsefulForCongestionControl(sequence_number, info) &&
- !IsPacketUsefulForRetransmittableData(sequence_number, info);
+ !IsPacketUsefulForCongestionControl(info) &&
+ !IsPacketUsefulForRetransmittableData(info);
}
bool QuicUnackedPacketMap::IsUnacked(
@@ -388,22 +384,8 @@ bool QuicUnackedPacketMap::HasUnackedRetransmittableFrames() const {
return false;
}
-QuicPacketSequenceNumber
-QuicUnackedPacketMap::GetLeastUnacked() const {
+QuicPacketSequenceNumber QuicUnackedPacketMap::GetLeastUnacked() const {
return least_unacked_;
}
-void QuicUnackedPacketMap::RestoreInFlight(
- QuicPacketSequenceNumber sequence_number) {
- DCHECK_GE(sequence_number, least_unacked_);
- DCHECK_LT(sequence_number, least_unacked_ + unacked_packets_.size());
- TransmissionInfo* info = &unacked_packets_[sequence_number - least_unacked_];
- DCHECK(!info->in_flight);
- DCHECK_NE(0u, info->bytes_sent);
- DCHECK(info->sent_time.IsInitialized());
-
- bytes_in_flight_ += info->bytes_sent;
- info->in_flight = true;
-}
-
} // namespace net
« no previous file with comments | « net/quic/quic_unacked_packet_map.h ('k') | net/quic/quic_unacked_packet_map_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698