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

Side by Side Diff: net/http/http_basic_stream.cc

Issue 7251004: Deciding best connection to schedule requests on based on cwnd and idle time (Reopened after revert) (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Syncing to head Created 9 years, 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/http/http_basic_stream.h" 5 #include "net/http/http_basic_stream.h"
6 6
7 #include "base/format_macros.h"
8 #include "base/metrics/histogram.h"
7 #include "base/stringprintf.h" 9 #include "base/stringprintf.h"
8 #include "net/base/io_buffer.h" 10 #include "net/base/io_buffer.h"
9 #include "net/base/net_errors.h" 11 #include "net/base/net_errors.h"
10 #include "net/http/http_request_headers.h" 12 #include "net/http/http_request_headers.h"
11 #include "net/http/http_request_info.h" 13 #include "net/http/http_request_info.h"
12 #include "net/http/http_stream_parser.h" 14 #include "net/http/http_stream_parser.h"
13 #include "net/http/http_util.h" 15 #include "net/http/http_util.h"
14 #include "net/socket/client_socket_handle.h" 16 #include "net/socket/client_socket_handle.h"
17 #include "net/socket/client_socket_pool_base.h"
15 18
16 namespace net { 19 namespace net {
17 20
18 HttpBasicStream::HttpBasicStream(ClientSocketHandle* connection, 21 HttpBasicStream::HttpBasicStream(ClientSocketHandle* connection,
19 HttpStreamParser* parser, 22 HttpStreamParser* parser,
20 bool using_proxy) 23 bool using_proxy)
21 : read_buf_(new GrowableIOBuffer()), 24 : read_buf_(new GrowableIOBuffer()),
22 parser_(parser), 25 parser_(parser),
23 connection_(connection), 26 connection_(connection),
24 using_proxy_(using_proxy), 27 using_proxy_(using_proxy),
25 request_info_(NULL) { 28 request_info_(NULL),
29 response_(NULL),
30 bytes_read_offset_(0) {
26 } 31 }
27 32
28 HttpBasicStream::~HttpBasicStream() {} 33 HttpBasicStream::~HttpBasicStream() {}
29 34
30 int HttpBasicStream::InitializeStream(const HttpRequestInfo* request_info, 35 int HttpBasicStream::InitializeStream(const HttpRequestInfo* request_info,
31 const BoundNetLog& net_log, 36 const BoundNetLog& net_log,
32 CompletionCallback* callback) { 37 CompletionCallback* callback) {
33 DCHECK(!parser_.get()); 38 DCHECK(!parser_.get());
34 request_info_ = request_info; 39 request_info_ = request_info;
35 parser_.reset(new HttpStreamParser(connection_.get(), request_info, 40 parser_.reset(new HttpStreamParser(connection_.get(), request_info,
36 read_buf_, net_log)); 41 read_buf_, net_log));
42 bytes_read_offset_ = connection_->socket()->NumBytesRead();
37 return OK; 43 return OK;
38 } 44 }
39 45
40 46
41 int HttpBasicStream::SendRequest(const HttpRequestHeaders& headers, 47 int HttpBasicStream::SendRequest(const HttpRequestHeaders& headers,
42 UploadDataStream* request_body, 48 UploadDataStream* request_body,
43 HttpResponseInfo* response, 49 HttpResponseInfo* response,
44 CompletionCallback* callback) { 50 CompletionCallback* callback) {
45 DCHECK(parser_.get()); 51 DCHECK(parser_.get());
46 DCHECK(request_info_); 52 DCHECK(request_info_);
47 const std::string path = using_proxy_ ? 53 const std::string path = using_proxy_ ?
48 HttpUtil::SpecForRequest(request_info_->url) : 54 HttpUtil::SpecForRequest(request_info_->url) :
49 HttpUtil::PathForRequest(request_info_->url); 55 HttpUtil::PathForRequest(request_info_->url);
50 request_line_ = base::StringPrintf("%s %s HTTP/1.1\r\n", 56 request_line_ = base::StringPrintf("%s %s HTTP/1.1\r\n",
51 request_info_->method.c_str(), 57 request_info_->method.c_str(),
52 path.c_str()); 58 path.c_str());
59 response_ = response;
53 return parser_->SendRequest(request_line_, headers, request_body, response, 60 return parser_->SendRequest(request_line_, headers, request_body, response,
54 callback); 61 callback);
55 } 62 }
56 63
57 uint64 HttpBasicStream::GetUploadProgress() const { 64 uint64 HttpBasicStream::GetUploadProgress() const {
58 return parser_->GetUploadProgress(); 65 return parser_->GetUploadProgress();
59 } 66 }
60 67
61 int HttpBasicStream::ReadResponseHeaders(CompletionCallback* callback) { 68 int HttpBasicStream::ReadResponseHeaders(CompletionCallback* callback) {
62 return parser_->ReadResponseHeaders(callback); 69 return parser_->ReadResponseHeaders(callback);
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 119
113 void HttpBasicStream::GetSSLCertRequestInfo( 120 void HttpBasicStream::GetSSLCertRequestInfo(
114 SSLCertRequestInfo* cert_request_info) { 121 SSLCertRequestInfo* cert_request_info) {
115 parser_->GetSSLCertRequestInfo(cert_request_info); 122 parser_->GetSSLCertRequestInfo(cert_request_info);
116 } 123 }
117 124
118 bool HttpBasicStream::IsSpdyHttpStream() const { 125 bool HttpBasicStream::IsSpdyHttpStream() const {
119 return false; 126 return false;
120 } 127 }
121 128
129 void HttpBasicStream::LogNumRttVsBytesMetrics() const {
130 int socket_reuse_policy = GetSocketReusePolicy();
131 if (socket_reuse_policy > 2 || socket_reuse_policy < 0) {
132 return;
133 }
134
135 int64 total_bytes_read = connection_->socket()->NumBytesRead();
136 int64 bytes_received = total_bytes_read - bytes_read_offset_;
137 int64 num_kb = bytes_received / 1024;
138 double rtt = connection_->socket()->GetConnectTimeMicros().ToInternalValue();
139 rtt /= 1000.0;
140
141 if (num_kb < 1024 && rtt > 0) { // Ignore responses > 1MB
142 base::TimeDelta duration = base::Time::Now() -
143 response_->request_time;
144 double num_rtt = static_cast<double>(duration.InMilliseconds()) / rtt;
145 int64 num_rtt_scaled = (4 * num_rtt);
146
147 static const char* const kGroups[] = {
148 "warmest_socket", "warm_socket", "last_accessed_socket"
149 };
150 int bucket = (num_kb / 5) * 5;
151 const std::string histogram(StringPrintf("Net.Num_RTT_vs_KB_%s_%dKB",
152 kGroups[socket_reuse_policy],
153 bucket));
154 base::Histogram* counter = base::Histogram::FactoryGet(
155 histogram, 0, 1000, 2, base::Histogram::kUmaTargetedHistogramFlag);
156 DCHECK_EQ(histogram, counter->histogram_name());
157 counter->Add(num_rtt_scaled);
158
159 VLOG(2) << StringPrintf("%s\nrtt = %f\tnum_rtt = %f\t"
160 "num_kb = %" PRId64 "\t"
161 "total bytes = %" PRId64 "\t"
162 "histogram = %s",
163 request_line_.data(),
164 rtt, num_rtt, num_kb, total_bytes_read,
165 histogram.data());
166 }
167 }
168
122 } // namespace net 169 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698