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

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

Issue 242593002: Land Recent QUIC Changes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Build fix. Use uint32 instead of int Created 6 years, 8 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
« no previous file with comments | « net/quic/quic_ack_notifier.h ('k') | net/quic/quic_ack_notifier_manager.h » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_ack_notifier.h" 5 #include "net/quic/quic_ack_notifier.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
(...skipping 28 matching lines...) Expand all
39 39
40 void QuicAckNotifier::AddSequenceNumber( 40 void QuicAckNotifier::AddSequenceNumber(
41 const QuicPacketSequenceNumber& sequence_number, 41 const QuicPacketSequenceNumber& sequence_number,
42 int packet_payload_size) { 42 int packet_payload_size) {
43 sequence_numbers_.insert(make_pair(sequence_number, 43 sequence_numbers_.insert(make_pair(sequence_number,
44 PacketInfo(packet_payload_size))); 44 PacketInfo(packet_payload_size)));
45 ++original_packet_count_; 45 ++original_packet_count_;
46 original_byte_count_ += packet_payload_size; 46 original_byte_count_ += packet_payload_size;
47 } 47 }
48 48
49 bool QuicAckNotifier::OnAck(QuicPacketSequenceNumber sequence_number) { 49 bool QuicAckNotifier::OnAck(QuicPacketSequenceNumber sequence_number,
50 QuicTime::Delta delta_largest_observed) {
50 DCHECK(ContainsKey(sequence_numbers_, sequence_number)); 51 DCHECK(ContainsKey(sequence_numbers_, sequence_number));
51 sequence_numbers_.erase(sequence_number); 52 sequence_numbers_.erase(sequence_number);
52 if (IsEmpty()) { 53 if (IsEmpty()) {
53 // We have seen all the sequence numbers we were waiting for, trigger 54 // We have seen all the sequence numbers we were waiting for, trigger
54 // callback notification. 55 // callback notification.
55 delegate_->OnAckNotification( 56 delegate_->OnAckNotification(
56 original_packet_count_, original_byte_count_, 57 original_packet_count_, original_byte_count_,
57 retransmitted_packet_count_, retransmitted_byte_count_); 58 retransmitted_packet_count_, retransmitted_byte_count_,
59 delta_largest_observed);
58 return true; 60 return true;
59 } 61 }
60 return false; 62 return false;
61 } 63 }
62 64
63 void QuicAckNotifier::UpdateSequenceNumber( 65 void QuicAckNotifier::UpdateSequenceNumber(
64 QuicPacketSequenceNumber old_sequence_number, 66 QuicPacketSequenceNumber old_sequence_number,
65 QuicPacketSequenceNumber new_sequence_number) { 67 QuicPacketSequenceNumber new_sequence_number) {
66 DCHECK(!ContainsKey(sequence_numbers_, new_sequence_number)); 68 DCHECK(!ContainsKey(sequence_numbers_, new_sequence_number));
67 69
68 PacketInfo packet_info; 70 PacketInfo packet_info;
69 hash_map<QuicPacketSequenceNumber, PacketInfo>::iterator it = 71 hash_map<QuicPacketSequenceNumber, PacketInfo>::iterator it =
70 sequence_numbers_.find(old_sequence_number); 72 sequence_numbers_.find(old_sequence_number);
71 if (it != sequence_numbers_.end()) { 73 if (it != sequence_numbers_.end()) {
72 packet_info = it->second; 74 packet_info = it->second;
73 sequence_numbers_.erase(it); 75 sequence_numbers_.erase(it);
74 } else { 76 } else {
75 DLOG(DFATAL) << "Old sequence number not found."; 77 DLOG(DFATAL) << "Old sequence number not found.";
76 } 78 }
77 79
78 ++retransmitted_packet_count_; 80 ++retransmitted_packet_count_;
79 retransmitted_byte_count_ += packet_info.packet_payload_size; 81 retransmitted_byte_count_ += packet_info.packet_payload_size;
80 sequence_numbers_.insert(make_pair(new_sequence_number, packet_info)); 82 sequence_numbers_.insert(make_pair(new_sequence_number, packet_info));
81 } 83 }
82 84
83 }; // namespace net 85 }; // namespace net
OLDNEW
« no previous file with comments | « net/quic/quic_ack_notifier.h ('k') | net/quic/quic_ack_notifier_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698