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

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

Issue 1423463003: Rename QuicDataStream to QuicSpdyStream. No behavior change. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@105435080
Patch Set: Created 5 years, 2 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 unified diff | Download patch
« no previous file with comments | « net/quic/quic_spdy_stream.h ('k') | net/quic/quic_spdy_stream_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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_data_stream.h" 5 #include "net/quic/quic_spdy_stream.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "net/quic/quic_spdy_session.h" 8 #include "net/quic/quic_spdy_session.h"
9 #include "net/quic/quic_utils.h" 9 #include "net/quic/quic_utils.h"
10 #include "net/quic/quic_write_blocked_list.h" 10 #include "net/quic/quic_write_blocked_list.h"
11 11
12 using base::StringPiece; 12 using base::StringPiece;
13 using std::min; 13 using std::min;
14 14
15 namespace net { 15 namespace net {
16 16
17 #define ENDPOINT \ 17 #define ENDPOINT \
18 (session()->perspective() == Perspective::IS_SERVER ? "Server: " : "Client:" \ 18 (session()->perspective() == Perspective::IS_SERVER ? "Server: " : "Client:" \
19 " ") 19 " ")
20 20
21 namespace { 21 namespace {
22 22
23 // This is somewhat arbitrary. It's possible, but unlikely, we will either fail 23 // This is somewhat arbitrary. It's possible, but unlikely, we will either fail
24 // to set a priority client-side, or cancel a stream before stripping the 24 // to set a priority client-side, or cancel a stream before stripping the
25 // priority from the wire server-side. In either case, start out with a 25 // priority from the wire server-side. In either case, start out with a
26 // priority in the middle. 26 // priority in the middle.
27 QuicPriority kDefaultPriority = 3; 27 QuicPriority kDefaultPriority = 3;
28 28
29 } // namespace 29 } // namespace
30 30
31 QuicDataStream::QuicDataStream(QuicStreamId id, QuicSpdySession* spdy_session) 31 QuicSpdyStream::QuicSpdyStream(QuicStreamId id, QuicSpdySession* spdy_session)
32 : ReliableQuicStream(id, spdy_session), 32 : ReliableQuicStream(id, spdy_session),
33 spdy_session_(spdy_session), 33 spdy_session_(spdy_session),
34 visitor_(nullptr), 34 visitor_(nullptr),
35 headers_decompressed_(false), 35 headers_decompressed_(false),
36 priority_(kDefaultPriority) { 36 priority_(kDefaultPriority) {
37 DCHECK_NE(kCryptoStreamId, id); 37 DCHECK_NE(kCryptoStreamId, id);
38 // Don't receive any callbacks from the sequencer until headers 38 // Don't receive any callbacks from the sequencer until headers
39 // are complete. 39 // are complete.
40 sequencer()->SetBlockedUntilFlush(); 40 sequencer()->SetBlockedUntilFlush();
41 } 41 }
42 42
43 QuicDataStream::~QuicDataStream() { 43 QuicSpdyStream::~QuicSpdyStream() {}
44 }
45 44
46 size_t QuicDataStream::WriteHeaders( 45 size_t QuicSpdyStream::WriteHeaders(
47 const SpdyHeaderBlock& header_block, 46 const SpdyHeaderBlock& header_block,
48 bool fin, 47 bool fin,
49 QuicAckListenerInterface* ack_notifier_delegate) { 48 QuicAckListenerInterface* ack_notifier_delegate) {
50 size_t bytes_written = spdy_session_->WriteHeaders( 49 size_t bytes_written = spdy_session_->WriteHeaders(
51 id(), header_block, fin, priority_, ack_notifier_delegate); 50 id(), header_block, fin, priority_, ack_notifier_delegate);
52 if (fin) { 51 if (fin) {
53 // TODO(rch): Add test to ensure fin_sent_ is set whenever a fin is sent. 52 // TODO(rch): Add test to ensure fin_sent_ is set whenever a fin is sent.
54 set_fin_sent(true); 53 set_fin_sent(true);
55 CloseWriteSide(); 54 CloseWriteSide();
56 } 55 }
57 return bytes_written; 56 return bytes_written;
58 } 57 }
59 58
60 size_t QuicDataStream::Readv(const struct iovec* iov, size_t iov_len) { 59 size_t QuicSpdyStream::Readv(const struct iovec* iov, size_t iov_len) {
61 DCHECK(FinishedReadingHeaders()); 60 DCHECK(FinishedReadingHeaders());
62 return sequencer()->Readv(iov, iov_len); 61 return sequencer()->Readv(iov, iov_len);
63 } 62 }
64 63
65 int QuicDataStream::GetReadableRegions(iovec* iov, size_t iov_len) const { 64 int QuicSpdyStream::GetReadableRegions(iovec* iov, size_t iov_len) const {
66 DCHECK(FinishedReadingHeaders()); 65 DCHECK(FinishedReadingHeaders());
67 return sequencer()->GetReadableRegions(iov, iov_len); 66 return sequencer()->GetReadableRegions(iov, iov_len);
68 } 67 }
69 68
70 void QuicDataStream::MarkConsumed(size_t num_bytes) { 69 void QuicSpdyStream::MarkConsumed(size_t num_bytes) {
71 DCHECK(FinishedReadingHeaders()); 70 DCHECK(FinishedReadingHeaders());
72 return sequencer()->MarkConsumed(num_bytes); 71 return sequencer()->MarkConsumed(num_bytes);
73 } 72 }
74 73
75 bool QuicDataStream::IsDoneReading() const { 74 bool QuicSpdyStream::IsDoneReading() const {
76 if (!headers_decompressed_ || !decompressed_headers_.empty()) { 75 if (!headers_decompressed_ || !decompressed_headers_.empty()) {
77 return false; 76 return false;
78 } 77 }
79 return sequencer()->IsClosed(); 78 return sequencer()->IsClosed();
80 } 79 }
81 80
82 bool QuicDataStream::HasBytesToRead() const { 81 bool QuicSpdyStream::HasBytesToRead() const {
83 return !decompressed_headers_.empty() || sequencer()->HasBytesToRead(); 82 return !decompressed_headers_.empty() || sequencer()->HasBytesToRead();
84 } 83 }
85 84
86 void QuicDataStream::MarkHeadersConsumed(size_t bytes_consumed) { 85 void QuicSpdyStream::MarkHeadersConsumed(size_t bytes_consumed) {
87 decompressed_headers_.erase(0, bytes_consumed); 86 decompressed_headers_.erase(0, bytes_consumed);
88 if (FinishedReadingHeaders()) { 87 if (FinishedReadingHeaders()) {
89 sequencer()->SetUnblocked(); 88 sequencer()->SetUnblocked();
90 } 89 }
91 } 90 }
92 91
93 void QuicDataStream::set_priority(QuicPriority priority) { 92 void QuicSpdyStream::set_priority(QuicPriority priority) {
94 DCHECK_EQ(0u, stream_bytes_written()); 93 DCHECK_EQ(0u, stream_bytes_written());
95 priority_ = priority; 94 priority_ = priority;
96 } 95 }
97 96
98 QuicPriority QuicDataStream::EffectivePriority() const { 97 QuicPriority QuicSpdyStream::EffectivePriority() const {
99 return priority(); 98 return priority();
100 } 99 }
101 100
102 void QuicDataStream::OnStreamHeaders(StringPiece headers_data) { 101 void QuicSpdyStream::OnStreamHeaders(StringPiece headers_data) {
103 headers_data.AppendToString(&decompressed_headers_); 102 headers_data.AppendToString(&decompressed_headers_);
104 } 103 }
105 104
106 void QuicDataStream::OnStreamHeadersPriority(QuicPriority priority) { 105 void QuicSpdyStream::OnStreamHeadersPriority(QuicPriority priority) {
107 DCHECK_EQ(Perspective::IS_SERVER, session()->connection()->perspective()); 106 DCHECK_EQ(Perspective::IS_SERVER, session()->connection()->perspective());
108 set_priority(priority); 107 set_priority(priority);
109 } 108 }
110 109
111 void QuicDataStream::OnStreamHeadersComplete(bool fin, size_t frame_len) { 110 void QuicSpdyStream::OnStreamHeadersComplete(bool fin, size_t frame_len) {
112 headers_decompressed_ = true; 111 headers_decompressed_ = true;
113 if (fin) { 112 if (fin) {
114 OnStreamFrame(QuicStreamFrame(id(), fin, 0, StringPiece())); 113 OnStreamFrame(QuicStreamFrame(id(), fin, 0, StringPiece()));
115 } 114 }
116 if (FinishedReadingHeaders()) { 115 if (FinishedReadingHeaders()) {
117 sequencer()->SetUnblocked(); 116 sequencer()->SetUnblocked();
118 } 117 }
119 } 118 }
120 119
121 void QuicDataStream::OnClose() { 120 void QuicSpdyStream::OnClose() {
122 ReliableQuicStream::OnClose(); 121 ReliableQuicStream::OnClose();
123 122
124 if (visitor_) { 123 if (visitor_) {
125 Visitor* visitor = visitor_; 124 Visitor* visitor = visitor_;
126 // Calling Visitor::OnClose() may result the destruction of the visitor, 125 // Calling Visitor::OnClose() may result the destruction of the visitor,
127 // so we need to ensure we don't call it again. 126 // so we need to ensure we don't call it again.
128 visitor_ = nullptr; 127 visitor_ = nullptr;
129 visitor->OnClose(this); 128 visitor->OnClose(this);
130 } 129 }
131 } 130 }
132 131
133 bool QuicDataStream::FinishedReadingHeaders() const { 132 bool QuicSpdyStream::FinishedReadingHeaders() const {
134 return headers_decompressed_ && decompressed_headers_.empty(); 133 return headers_decompressed_ && decompressed_headers_.empty();
135 } 134 }
136 135
137 } // namespace net 136 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/quic_spdy_stream.h ('k') | net/quic/quic_spdy_stream_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698