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

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

Issue 1360063002: Include HTTP header bytes in GetTotalSent/ReceivedBytes for QUIC. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed nits Created 5 years, 3 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_reliable_client_stream.h ('k') | net/quic/quic_reliable_client_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 (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_reliable_client_stream.h" 5 #include "net/quic/quic_reliable_client_stream.h"
6 6
7 #include "base/callback_helpers.h" 7 #include "base/callback_helpers.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/thread_task_runner_handle.h" 9 #include "base/thread_task_runner_handle.h"
10 #include "net/base/io_buffer.h" 10 #include "net/base/io_buffer.h"
(...skipping 15 matching lines...) Expand all
26 26
27 QuicReliableClientStream::~QuicReliableClientStream() { 27 QuicReliableClientStream::~QuicReliableClientStream() {
28 if (delegate_) 28 if (delegate_)
29 delegate_->OnClose(connection_error()); 29 delegate_->OnClose(connection_error());
30 } 30 }
31 31
32 void QuicReliableClientStream::OnStreamHeadersComplete(bool fin, 32 void QuicReliableClientStream::OnStreamHeadersComplete(bool fin,
33 size_t frame_len) { 33 size_t frame_len) {
34 QuicDataStream::OnStreamHeadersComplete(fin, frame_len); 34 QuicDataStream::OnStreamHeadersComplete(fin, frame_len);
35 // The delegate will read the headers via a posted task. 35 // The delegate will read the headers via a posted task.
36 NotifyDelegateOfHeadersCompleteLater(); 36 NotifyDelegateOfHeadersCompleteLater(frame_len);
37 } 37 }
38 38
39 void QuicReliableClientStream::OnDataAvailable() { 39 void QuicReliableClientStream::OnDataAvailable() {
40 // TODO(rch): buffer data if we don't have a delegate. 40 // TODO(rch): buffer data if we don't have a delegate.
41 if (!delegate_) { 41 if (!delegate_) {
42 DLOG(ERROR) << "Missing delegate"; 42 DLOG(ERROR) << "Missing delegate";
43 Reset(QUIC_STREAM_CANCELLED); 43 Reset(QUIC_STREAM_CANCELLED);
44 return; 44 return;
45 } 45 }
46 46
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 bool QuicReliableClientStream::CanWrite(const CompletionCallback& callback) { 126 bool QuicReliableClientStream::CanWrite(const CompletionCallback& callback) {
127 bool can_write = session()->connection()->CanWrite(HAS_RETRANSMITTABLE_DATA); 127 bool can_write = session()->connection()->CanWrite(HAS_RETRANSMITTABLE_DATA);
128 if (!can_write) { 128 if (!can_write) {
129 session()->MarkConnectionLevelWriteBlocked(id(), EffectivePriority()); 129 session()->MarkConnectionLevelWriteBlocked(id(), EffectivePriority());
130 DCHECK(callback_.is_null()); 130 DCHECK(callback_.is_null());
131 callback_ = callback; 131 callback_ = callback;
132 } 132 }
133 return can_write; 133 return can_write;
134 } 134 }
135 135
136 void QuicReliableClientStream::NotifyDelegateOfHeadersCompleteLater() { 136 void QuicReliableClientStream::NotifyDelegateOfHeadersCompleteLater(
137 size_t frame_len) {
137 DCHECK(delegate_); 138 DCHECK(delegate_);
138 base::ThreadTaskRunnerHandle::Get()->PostTask( 139 base::ThreadTaskRunnerHandle::Get()->PostTask(
139 FROM_HERE, 140 FROM_HERE,
140 base::Bind(&QuicReliableClientStream::NotifyDelegateOfHeadersComplete, 141 base::Bind(&QuicReliableClientStream::NotifyDelegateOfHeadersComplete,
141 weak_factory_.GetWeakPtr())); 142 weak_factory_.GetWeakPtr(), frame_len));
142 } 143 }
143 144
144 void QuicReliableClientStream::NotifyDelegateOfHeadersComplete() { 145 void QuicReliableClientStream::NotifyDelegateOfHeadersComplete(
146 size_t frame_len) {
145 if (!delegate_) 147 if (!delegate_)
146 return; 148 return;
147 149
148 size_t headers_len = decompressed_headers().length(); 150 size_t headers_len = decompressed_headers().length();
149 SpdyHeaderBlock headers; 151 SpdyHeaderBlock headers;
150 SpdyFramer framer(SpdyUtils::GetSpdyVersionForQuicVersion(version())); 152 SpdyFramer framer(SpdyUtils::GetSpdyVersionForQuicVersion(version()));
151 size_t len = framer.ParseHeaderBlockInBuffer(decompressed_headers().data(), 153 size_t len = framer.ParseHeaderBlockInBuffer(decompressed_headers().data(),
152 headers_len, &headers); 154 headers_len, &headers);
153 MarkHeadersConsumed(headers_len); 155 MarkHeadersConsumed(headers_len);
154 headers_delivered_ = true; 156 headers_delivered_ = true;
155 if (len == 0 || len != headers_len) { 157 if (len == 0 || len != headers_len) {
156 DLOG(WARNING) << "Invalid headers"; 158 DLOG(WARNING) << "Invalid headers";
157 Reset(QUIC_BAD_APPLICATION_PAYLOAD); 159 Reset(QUIC_BAD_APPLICATION_PAYLOAD);
158 return; 160 return;
159 } 161 }
160 162
161 delegate_->OnHeadersAvailable(headers); 163 delegate_->OnHeadersAvailable(headers, frame_len);
162 } 164 }
163 165
164 void QuicReliableClientStream::NotifyDelegateOfDataAvailableLater() { 166 void QuicReliableClientStream::NotifyDelegateOfDataAvailableLater() {
165 DCHECK(delegate_); 167 DCHECK(delegate_);
166 base::ThreadTaskRunnerHandle::Get()->PostTask( 168 base::ThreadTaskRunnerHandle::Get()->PostTask(
167 FROM_HERE, 169 FROM_HERE,
168 base::Bind(&QuicReliableClientStream::NotifyDelegateOfDataAvailable, 170 base::Bind(&QuicReliableClientStream::NotifyDelegateOfDataAvailable,
169 weak_factory_.GetWeakPtr())); 171 weak_factory_.GetWeakPtr()));
170 } 172 }
171 173
172 void QuicReliableClientStream::NotifyDelegateOfDataAvailable() { 174 void QuicReliableClientStream::NotifyDelegateOfDataAvailable() {
173 if (delegate_) 175 if (delegate_)
174 delegate_->OnDataAvailable(); 176 delegate_->OnDataAvailable();
175 } 177 }
176 178
177 } // namespace net 179 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/quic_reliable_client_stream.h ('k') | net/quic/quic_reliable_client_stream_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698