Landing Recent QUIC changes until May 20, 2017.

net/quic/core/congestion_control/bandwidth_sampler.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_QUIC_CORE_CONGESTION_CONTROL_BANDWIDTH_SAMPLER_H_
 #define NET_QUIC_CORE_CONGESTION_CONTROL_BANDWIDTH_SAMPLER_H_
 
+#include "net/quic/core/packet_number_indexed_queue.h"
 #include "net/quic/core/quic_bandwidth.h"
 #include "net/quic/core/quic_packets.h"
 #include "net/quic/core/quic_time.h"
 #include "net/quic/platform/api/quic_containers.h"
 #include "net/quic/platform/api/quic_export.h"
 
 namespace net {
 
 namespace test {
 class BandwidthSamplerPeer;
@@ skipping 181 matching lines @@
         : sent_time(sent_time),
           size(size),
           total_bytes_sent(sampler.total_bytes_sent_),
           total_bytes_sent_at_last_acked_packet(
               sampler.total_bytes_sent_at_last_acked_packet_),
           last_acked_packet_sent_time(sampler.last_acked_packet_sent_time_),
           last_acked_packet_ack_time(sampler.last_acked_packet_ack_time_),
           total_bytes_acked_at_the_last_acked_packet(
               sampler.total_bytes_acked_),
           is_app_limited(sampler.is_app_limited_) {}
+
+    // Default constructor.  Required to put this structure into
+    // PacketNumberIndexedQueue.
+    ConnectionStateOnSentPacket()
+        : sent_time(QuicTime::Zero()),
+          last_acked_packet_sent_time(QuicTime::Zero()),
+          last_acked_packet_ack_time(QuicTime::Zero()) {}
   };
 
   typedef QuicLinkedHashMap<QuicPacketNumber, ConnectionStateOnSentPacket>
       ConnectionStateMap;
 
   // The total number of congestion controlled bytes sent during the connection.
   QuicByteCount total_bytes_sent_;
 
   // The total number of congestion controlled bytes which were acknowledged.
   QuicByteCount total_bytes_acked_;
@@ skipping 16 matching lines @@
   // phase.
   bool is_app_limited_;
 
   // The packet that will be acknowledged after this one will cause the sampler
   // to exit the app-limited phase.
   QuicPacketNumber end_of_app_limited_phase_;
 
   // Record of the connection state at the point where each packet in flight was
   // sent, indexed by the packet number.
   ConnectionStateMap connection_state_map_;
+  PacketNumberIndexedQueue<ConnectionStateOnSentPacket>
+      connection_state_map_new_;
+  const bool use_new_connection_state_map_;
+
+  // Handles the actual bandwidth calculations, whereas the outer method handles
+  // retrieving and removing |sent_packet|.
+  BandwidthSample OnPacketAcknowledgedInner(
+      QuicTime ack_time,
+      QuicPacketNumber packet_number,
+      const ConnectionStateOnSentPacket& sent_packet);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_CORE_CONGESTION_CONTROL_BANDWIDTH_SAMPLER_H_