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

Side by Side Diff: net/quic/quic_unacked_packet_map.cc

Issue 1495243002: Remove EncryptionLevel from QUIC's RetransmittableFrames and add it to TransmissionInfo. No functi… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@108735153
Patch Set: Created 5 years 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
« no previous file with comments | « net/quic/quic_sent_packet_manager_test.cc ('k') | net/quic/quic_unacked_packet_map_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "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_flags.h" 10 #include "net/quic/quic_flags.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 bool set_in_flight) { 43 bool set_in_flight) {
44 QuicPacketNumber packet_number = packet->packet_number; 44 QuicPacketNumber packet_number = packet->packet_number;
45 LOG_IF(DFATAL, largest_sent_packet_ >= packet_number) << packet_number; 45 LOG_IF(DFATAL, largest_sent_packet_ >= packet_number) << packet_number;
46 DCHECK_GE(packet_number, least_unacked_ + unacked_packets_.size()); 46 DCHECK_GE(packet_number, least_unacked_ + unacked_packets_.size());
47 while (least_unacked_ + unacked_packets_.size() < packet_number) { 47 while (least_unacked_ + unacked_packets_.size() < packet_number) {
48 unacked_packets_.push_back(TransmissionInfo()); 48 unacked_packets_.push_back(TransmissionInfo());
49 unacked_packets_.back().is_unackable = true; 49 unacked_packets_.back().is_unackable = true;
50 } 50 }
51 51
52 TransmissionInfo info(packet->retransmittable_frames, 52 TransmissionInfo info(packet->retransmittable_frames,
53 packet->packet_number_length, transmission_type, 53 packet->encryption_level, packet->packet_number_length,
54 sent_time, bytes_sent, packet->is_fec_packet); 54 transmission_type, sent_time, bytes_sent,
55 packet->is_fec_packet);
55 if (old_packet_number > 0) { 56 if (old_packet_number > 0) {
56 TransferRetransmissionInfo(old_packet_number, packet_number, 57 TransferRetransmissionInfo(old_packet_number, packet_number,
57 transmission_type, &info); 58 transmission_type, &info);
58 } 59 }
59 60
60 largest_sent_packet_ = packet_number; 61 largest_sent_packet_ = packet_number;
61 if (set_in_flight) { 62 if (set_in_flight) {
62 bytes_in_flight_ += bytes_sent; 63 bytes_in_flight_ += bytes_sent;
63 info.in_flight = true; 64 info.in_flight = true;
64 } 65 }
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 } 404 }
404 } 405 }
405 return false; 406 return false;
406 } 407 }
407 408
408 QuicPacketNumber QuicUnackedPacketMap::GetLeastUnacked() const { 409 QuicPacketNumber QuicUnackedPacketMap::GetLeastUnacked() const {
409 return least_unacked_; 410 return least_unacked_;
410 } 411 }
411 412
412 } // namespace net 413 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/quic_sent_packet_manager_test.cc ('k') | net/quic/quic_unacked_packet_map_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698