Land Recent QUIC Changes

net/quic/quic_ack_notifier.cc

Index: net/quic/quic_ack_notifier.cc
diff --git a/net/quic/quic_ack_notifier.cc b/net/quic/quic_ack_notifier.cc
index 3301baf440dfe9532549b061b1f0cbb4336ba96f..be9881d479de6f9def9abe6d8c14ed89b0535a94 100644
--- a/net/quic/quic_ack_notifier.cc
+++ b/net/quic/quic_ack_notifier.cc
@@ -9,14 +9,28 @@
 #include "base/logging.h"
 #include "base/stl_util.h"
 
+using base::hash_map;
+using std::make_pair;
+
 namespace net {
 
+QuicAckNotifier::PacketInfo::PacketInfo() : packet_payload_size(0) {
+}
+
+QuicAckNotifier::PacketInfo::PacketInfo(int payload_size)
+    : packet_payload_size(payload_size) {
+}
+
 QuicAckNotifier::DelegateInterface::DelegateInterface() {}
 
 QuicAckNotifier::DelegateInterface::~DelegateInterface() {}
 
 QuicAckNotifier::QuicAckNotifier(DelegateInterface* delegate)
-    : delegate_(delegate) {
+    : delegate_(delegate),
+      original_packet_count_(0),
+      original_byte_count_(0),
+      retransmitted_packet_count_(0),
+      retransmitted_byte_count_(0) {
   DCHECK(delegate);
 }
 
@@ -24,16 +38,12 @@ QuicAckNotifier::~QuicAckNotifier() {
 }
 
 void QuicAckNotifier::AddSequenceNumber(
-    const QuicPacketSequenceNumber& sequence_number) {
-  sequence_numbers_.insert(sequence_number);
-}
-
-void QuicAckNotifier::AddSequenceNumbers(
-    const SequenceNumberSet& sequence_numbers) {
-  for (SequenceNumberSet::const_iterator it = sequence_numbers.begin();
-       it != sequence_numbers.end(); ++it) {
-    AddSequenceNumber(*it);
-  }
+    const QuicPacketSequenceNumber& sequence_number,
+    int packet_payload_size) {
+  sequence_numbers_.insert(make_pair(sequence_number,
+                                     PacketInfo(packet_payload_size)));
+  ++original_packet_count_;
+  original_byte_count_ += packet_payload_size;
 }
 
 bool QuicAckNotifier::OnAck(QuicPacketSequenceNumber sequence_number) {
@@ -42,7 +52,9 @@ bool QuicAckNotifier::OnAck(QuicPacketSequenceNumber sequence_number) {
   if (IsEmpty()) {
     // We have seen all the sequence numbers we were waiting for, trigger
     // callback notification.
-    delegate_->OnAckNotification();
+    delegate_->OnAckNotification(
+        original_packet_count_, original_byte_count_,
+        retransmitted_packet_count_, retransmitted_byte_count_);
     return true;
   }
   return false;
@@ -51,8 +63,21 @@ bool QuicAckNotifier::OnAck(QuicPacketSequenceNumber sequence_number) {
 void QuicAckNotifier::UpdateSequenceNumber(
     QuicPacketSequenceNumber old_sequence_number,
     QuicPacketSequenceNumber new_sequence_number) {
-  sequence_numbers_.erase(old_sequence_number);
-  sequence_numbers_.insert(new_sequence_number);
+  DCHECK(!ContainsKey(sequence_numbers_, new_sequence_number));
+
+  PacketInfo packet_info;
+  hash_map<QuicPacketSequenceNumber, PacketInfo>::iterator it =
+      sequence_numbers_.find(old_sequence_number);
+  if (it != sequence_numbers_.end()) {
+    packet_info = it->second;
+    sequence_numbers_.erase(it);
+  } else {
+    DLOG(DFATAL) << "Old sequence number not found.";
+  }
+
+  ++retransmitted_packet_count_;
+  retransmitted_byte_count_ += packet_info.packet_payload_size;
+  sequence_numbers_.insert(make_pair(new_sequence_number, packet_info));
 }
 
 };  // namespace net