Landing Recent QUIC changes until 2016-07-02 02:45 UTC

net/quic/congestion_control/cubic.cc

 // Copyright (c) 2012 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.
 
 #include "net/quic/congestion_control/cubic.h"
 
 #include <stdint.h>
 #include <algorithm>
 #include <cmath>
 
@@ skipping 99 matching lines @@
 }
 
 QuicPacketCount Cubic::CongestionWindowAfterAck(
     QuicPacketCount current_congestion_window,
     QuicTime::Delta delay_min) {
   acked_packets_count_ += 1;  // Packets acked.
   QuicTime current_time = clock_->ApproximateNow();
 
   // Cubic is "independent" of RTT, the update is limited by the time elapsed.
   if (last_congestion_window_ == current_congestion_window &&
-      (current_time.Subtract(last_update_time_) <= MaxCubicTimeInterval())) {
+      (current_time - last_update_time_ <= MaxCubicTimeInterval())) {
     return max(last_target_congestion_window_,
                estimated_tcp_congestion_window_);
   }
   last_congestion_window_ = current_congestion_window;
   last_update_time_ = current_time;
 
   if (!epoch_.IsInitialized()) {
     // First ACK after a loss event.
     epoch_ = current_time;     // Start of epoch.
     acked_packets_count_ = 1;  // Reset count.
     // Reset estimated_tcp_congestion_window_ to be in sync with cubic.
     estimated_tcp_congestion_window_ = current_congestion_window;
     if (last_max_congestion_window_ <= current_congestion_window) {
       time_to_origin_point_ = 0;
       origin_point_congestion_window_ = current_congestion_window;
     } else {
       time_to_origin_point_ = static_cast<uint32_t>(
           cbrt(kCubeFactor *
                (last_max_congestion_window_ - current_congestion_window)));
       origin_point_congestion_window_ = last_max_congestion_window_;
     }
   } else {
     // If sender was app-limited, then freeze congestion window growth during
     // app-limited period. Continue growth now by shifting the epoch-start
     // through the app-limited period.
     if (FLAGS_shift_quic_cubic_epoch_when_app_limited &&
         app_limited_start_time_ != QuicTime::Zero()) {
-      QuicTime::Delta shift = current_time.Subtract(app_limited_start_time_);
+      QuicTime::Delta shift = current_time - app_limited_start_time_;
       DVLOG(1) << "Shifting epoch for quiescence by " << shift.ToMicroseconds();
-      epoch_ = epoch_.Add(shift);
+      epoch_ = epoch_ + shift;
       app_limited_start_time_ = QuicTime::Zero();
     }
   }
 
   // Change the time unit from microseconds to 2^10 fractions per second. Take
   // the round trip time in account. This is done to allow us to use shift as a
   // divide operator.
   int64_t elapsed_time =
-      (current_time.Add(delay_min).Subtract(epoch_).ToMicroseconds() << 10) /
+      ((current_time + delay_min - epoch_).ToMicroseconds() << 10) /
       kNumMicrosPerSecond;
 
   int64_t offset = time_to_origin_point_ - elapsed_time;
   QuicPacketCount delta_congestion_window =
       (kCubeCongestionWindowScale * offset * offset * offset) >> kCubeScale;
 
   QuicPacketCount target_congestion_window =
       origin_point_congestion_window_ - delta_congestion_window;
 
   DCHECK_LT(0u, estimated_tcp_congestion_window_);
@@ skipping 18 matching lines @@
   // congestion_window, use highest (fastest).
   if (target_congestion_window < estimated_tcp_congestion_window_) {
     target_congestion_window = estimated_tcp_congestion_window_;
   }
 
   DVLOG(1) << "Final target congestion_window: " << target_congestion_window;
   return target_congestion_window;
 }
 
 }  // namespace net