net/quic/congestion_control/tcp_cubic_sender_packets.cc - Issue 1983183002: Landing Recent QUIC changes until 5/14/2016 02:25:25 UTC

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1983183002: Landing Recent QUIC changes until 5/14/2016 02:25:25 UTC (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: "first try to fix link error for win_clang build" Created 4 years, 7 months 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

« no previous file with comments | « net/quic/congestion_control/tcp_cubic_sender_bytes_test.cc ('k') | net/quic/congestion_control/tcp_cubic_sender_packets_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/quic/congestion_control/tcp_cubic_sender_packets.cc

diff --git a/net/quic/congestion_control/tcp_cubic_sender_packets.cc b/net/quic/congestion_control/tcp_cubic_sender_packets.cc

index 0467963c487f528dd7cc3380b09dcb36eb83a67e..91918b1833364128981defc7e6b42b715daa877f 100644

--- a/net/quic/congestion_control/tcp_cubic_sender_packets.cc

+++ b/net/quic/congestion_control/tcp_cubic_sender_packets.cc

@@ -53,11 +53,13 @@ void TcpCubicSenderPackets::SetCongestionWindowFromBandwidthAndRtt(

bandwidth.ToBytesPerPeriod(rtt) / kDefaultTCPMSS;

if (FLAGS_quic_no_lower_bw_resumption_limit) {

// Limit new CWND to be in the range [1, kMaxCongestionWindow].

- congestion_window_ = max(min_congestion_window_,

- min(new_congestion_window, kMaxCongestionWindow));

+ congestion_window_ =

+ max(min_congestion_window_,

+ min(new_congestion_window, kMaxResumptionCongestionWindow));

} else {

- congestion_window_ = max(min(new_congestion_window, kMaxCongestionWindow),

- kMinCongestionWindowForBandwidthResumption);

+ congestion_window_ =

+ max(min(new_congestion_window, kMaxResumptionCongestionWindow),

+ kMinCongestionWindowForBandwidthResumption);

}