diff options
| author | rtenneti <rtenneti@chromium.org> | 2015-08-27 23:44:57 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-28 06:45:38 +0000 |
| commit | a004d33c10dabb590f276e66ac52ccff43cb2d9f (patch) | |
| tree | f8b7b272ea5f35ecd8382ab581c091f91ee588b4 /net/tools/quic/quic_server_session.cc | |
| parent | 0e3c57b2e9e14ec594015d425cf72cdd64f5df1b (diff) | |
| download | chromium_src-a004d33c10dabb590f276e66ac52ccff43cb2d9f.zip chromium_src-a004d33c10dabb590f276e66ac52ccff43cb2d9f.tar.gz chromium_src-a004d33c10dabb590f276e66ac52ccff43cb2d9f.tar.bz2 | |
Landing Recent QUIC changes until 8/24/2015 18:33 UTC.
relnote: Rename "sequence number" to "packet number" in the QUIC code.
Merge internal change: 101368603
https://codereview.chromium.org/1321603002/
relnote: Fixes a crash bug where when two packets were sent when write
blocked, the second would sometimes succeed and then writes occurred out
of order.
Merge internal change: 101355922
https://codereview.chromium.org/1313373003/
relnote: Update QUIC's fec_alarm with a 1ms granularity to avoid setting
it so often.
Setting this alarm currently consumes over 1% of CPU on bandaid, even
though FEC is disabled for most users.
Merge internal change: 101213426
https://codereview.chromium.org/1322433004/
QUIC - small changes to keep the code similar to internal source.
Internal release not:
Add required header file and fully qualify std::max() and std::min().
These are currently implicitly included through base/scoped_ptr.h, which
is going away.
relnote: n/a (compilation fix in QUIC strike register)
Merge internal change: 101113179
https://codereview.chromium.org/1315253002/
R=rch@chromium.org
Review URL: https://codereview.chromium.org/1317113003
Cr-Commit-Position: refs/heads/master@{#346090}
Diffstat (limited to 'net/tools/quic/quic_server_session.cc')
| -rw-r--r-- | net/tools/quic/quic_server_session.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/net/tools/quic/quic_server_session.cc b/net/tools/quic/quic_server_session.cc index 7fa5804..20790e3 100644 --- a/net/tools/quic/quic_server_session.cc +++ b/net/tools/quic/quic_server_session.cc @@ -26,8 +26,7 @@ QuicServerSession::QuicServerSession( bandwidth_resumption_enabled_(false), bandwidth_estimate_sent_to_client_(QuicBandwidth::Zero()), last_scup_time_(QuicTime::Zero()), - last_scup_sequence_number_(0) { -} + last_scup_packet_number_(0) {} QuicServerSession::~QuicServerSession() {} @@ -113,8 +112,8 @@ void QuicServerSession::OnCongestionWindowChange(QuicTime now) { sent_packet_manager.GetRttStats()->smoothed_rtt().ToMilliseconds(); int64 now_ms = now.Subtract(last_scup_time_).ToMilliseconds(); int64 packets_since_last_scup = - connection()->sequence_number_of_last_sent_packet() - - last_scup_sequence_number_; + connection()->packet_number_of_last_sent_packet() - + last_scup_packet_number_; if (now_ms < (kMinIntervalBetweenServerConfigUpdatesRTTs * srtt_ms) || now_ms < kMinIntervalBetweenServerConfigUpdatesMs || packets_since_last_scup < kMinPacketsBetweenServerConfigUpdates) { @@ -180,8 +179,7 @@ void QuicServerSession::OnCongestionWindowChange(QuicTime now) { connection()->OnSendConnectionState(cached_network_params); last_scup_time_ = now; - last_scup_sequence_number_ = - connection()->sequence_number_of_last_sent_packet(); + last_scup_packet_number_ = connection()->packet_number_of_last_sent_packet(); } bool QuicServerSession::ShouldCreateIncomingDynamicStream(QuicStreamId id) { |