Land Recent QUIC Changes.

net/quic/congestion_control/rtt_stats.cc

 // Copyright 2014 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/rtt_stats.h"
 
 #include <complex>  // std::abs
 
 using std::max;
 
@@ skipping 35 matching lines @@
       max(mean_deviation_,
           QuicTime::Delta::FromMicroseconds(
               std::abs(smoothed_rtt_.Subtract(latest_rtt_).ToMicroseconds())));
   smoothed_rtt_ = max(smoothed_rtt_, latest_rtt_);
 }
 
 // Updates the RTT based on a new sample.
 void RttStats::UpdateRtt(QuicTime::Delta send_delta,
                          QuicTime::Delta ack_delay,
                          QuicTime now) {
-  if (send_delta.IsInfinite() || send_delta.IsZero()) {
-    DVLOG(1) << "Ignoring measured send_delta, because it's "
-             << (send_delta.IsZero() ? "Zero" : "Infinite");
+  if (send_delta.IsInfinite() || send_delta <= QuicTime::Delta::Zero()) {
+    LOG(WARNING) << "Ignoring measured send_delta, because it's is "
+                 << "either infinite, zero, or negative.  send_delta = "
+                 << send_delta.ToMicroseconds();
     return;
   }
 
   // Update min_rtt_ first. min_rtt_ does not use an rtt_sample corrected for
   // ack_delay but the raw observed send_delta, since poor clock granularity at
   // the client may cause a high ack_delay to result in underestimation of the
   // min_rtt_.
   if (min_rtt_.IsZero() || min_rtt_ > send_delta) {
     min_rtt_ = send_delta;
   }
@@ skipping 69 matching lines @@
 }
 
 QuicTime::Delta RttStats::MinRtt() const {
   if (!HasUpdates()) {
     return QuicTime::Delta::FromMicroseconds(initial_rtt_us_);
   }
   return min_rtt_;
 }
 
 }  // namespace net