summaryrefslogtreecommitdiffstats
path: root/net/quic/quic_stream_sequencer.cc
diff options
context:
space:
mode:
authorrtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-07 22:48:48 +0000
committerrtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-07 22:48:48 +0000
commit77b5d50b63b575049688c9ef1edb4b5141f7235d (patch)
treeff849af6e3d04c94336daed39e83dee93bf76180 /net/quic/quic_stream_sequencer.cc
parent504fca8eaf5f65db2d3766f40be721639a3097f9 (diff)
downloadchromium_src-77b5d50b63b575049688c9ef1edb4b5141f7235d.zip
chromium_src-77b5d50b63b575049688c9ef1edb4b5141f7235d.tar.gz
chromium_src-77b5d50b63b575049688c9ef1edb4b5141f7235d.tar.bz2
Land Recent QUIC Changes.
Removed QUIC_VERSION_19 from kSupportedQuicVersions. Will submit a separate CL after making sure all tests pass with QUIC_VERSION_19. Introduces QUIC_VERSION_19, connection level flow control. QuicConnection now has its own flow_controller_ which aggregates bytes sent/received/consumed from all the streams on a given connection. WINDOW_UPDATE and BLOCKED frames are sent with a stream_id of 0 when they refer to the connection. On receipt of a WINDOW_UPDATE which unblocks the connection level flow control, all blocked streams are given a chance to write through a call to OnCanWrite. QUIC_VERSION_19: connection flow control. Protected behind --FLAGS_enable_quic_connection_flow_control Merge internal change: 66020935 https://codereview.chromium.org/265953003/ New QUIC SendAlgorithmInterface which replaces OnPacketAcked, OnPacketLost, OnPacketAbandoned, and OnRttUpdated with a single OnCongestionEvent method. Merge internal change: 66018835 https://codereview.chromium.org/264743011/ Move TransmissionInfo from QuicUnackedPacketMap to QuicProtocol and add a simple bytes_in_flight accessor. Merge internal change: 65886839 https://codereview.chromium.org/265993003/ If stream N is added to the write blocked list, and later a WINDOW_UPDATE frame arrives for the same stream, then stream N will added for a second time to the write blocked list. This is wrong - a stream should only be on the write blocked list once. The write blocked list is implemented as a deque. This CL adds a parallel set<QuicStreamId> which also keeps track of blocked streams, but allows more efficient membership testing. This is used to ensure no duplicate stream IDs end up in the write blocked list. Don't allow duplicate IDs in QUIC write blocked list. Merge internal change: 65878293 https://codereview.chromium.org/261983003/ Sync'ing changes with internal source tree. Minor formatting changes. Merge internal change: 65851919 https://codereview.chromium.org/265813010/ Test-only change to clean up QuicSentPacketManagerTest in order to make changing the SendAlgorithmInterface easier. Merge internal change: 65816291 https://codereview.chromium.org/268623010/ R=rch@chromium.org Review URL: https://codereview.chromium.org/265833015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268980 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/quic/quic_stream_sequencer.cc')
-rw-r--r--net/quic/quic_stream_sequencer.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/quic/quic_stream_sequencer.cc b/net/quic/quic_stream_sequencer.cc
index 8f59064..61b4f7c 100644
--- a/net/quic/quic_stream_sequencer.cc
+++ b/net/quic/quic_stream_sequencer.cc
@@ -67,7 +67,7 @@ bool QuicStreamSequencer::OnStreamFrame(const QuicStreamFrame& frame) {
data.iovec()[i].iov_len);
}
num_bytes_consumed_ += bytes_consumed;
- stream_->flow_controller()->AddBytesConsumed(bytes_consumed);
+ stream_->AddBytesConsumed(bytes_consumed);
stream_->MaybeSendWindowUpdate();
if (MaybeCloseStream()) {
@@ -95,7 +95,7 @@ bool QuicStreamSequencer::OnStreamFrame(const QuicStreamFrame& frame) {
byte_offset, string(static_cast<char*>(iov.iov_base), iov.iov_len)));
byte_offset += iov.iov_len;
num_bytes_buffered_ += iov.iov_len;
- stream_->flow_controller()->AddBytesBuffered(iov.iov_len);
+ stream_->AddBytesBuffered(iov.iov_len);
}
return true;
}
@@ -247,8 +247,8 @@ void QuicStreamSequencer::RecordBytesConsumed(size_t bytes_consumed) {
num_bytes_consumed_ += bytes_consumed;
num_bytes_buffered_ -= bytes_consumed;
- stream_->flow_controller()->AddBytesConsumed(bytes_consumed);
- stream_->flow_controller()->RemoveBytesBuffered(bytes_consumed);
+ stream_->AddBytesConsumed(bytes_consumed);
+ stream_->RemoveBytesBuffered(bytes_consumed);
stream_->MaybeSendWindowUpdate();
}