OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "chrome/browser/devtools/devtools_network_transaction.h" | 5 #include "chrome/browser/devtools/devtools_network_transaction.h" |
6 | 6 |
7 #include "chrome/browser/devtools/devtools_network_controller.h" | 7 #include "chrome/browser/devtools/devtools_network_controller.h" |
8 #include "net/base/net_errors.h" | 8 #include "net/base/net_errors.h" |
9 #include "net/base/upload_progress.h" | 9 #include "net/base/upload_progress.h" |
10 #include "net/http/http_network_transaction.h" | 10 #include "net/http/http_network_transaction.h" |
11 #include "net/http/http_request_info.h" | 11 #include "net/http/http_request_info.h" |
12 | 12 |
13 DevToolsNetworkTransaction::DevToolsNetworkTransaction( | 13 DevToolsNetworkTransaction::DevToolsNetworkTransaction( |
14 DevToolsNetworkController* controller, | 14 DevToolsNetworkController* controller, |
15 scoped_ptr<net::HttpTransaction> network_transaction) | 15 scoped_ptr<net::HttpTransaction> network_transaction) |
16 : controller_(controller), | 16 : controller_(controller), |
17 network_transaction_(network_transaction.Pass()), | 17 network_transaction_(network_transaction.Pass()), |
18 request_(NULL), | 18 request_(NULL), |
19 failed_(false), | 19 failed_(false), |
20 callback_type_(NONE), | |
20 proxy_callback_(base::Bind(&DevToolsNetworkTransaction::OnCallback, | 21 proxy_callback_(base::Bind(&DevToolsNetworkTransaction::OnCallback, |
21 base::Unretained(this))) { | 22 base::Unretained(this))) { |
22 DCHECK(controller); | 23 DCHECK(controller); |
23 controller->AddTransaction(this); | 24 controller->AddTransaction(this); |
24 } | 25 } |
25 | 26 |
26 DevToolsNetworkTransaction::~DevToolsNetworkTransaction() { | 27 DevToolsNetworkTransaction::~DevToolsNetworkTransaction() { |
27 controller_->RemoveTransaction(this); | 28 controller_->RemoveTransaction(this); |
28 } | 29 } |
29 | 30 |
31 void DevToolsNetworkTransaction::Throttle(int result) { | |
32 throttled_result_ = result; | |
33 int64_t penalty = 0; | |
34 if (callback_type_ == START) | |
35 penalty += network_transaction_->GetTotalReceivedBytes(); | |
36 if (result > 0) | |
37 penalty += result; | |
38 // Ensure that callback won't fire synchronously. | |
39 // TODO(eustas): Improve penalty calculation. | |
40 if (penalty == 0) | |
41 penalty = 1; | |
42 controller_->ThrottleTransaction(this, penalty); | |
43 } | |
44 | |
30 void DevToolsNetworkTransaction::OnCallback(int rv) { | 45 void DevToolsNetworkTransaction::OnCallback(int rv) { |
31 if (failed_) | 46 if (failed_) |
32 return; | 47 return; |
33 DCHECK(!callback_.is_null()); | 48 DCHECK(!callback_.is_null()); |
49 if (callback_type_ == START || callback_type_ == READ) { | |
50 if (controller_->ShouldThrottle(request_)) { | |
51 Throttle(rv); | |
52 return; | |
53 } | |
54 } | |
34 net::CompletionCallback callback = callback_; | 55 net::CompletionCallback callback = callback_; |
35 callback_.Reset(); | 56 callback_.Reset(); |
57 callback_type_ = NONE; | |
36 callback.Run(rv); | 58 callback.Run(rv); |
37 } | 59 } |
38 | 60 |
61 int DevToolsNetworkTransaction::SetupCallback( | |
62 net::CompletionCallback callback, | |
63 int result, | |
64 CallbackType callback_type) { | |
65 DCHECK(callback_type_ == NONE); | |
66 | |
67 if (result == net::ERR_IO_PENDING) { | |
68 callback_type_ = callback_type; | |
69 callback_ = callback; | |
70 return result; | |
71 } | |
72 | |
73 if (!controller_->ShouldThrottle(request_)) | |
74 return result; | |
75 | |
76 // In case of read error we can't calculate penalty. | |
vsevik
2014/06/11 12:08:51
What about if (callback_type == START && result <
eustas
2014/06/11 13:18:48
Done.
| |
77 if (callback_type == READ && result < 0) | |
78 return result; | |
79 | |
80 // URLRequestJob relies on synchronous end-of-stream notification. | |
81 if (callback_type == READ && result == 0) | |
82 return result; | |
83 | |
84 callback_type_ = callback_type; | |
vsevik
2014/06/11 12:08:52
Does it mean we also throttle requests of types ot
eustas
2014/06/11 13:18:48
Done.
| |
85 callback_ = callback; | |
86 Throttle(result); | |
87 return net::ERR_IO_PENDING; | |
88 } | |
89 | |
39 void DevToolsNetworkTransaction::Fail() { | 90 void DevToolsNetworkTransaction::Fail() { |
40 DCHECK(request_); | 91 DCHECK(request_); |
41 DCHECK(!failed_); | 92 DCHECK(!failed_); |
42 failed_ = true; | 93 failed_ = true; |
43 network_transaction_->SetBeforeNetworkStartCallback( | 94 network_transaction_->SetBeforeNetworkStartCallback( |
44 BeforeNetworkStartCallback()); | 95 BeforeNetworkStartCallback()); |
45 if (callback_.is_null()) | 96 if (callback_.is_null()) |
46 return; | 97 return; |
47 net::CompletionCallback callback = callback_; | 98 net::CompletionCallback callback = callback_; |
48 callback_.Reset(); | 99 callback_.Reset(); |
100 callback_type_ = NONE; | |
49 callback.Run(net::ERR_INTERNET_DISCONNECTED); | 101 callback.Run(net::ERR_INTERNET_DISCONNECTED); |
50 } | 102 } |
51 | 103 |
52 int DevToolsNetworkTransaction::Start( | 104 int DevToolsNetworkTransaction::Start( |
53 const net::HttpRequestInfo* request, | 105 const net::HttpRequestInfo* request, |
54 const net::CompletionCallback& callback, | 106 const net::CompletionCallback& callback, |
55 const net::BoundNetLog& net_log) { | 107 const net::BoundNetLog& net_log) { |
56 DCHECK(request); | 108 DCHECK(request); |
57 request_ = request; | 109 request_ = request; |
58 | 110 |
59 if (controller_->ShouldFail(request_)) { | 111 if (controller_->ShouldFail(request_)) { |
60 failed_ = true; | 112 failed_ = true; |
61 network_transaction_->SetBeforeNetworkStartCallback( | 113 network_transaction_->SetBeforeNetworkStartCallback( |
62 BeforeNetworkStartCallback()); | 114 BeforeNetworkStartCallback()); |
63 return net::ERR_INTERNET_DISCONNECTED; | 115 return net::ERR_INTERNET_DISCONNECTED; |
64 } | 116 } |
65 int rv = network_transaction_->Start(request, proxy_callback_, net_log); | 117 int rv = network_transaction_->Start(request, proxy_callback_, net_log); |
66 if (rv == net::ERR_IO_PENDING) | 118 return SetupCallback(callback, rv, START); |
67 callback_ = callback; | |
68 return rv; | |
69 } | 119 } |
70 | 120 |
71 int DevToolsNetworkTransaction::RestartIgnoringLastError( | 121 int DevToolsNetworkTransaction::RestartIgnoringLastError( |
72 const net::CompletionCallback& callback) { | 122 const net::CompletionCallback& callback) { |
73 if (failed_) | 123 if (failed_) |
74 return net::ERR_INTERNET_DISCONNECTED; | 124 return net::ERR_INTERNET_DISCONNECTED; |
75 int rv = network_transaction_->RestartIgnoringLastError(proxy_callback_); | 125 int rv = network_transaction_->RestartIgnoringLastError(proxy_callback_); |
76 if (rv == net::ERR_IO_PENDING) | 126 return SetupCallback(callback, rv, RESTART_IGNORING_LAST_ERROR); |
77 callback_ = callback; | |
78 return rv; | |
79 } | 127 } |
80 | 128 |
81 int DevToolsNetworkTransaction::RestartWithCertificate( | 129 int DevToolsNetworkTransaction::RestartWithCertificate( |
82 net::X509Certificate* client_cert, | 130 net::X509Certificate* client_cert, |
83 const net::CompletionCallback& callback) { | 131 const net::CompletionCallback& callback) { |
84 if (failed_) | 132 if (failed_) |
85 return net::ERR_INTERNET_DISCONNECTED; | 133 return net::ERR_INTERNET_DISCONNECTED; |
86 int rv = network_transaction_->RestartWithCertificate( | 134 int rv = network_transaction_->RestartWithCertificate( |
87 client_cert, proxy_callback_); | 135 client_cert, proxy_callback_); |
88 if (rv == net::ERR_IO_PENDING) | 136 return SetupCallback(callback, rv, RESTART_WITH_CERTIFICATE); |
89 callback_ = callback; | |
90 return rv; | |
91 } | 137 } |
92 | 138 |
93 int DevToolsNetworkTransaction::RestartWithAuth( | 139 int DevToolsNetworkTransaction::RestartWithAuth( |
94 const net::AuthCredentials& credentials, | 140 const net::AuthCredentials& credentials, |
95 const net::CompletionCallback& callback) { | 141 const net::CompletionCallback& callback) { |
96 if (failed_) | 142 if (failed_) |
97 return net::ERR_INTERNET_DISCONNECTED; | 143 return net::ERR_INTERNET_DISCONNECTED; |
98 int rv = network_transaction_->RestartWithAuth(credentials, proxy_callback_); | 144 int rv = network_transaction_->RestartWithAuth(credentials, proxy_callback_); |
99 if (rv == net::ERR_IO_PENDING) | 145 return SetupCallback(callback, rv, RESTART_WITH_AUTH); |
100 callback_ = callback; | |
101 return rv; | |
102 } | 146 } |
103 | 147 |
104 bool DevToolsNetworkTransaction::IsReadyToRestartForAuth() { | 148 bool DevToolsNetworkTransaction::IsReadyToRestartForAuth() { |
105 return network_transaction_->IsReadyToRestartForAuth(); | 149 return network_transaction_->IsReadyToRestartForAuth(); |
106 } | 150 } |
107 | 151 |
108 int DevToolsNetworkTransaction::Read( | 152 int DevToolsNetworkTransaction::Read( |
109 net::IOBuffer* buf, | 153 net::IOBuffer* buf, |
110 int buf_len, | 154 int buf_len, |
111 const net::CompletionCallback& callback) { | 155 const net::CompletionCallback& callback) { |
112 if (failed_) | 156 if (failed_) |
113 return net::ERR_INTERNET_DISCONNECTED; | 157 return net::ERR_INTERNET_DISCONNECTED; |
114 int rv = network_transaction_->Read(buf, buf_len, proxy_callback_); | 158 int rv = network_transaction_->Read(buf, buf_len, proxy_callback_); |
115 if (rv == net::ERR_IO_PENDING) | 159 return SetupCallback(callback, rv, READ); |
116 callback_ = callback; | |
117 return rv; | |
118 } | 160 } |
119 | 161 |
120 void DevToolsNetworkTransaction::StopCaching() { | 162 void DevToolsNetworkTransaction::StopCaching() { |
121 network_transaction_->StopCaching(); | 163 network_transaction_->StopCaching(); |
122 } | 164 } |
123 | 165 |
124 bool DevToolsNetworkTransaction::GetFullRequestHeaders( | 166 bool DevToolsNetworkTransaction::GetFullRequestHeaders( |
125 net::HttpRequestHeaders* headers) const { | 167 net::HttpRequestHeaders* headers) const { |
126 return network_transaction_->GetFullRequestHeaders(headers); | 168 return network_transaction_->GetFullRequestHeaders(headers); |
127 } | 169 } |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
169 void DevToolsNetworkTransaction::SetBeforeNetworkStartCallback( | 211 void DevToolsNetworkTransaction::SetBeforeNetworkStartCallback( |
170 const BeforeNetworkStartCallback& callback) { | 212 const BeforeNetworkStartCallback& callback) { |
171 network_transaction_->SetBeforeNetworkStartCallback(callback); | 213 network_transaction_->SetBeforeNetworkStartCallback(callback); |
172 } | 214 } |
173 | 215 |
174 int DevToolsNetworkTransaction::ResumeNetworkStart() { | 216 int DevToolsNetworkTransaction::ResumeNetworkStart() { |
175 if (failed_) | 217 if (failed_) |
176 return net::ERR_INTERNET_DISCONNECTED; | 218 return net::ERR_INTERNET_DISCONNECTED; |
177 return network_transaction_->ResumeNetworkStart(); | 219 return network_transaction_->ResumeNetworkStart(); |
178 } | 220 } |
221 | |
222 void DevToolsNetworkTransaction::FireThrottledCallback() { | |
223 DCHECK(!callback_.is_null()); | |
224 DCHECK(callback_type_ == READ || callback_type_ == START); | |
vsevik
2014/06/11 12:08:52
Looks like we can get here from RestartWithAuth no
eustas
2014/06/11 13:18:48
Done.
| |
225 net::CompletionCallback callback = callback_; | |
226 callback_.Reset(); | |
227 callback_type_ = NONE; | |
228 callback.Run(throttled_result_); | |
229 } | |
OLD | NEW |