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

Side by Side Diff: net/quic/quic_stream_sequencer.cc

Issue 1433793002: Change bufferring data structure for QuicStreamSequencer. Protected by FLAGS_quic_use_stream_sequen… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@106946658
Patch Set: Created 5 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « net/quic/quic_protocol.h ('k') | net/quic/quic_stream_sequencer_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/quic/quic_stream_sequencer.h" 5 #include "net/quic/quic_stream_sequencer.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <utility> 9 #include <utility>
10 10
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "net/quic/quic_clock.h" 12 #include "net/quic/quic_clock.h"
13 #include "net/quic/quic_flags.h" 13 #include "net/quic/quic_flags.h"
14 #include "net/quic/quic_frame_list.h" 14 #include "net/quic/quic_frame_list.h"
15 #include "net/quic/quic_protocol.h"
15 #include "net/quic/reliable_quic_stream.h" 16 #include "net/quic/reliable_quic_stream.h"
17 #include "net/quic/stream_sequencer_buffer.h"
16 18
17 using std::min; 19 using std::min;
18 using std::numeric_limits; 20 using std::numeric_limits;
19 using std::string; 21 using std::string;
20 22
21 namespace net { 23 namespace net {
22 24
23 QuicStreamSequencer::QuicStreamSequencer(ReliableQuicStream* quic_stream, 25 QuicStreamSequencer::QuicStreamSequencer(ReliableQuicStream* quic_stream,
24 const QuicClock* clock) 26 const QuicClock* clock)
25 : stream_(quic_stream), 27 : stream_(quic_stream),
26 buffered_frames_(new QuicFrameList()),
27 close_offset_(numeric_limits<QuicStreamOffset>::max()), 28 close_offset_(numeric_limits<QuicStreamOffset>::max()),
28 blocked_(false), 29 blocked_(false),
29 num_frames_received_(0), 30 num_frames_received_(0),
30 num_duplicate_frames_received_(0), 31 num_duplicate_frames_received_(0),
31 num_early_frames_received_(0), 32 num_early_frames_received_(0),
32 clock_(clock), 33 clock_(clock),
33 ignore_read_data_(false) {} 34 ignore_read_data_(false) {
35 if (FLAGS_quic_use_stream_sequencer_buffer) {
36 DVLOG(1) << "Use StreamSequencerBuffer for stream: " << stream_->id();
37 buffered_frames_.reset(
38 new StreamSequencerBuffer(kStreamReceiveWindowLimit));
39 } else {
40 buffered_frames_.reset(new QuicFrameList());
41 }
42 }
34 43
35 QuicStreamSequencer::~QuicStreamSequencer() {} 44 QuicStreamSequencer::~QuicStreamSequencer() {}
36 45
37 void QuicStreamSequencer::OnStreamFrame(const QuicStreamFrame& frame) { 46 void QuicStreamSequencer::OnStreamFrame(const QuicStreamFrame& frame) {
38 ++num_frames_received_; 47 ++num_frames_received_;
39 const QuicStreamOffset byte_offset = frame.offset; 48 const QuicStreamOffset byte_offset = frame.offset;
40 const size_t data_len = frame.data.length(); 49 const size_t data_len = frame.data.length();
41 if (data_len == 0 && !frame.fin) { 50 if (data_len == 0 && !frame.fin) {
42 // Stream frames must have data or a fin flag. 51 // Stream frames must have data or a fin flag.
43 stream_->CloseConnectionWithDetails(QUIC_INVALID_STREAM_FRAME, 52 stream_->CloseConnectionWithDetails(QUIC_INVALID_STREAM_FRAME,
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 198
190 size_t QuicStreamSequencer::NumBytesBuffered() const { 199 size_t QuicStreamSequencer::NumBytesBuffered() const {
191 return buffered_frames_->BytesBuffered(); 200 return buffered_frames_->BytesBuffered();
192 } 201 }
193 202
194 QuicStreamOffset QuicStreamSequencer::NumBytesConsumed() const { 203 QuicStreamOffset QuicStreamSequencer::NumBytesConsumed() const {
195 return buffered_frames_->BytesConsumed(); 204 return buffered_frames_->BytesConsumed();
196 } 205 }
197 206
198 } // namespace net 207 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/quic_protocol.h ('k') | net/quic/quic_stream_sequencer_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698