Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(36)

Unified Diff: net/quic/core/congestion_control/tcp_cubic_sender_packets.cc

Issue 2524523002: Remove various 'using std::' statements from QUIC code and use (Closed)
Patch Set: Rebase Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/quic/core/congestion_control/tcp_cubic_sender_packets.cc
diff --git a/net/quic/core/congestion_control/tcp_cubic_sender_packets.cc b/net/quic/core/congestion_control/tcp_cubic_sender_packets.cc
index 2a54db6b19d444f06e0fe0369b17e3122d41ec67..600e3792c85215931377559b7edc8da3cefe7cf9 100644
--- a/net/quic/core/congestion_control/tcp_cubic_sender_packets.cc
+++ b/net/quic/core/congestion_control/tcp_cubic_sender_packets.cc
@@ -14,8 +14,6 @@
#include "net/quic/core/quic_bug_tracker.h"
#include "net/quic/core/quic_flags.h"
-using std::max;
-using std::min;
namespace net {
@@ -63,8 +61,8 @@ void TcpCubicSenderPackets::SetCongestionWindowFromBandwidthAndRtt(
bandwidth.ToBytesPerPeriod(rtt) / kDefaultTCPMSS;
// Limit new CWND to be in the range [1, kMaxCongestionWindow].
congestion_window_ =
- max(min_congestion_window_,
- min(new_congestion_window, kMaxResumptionCongestionWindow));
+ std::max(min_congestion_window_,
+ std::min(new_congestion_window, kMaxResumptionCongestionWindow));
}
void TcpCubicSenderPackets::SetCongestionWindowInPackets(
@@ -101,7 +99,7 @@ void TcpCubicSenderPackets::OnPacketLost(QuicPacketNumber packet_number,
(stats_->slowstart_bytes_lost - lost_bytes) / kDefaultTCPMSS) {
// Reduce congestion window by 1 for every mss of bytes lost.
congestion_window_ =
- max(congestion_window_ - 1, min_slow_start_exit_window_);
+ std::max(congestion_window_ - 1, min_slow_start_exit_window_);
}
slowstart_threshold_ = congestion_window_;
}
@@ -192,9 +190,10 @@ void TcpCubicSenderPackets::MaybeIncreaseCwnd(
<< " slowstart threshold: " << slowstart_threshold_
<< " congestion window count: " << congestion_window_count_;
} else {
- congestion_window_ = min(max_tcp_congestion_window_,
- cubic_.CongestionWindowAfterAck(
- congestion_window_, rtt_stats_->min_rtt()));
+ congestion_window_ =
+ std::min(max_tcp_congestion_window_,
+ cubic_.CongestionWindowAfterAck(congestion_window_,
+ rtt_stats_->min_rtt()));
DVLOG(1) << "Cubic; congestion window: " << congestion_window_
<< " slowstart threshold: " << slowstart_threshold_;
}

Powered by Google App Engine
This is Rietveld 408576698