Land Recent QUIC Changes until 03/09/2015.

net/quic/congestion_control/tcp_cubic_bytes_sender.h

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2015 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.
-//
-// TCP cubic send side congestion algorithm, emulates the behavior of
-// TCP cubic.
 
-#ifndef NET_QUIC_CONGESTION_CONTROL_TCP_CUBIC_SENDER_H_
-#define NET_QUIC_CONGESTION_CONTROL_TCP_CUBIC_SENDER_H_
+// TCP cubic send side congestion algorithm, emulates the behavior of TCP cubic.
+
+#ifndef NET_QUIC_CONGESTION_CONTROL_TCP_CUBIC_BYTES_SENDER_H_
+#define NET_QUIC_CONGESTION_CONTROL_TCP_CUBIC_BYTES_SENDER_H_
 
 #include "base/basictypes.h"
-#include "base/compiler_specific.h"
 #include "net/base/net_export.h"
-#include "net/quic/congestion_control/cubic.h"
+#include "net/quic/congestion_control/cubic_bytes.h"
 #include "net/quic/congestion_control/hybrid_slow_start.h"
 #include "net/quic/congestion_control/prr_sender.h"
 #include "net/quic/congestion_control/send_algorithm_interface.h"
-#include "net/quic/crypto/cached_network_parameters.h"
 #include "net/quic/quic_bandwidth.h"
 #include "net/quic/quic_connection_stats.h"
 #include "net/quic/quic_protocol.h"
 #include "net/quic/quic_time.h"
 
 namespace net {
 
 class RttStats;
 
 namespace test {
-class TcpCubicSenderPeer;
+class TcpCubicBytesSenderPeer;
 }  // namespace test
 
-class NET_EXPORT_PRIVATE TcpCubicSender : public SendAlgorithmInterface {
+class NET_EXPORT_PRIVATE TcpCubicBytesSender : public SendAlgorithmInterface {
  public:
-  TcpCubicSender(const QuicClock* clock,
-                 const RttStats* rtt_stats,
-                 bool reno,
-                 QuicPacketCount initial_tcp_congestion_window,
-                 QuicConnectionStats* stats);
-  ~TcpCubicSender() override;
+  TcpCubicBytesSender(const QuicClock* clock,
+                      const RttStats* rtt_stats,
+                      bool reno,
+                      QuicPacketCount initial_tcp_congestion_window,
+                      QuicConnectionStats* stats);
+  ~TcpCubicBytesSender() override;
 
   // Start implementation of SendAlgorithmInterface.
   void SetFromConfig(const QuicConfig& config,
                      Perspective perspective,
                      bool using_pacing) override;
   bool ResumeConnectionState(
       const CachedNetworkParameters& cached_network_params) override;
   void SetNumEmulatedConnections(int num_connections) override;
   void OnCongestionEvent(bool rtt_updated,
                          QuicByteCount bytes_in_flight,
@@ skipping 14 matching lines @@
   bool HasReliableBandwidthEstimate() const override;
   QuicTime::Delta RetransmissionDelay() const override;
   QuicByteCount GetCongestionWindow() const override;
   bool InSlowStart() const override;
   bool InRecovery() const override;
   QuicByteCount GetSlowStartThreshold() const override;
   CongestionControlType GetCongestionControlType() const override;
   // End implementation of SendAlgorithmInterface.
 
  private:
-  friend class test::TcpCubicSenderPeer;
+  friend class test::TcpCubicBytesSenderPeer;
 
   // Compute the TCP Reno beta based on the current number of connections.
   float RenoBeta() const;
 
   // TODO(ianswett): Remove these and migrate to OnCongestionEvent.
   void OnPacketAcked(QuicPacketSequenceNumber acked_sequence_number,
                      QuicByteCount acked_bytes,
                      QuicByteCount bytes_in_flight);
   void OnPacketLost(QuicPacketSequenceNumber largest_loss,
                     QuicByteCount bytes_in_flight);
 
   void MaybeIncreaseCwnd(QuicPacketSequenceNumber acked_sequence_number,
+                         QuicByteCount acked_bytes,
                          QuicByteCount bytes_in_flight);
   bool IsCwndLimited(QuicByteCount bytes_in_flight) const;
 
   HybridSlowStart hybrid_slow_start_;
-  Cubic cubic_;
+  CubicBytes cubic_;
   PrrSender prr_;
   const RttStats* rtt_stats_;
   QuicConnectionStats* stats_;
 
   // If true, Reno congestion control is used instead of Cubic.
   const bool reno_;
 
   // Number of connections to simulate.
   uint32 num_connections_;
 
   // ACK counter for the Reno implementation.
   uint64 num_acked_packets_;
 
   // Track the largest packet that has been sent.
   QuicPacketSequenceNumber largest_sent_sequence_number_;
 
   // Track the largest packet that has been acked.
   QuicPacketSequenceNumber largest_acked_sequence_number_;
 
   // Track the largest sequence number outstanding when a CWND cutback occurs.
   QuicPacketSequenceNumber largest_sent_at_last_cutback_;
 
-  // Congestion window in packets.
-  QuicPacketCount congestion_window_;
+  // Congestion window in bytes.
+  QuicByteCount congestion_window_;
 
-  // Slow start congestion window in packets, aka ssthresh.
-  QuicPacketCount slowstart_threshold_;
+  // Slow start congestion window in bytes, aka ssthresh.
+  QuicByteCount slowstart_threshold_;
 
-  // Whether the last loss event caused us to exit slowstart.
-  // Used for stats collection of slowstart_packets_lost
+  // Whether the last loss event caused us to exit slowstart. Used for stats
+  // collection of slowstart_packets_lost.
   bool last_cutback_exited_slowstart_;
 
   const QuicClock* clock_;
 
-  DISALLOW_COPY_AND_ASSIGN(TcpCubicSender);
+  DISALLOW_COPY_AND_ASSIGN(TcpCubicBytesSender);
 };
 
 }  // namespace net
 
-#endif  // NET_QUIC_CONGESTION_CONTROL_TCP_CUBIC_SENDER_H_
+#endif  // NET_QUIC_CONGESTION_CONTROL_TCP_CUBIC_BYTES_SENDER_H_