Switch to standard integer types in net/.

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>
 
-#include "base/basictypes.h"
 #include "base/logging.h"
 #include "net/quic/quic_flags.h"
 #include "net/quic/quic_protocol.h"
 #include "net/quic/quic_time.h"
 
 using std::max;
 
 namespace net {
 
 namespace {
 
 // Constants based on TCP defaults.
 // The following constants are in 2^10 fractions of a second instead of ms to
 // allow a 10 shift right to divide.
 const int kCubeScale = 40;  // 1024*1024^3 (first 1024 is from 0.100^3)
                             // where 0.100 is 100 ms which is the scaling
                             // round trip time.
 const int kCubeCongestionWindowScale = 410;
-const uint64 kCubeFactor =
+const uint64_t kCubeFactor =
     (UINT64_C(1) << kCubeScale) / kCubeCongestionWindowScale;
 
-const uint32 kDefaultNumConnections = 2;
+const uint32_t kDefaultNumConnections = 2;
 const float kBeta = 0.7f;  // Default Cubic backoff factor.
 // Additional backoff factor when loss occurs in the concave part of the Cubic
 // curve. This additional backoff factor is expected to give up bandwidth to
 // new concurrent flows and speed up convergence.
 const float kBetaLastMax = 0.85f;
 
 }  // namespace
 
 Cubic::Cubic(const QuicClock* clock)
     : clock_(clock),
@@ skipping 85 matching lines @@
   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>(cbrt(kCubeFactor * (last_max_congestion_window_ -
-                                                  current_congestion_window)));
+      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_);
       DVLOG(1) << "Shifting epoch for quiescence by " << shift.ToMicroseconds();
       epoch_ = epoch_.Add(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 elapsed_time =
+  int64_t elapsed_time =
       (current_time.Add(delay_min).Subtract(epoch_).ToMicroseconds() << 10) /
       kNumMicrosPerSecond;
 
-  int64 offset = time_to_origin_point_ - elapsed_time;
+  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_);
   // With dynamic beta/alpha based on number of active streams, it is possible
   // for the required_ack_count to become much lower than acked_packets_count_
   // suddenly, leading to more than one iteration through the following loop.
@@ skipping 15 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