Chromium Code Reviews| OLD | NEW |
|---|---|
| (Empty) | |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | |
| 2 // Use of this source code is governed by a BSD-style license that can be | |
| 3 // found in the LICENSE file. | |
| 4 | |
| 5 #include "components/cronet/stale_host_resolver.h" | |
| 6 | |
| 7 #include "base/callback_helpers.h" | |
| 8 #include "base/metrics/histogram_macros.h" | |
| 9 #include "base/stl_util.h" | |
| 10 #include "base/timer/timer.h" | |
| 11 #include "base/values.h" | |
| 12 #include "net/base/net_errors.h" | |
| 13 #include "net/dns/dns_util.h" | |
| 14 #include "net/dns/host_resolver_impl.h" | |
| 15 | |
| 16 namespace cronet { | |
| 17 | |
| 18 namespace { | |
| 19 | |
| 20 // Used in histograms; do not modify existing values. | |
| 21 enum RequestOutcome { | |
| 22 // Served from (valid) cache, hosts file, IP literal, etc. | |
| 23 SYNCHRONOUS = 0, | |
| 24 | |
| 25 // Network responded; there was no usable stale data. | |
| 26 NETWORK_WITHOUT_STALE = 1, | |
| 27 | |
| 28 // Network responded before stale delay; there was usable stale data. | |
| 29 NETWORK_WITH_STALE = 2, | |
| 30 | |
| 31 // Stale data returned; network didn't respond before the stale delay. | |
| 32 STALE_BEFORE_NETWORK = 3, | |
| 33 | |
| 34 // Request canceled; there was no usable stale data. | |
| 35 CANCELED_WITHOUT_STALE = 4, | |
| 36 | |
| 37 // Request canceled; there was usable stale data. | |
| 38 CANCELED_WITH_STALE = 5, | |
| 39 | |
| 40 MAX_REQUEST_OUTCOME | |
| 41 }; | |
| 42 | |
| 43 void RecordRequestOutcome(RequestOutcome outcome) { | |
| 44 UMA_HISTOGRAM_ENUMERATION("DNS.StaleHostResolver.RequestOutcome", outcome, | |
| 45 MAX_REQUEST_OUTCOME); | |
| 46 } | |
| 47 | |
| 48 void RecordAddressListDelta(net::AddressListDeltaType delta) { | |
| 49 UMA_HISTOGRAM_ENUMERATION("DNS.StaleHostResolver.StaleAddressListDelta", | |
| 50 delta, net::MAX_DELTA_TYPE); | |
| 51 } | |
| 52 | |
| 53 void RecordTimeDelta(base::TimeTicks network_time, base::TimeTicks stale_time) { | |
| 54 if (network_time < stale_time) { | |
| 55 UMA_HISTOGRAM_MEDIUM_TIMES("DNS.StaleHostResolver.NetworkEarly", | |
| 56 stale_time - network_time); | |
| 57 } else { | |
| 58 UMA_HISTOGRAM_MEDIUM_TIMES("DNS.StaleHostResolver.NetworkLate", | |
| 59 network_time - stale_time); | |
| 60 } | |
| 61 } | |
| 62 | |
| 63 bool StaleEntryIsUsable(const StaleHostResolver::StaleOptions& options, | |
| 64 const net::HostCache::EntryStaleness& entry) { | |
| 65 if (options.max_expired_time != base::TimeDelta() && | |
| 66 entry.expired_by > options.max_expired_time) { | |
| 67 return false; | |
| 68 } | |
| 69 if (options.max_stale_uses > 0 && entry.stale_hits > options.max_stale_uses) | |
| 70 return false; | |
| 71 if (!options.allow_other_network && entry.network_changes > 0) | |
| 72 return false; | |
| 73 return true; | |
| 74 } | |
| 75 | |
| 76 } // namespace | |
| 77 | |
| 78 // A request made by the StaleHostResolver. May return fresh cached data, | |
| 79 // network data, or stale cached data. | |
| 80 // | |
| 81 // Expected lifetime: | |
| 82 // 1. Request constructed. | |
| 83 // 2. Request started with |Start()|. If |Start()| returns ERR_IO_PENDING: | |
| 84 // a) Request calls |result_callback| *OR* Request is canceled with | |
| 85 // |Cancel()|. | |
| 86 // b) Request calls |complete_callback| passed to Start. | |
| 87 // 4. Request destroyed. | |
| 88 class StaleHostResolver::Request { | |
| 89 public: | |
| 90 Request(net::HostResolverImpl* resolver); | |
| 91 ~Request(); | |
| 92 | |
| 93 // A callback for the caller to decide whether a stale entry is usable or not. | |
| 94 typedef base::Callback<bool(const net::HostCache::EntryStaleness&)> | |
| 95 StaleEntryUsableCallback; | |
| 96 | |
| 97 // Starts the request. May call |usable_callback| inline if |resolver| returns | |
| 98 // stale data to let the caller decide whether the data is usable. | |
| 99 // | |
| 100 // Returns the result if the request finishes synchronously. Returns | |
| 101 // ERR_IO_PENDING and calls |result_callback| with the result if it finishes | |
| 102 // asynchronously and was not canceled (via |Cancel()|). | |
| 103 // | |
| 104 // If the request does not finish synchronously, also calls | |
| 105 // |complete_callback| once a result has been returned *and* the underlying | |
| 106 // network request is complete, so the caller can destroy the Request. | |
| 107 // | |
| 108 // |addresses| must remain valid until the Request completes (synchronously or | |
| 109 // via |result_callback|) or is canceled (via |Cancel()|). | |
| 110 int Start(const RequestInfo& info, | |
| 111 net::RequestPriority priority, | |
| 112 net::AddressList* addresses, | |
| 113 const net::CompletionCallback& result_callback, | |
| 114 const net::BoundNetLog& net_log, | |
| 115 const StaleEntryUsableCallback& usable_callback, | |
| 116 base::TimeDelta stale_delay, | |
| 117 const base::Callback<void()>& complete_callback); | |
| 118 | |
| 119 // Cancels the Request. |Start()| must have been called and returned | |
| 120 // ERR_IO_PENDING; the request must not have been canceled already. | |
| 121 // | |
| 122 // Does not call |result_callback|, but does call |complete_callback|. | |
| 123 void Cancel(); | |
| 124 | |
| 125 bool network_request_running() const { return network_handle_ != nullptr; } | |
| 126 | |
| 127 private: | |
| 128 // Callback for the timer to return stale data. | |
| 129 void OnStaleDelayElapsed(); | |
| 130 | |
| 131 // Callback for the underlying network request. | |
| 132 void OnNetworkRequestComplete(int error); | |
| 133 | |
| 134 // Populates |*addresses_| from |addresses| if and only if rv is OK, clears | |
|
Julia Tuttle
2016/06/20 13:49:57
I simplified a few of these comments to avoid just
| |
| 135 // |addresses_| to make sure the request doesn't return twice, and then | |
| 136 // returns |rv|. | |
| 137 int HandleResult(int rv, const net::AddressList& addresses); | |
| 138 | |
| 139 void RecordSynchronousRequest(); | |
| 140 void RecordNetworkRequest(int error); | |
| 141 void RecordCanceledRequest(); | |
| 142 | |
| 143 bool returned_stale_result() const { return result_callback_.is_null(); } | |
| 144 | |
| 145 net::HostResolverImpl* resolver_; | |
| 146 | |
| 147 // The address list passed into |Start()| to be filled in when the request | |
| 148 // returns. | |
| 149 net::AddressList* addresses_; | |
| 150 // The callback passed into |Start()| to be called when the request returns. | |
| 151 net::CompletionCallback result_callback_; | |
| 152 | |
| 153 // The error from the stale cache entry, if there was one. | |
| 154 int stale_error_; | |
|
Bryan McQuade
2016/06/16 16:37:19
similar - should we set this to a sane default?
Julia Tuttle
2016/06/20 13:49:57
Sure, I'll use net::ERR_DNS_CACHE_MISS as a sentin
| |
| 155 // The address list from the stale cache entry, if there was one. | |
| 156 net::AddressList stale_addresses_; | |
| 157 // A timer that fires when the |Request| should return stale results, if the | |
| 158 // underlying network request has not finished yet. | |
| 159 base::OneShotTimer stale_timer_; | |
| 160 | |
| 161 // The address list the underlying network request will fill in. (Can't be the | |
| 162 // one passed to |Start()|, or else the network request would overwrite stale | |
| 163 // results after they are returned.) | |
| 164 net::AddressList network_addresses_; | |
| 165 // The request handle to the underlying network request, so it can be canceled | |
| 166 // in |Cancel()| or the destructor. | |
| 167 net::HostResolver::RequestHandle network_handle_; | |
| 168 | |
| 169 // The callback passed into |Start()| to be called when the Request is | |
| 170 // entirely complete (has returned or been canceled, and the underlying | |
| 171 // network request has also returned or been canceled). | |
| 172 base::Callback<void()> complete_callback_; | |
| 173 }; | |
| 174 | |
| 175 StaleHostResolver::Request::Request(net::HostResolverImpl* resolver) | |
| 176 : resolver_(resolver), addresses_(nullptr), network_handle_(nullptr) {} | |
| 177 | |
| 178 StaleHostResolver::Request::~Request() { | |
| 179 if (network_request_running()) | |
| 180 resolver_->CancelRequest(network_handle_); | |
| 181 } | |
| 182 | |
| 183 int StaleHostResolver::Request::Start( | |
| 184 const RequestInfo& info, | |
| 185 net::RequestPriority priority, | |
| 186 net::AddressList* addresses, | |
| 187 const net::CompletionCallback& result_callback, | |
| 188 const net::BoundNetLog& net_log, | |
| 189 const StaleEntryUsableCallback& usable_callback, | |
| 190 base::TimeDelta stale_delay, | |
| 191 const base::Callback<void()>& complete_callback) { | |
| 192 DCHECK(!result_callback.is_null()); | |
| 193 DCHECK(!usable_callback.is_null()); | |
| 194 DCHECK(!complete_callback.is_null()); | |
| 195 | |
| 196 net::AddressList cache_addresses; | |
| 197 net::HostCache::EntryStaleness stale_info; | |
| 198 int cache_rv = resolver_->ResolveStaleFromCache(info, &cache_addresses, | |
| 199 &stale_info, net_log); | |
| 200 // If it's a fresh cache hit (or literal), return it synchronously. | |
| 201 if (cache_rv != net::ERR_DNS_CACHE_MISS && !stale_info.is_stale()) { | |
| 202 cache_rv = HandleResult(cache_rv, cache_addresses); | |
| 203 RecordSynchronousRequest(); | |
| 204 return cache_rv; | |
| 205 } | |
| 206 | |
| 207 result_callback_ = result_callback; | |
| 208 addresses_ = addresses; | |
| 209 complete_callback_ = complete_callback; | |
| 210 | |
| 211 if (cache_rv != net::ERR_DNS_CACHE_MISS && usable_callback.Run(stale_info)) { | |
| 212 stale_error_ = cache_rv; | |
| 213 stale_addresses_ = cache_addresses; | |
| 214 // |stale_timer_| is deleted when the Request is deleted, so it's safe to | |
| 215 // use Unretained here. | |
| 216 base::Callback<void()> stale_callback = | |
| 217 base::Bind(&StaleHostResolver::Request::OnStaleDelayElapsed, | |
| 218 base::Unretained(this)); | |
| 219 stale_timer_.Start(FROM_HERE, stale_delay, stale_callback); | |
|
Bryan McQuade
2016/06/16 16:37:19
what happens if stale_delay is the default value (
Julia Tuttle
2016/06/20 13:49:57
Zero should Just Work(TM) -- the timer will post a
Bryan McQuade
2016/06/20 13:51:47
Sounds fine as is, thanks!
| |
| 220 } | |
| 221 | |
| 222 // Don't check the cache again. | |
| 223 net::HostResolver::RequestInfo no_cache_info(info); | |
| 224 no_cache_info.set_allow_cached_response(false); | |
| 225 int network_rv = resolver_->Resolve( | |
| 226 no_cache_info, priority, &network_addresses_, | |
| 227 base::Bind(&StaleHostResolver::Request::OnNetworkRequestComplete, | |
| 228 base::Unretained(this)), | |
| 229 &network_handle_, net_log); | |
| 230 DCHECK_EQ(net::ERR_IO_PENDING, network_rv); | |
| 231 return net::ERR_IO_PENDING; | |
| 232 } | |
| 233 | |
| 234 void StaleHostResolver::Request::Cancel() { | |
| 235 DCHECK(network_request_running()); | |
| 236 DCHECK(!returned_stale_result()); | |
| 237 | |
| 238 resolver_->CancelRequest(network_handle_); | |
| 239 network_handle_ = nullptr; | |
| 240 RecordCanceledRequest(); | |
| 241 complete_callback_.Run(); | |
| 242 } | |
| 243 | |
| 244 void StaleHostResolver::Request::OnStaleDelayElapsed() { | |
| 245 DCHECK(network_request_running()); | |
| 246 DCHECK(!returned_stale_result()); | |
| 247 | |
| 248 base::ResetAndReturn(&result_callback_) | |
| 249 .Run(HandleResult(stale_error_, stale_addresses_)); | |
| 250 | |
| 251 // Don't call |complete_callback_| yet; let the underlying network request | |
| 252 // continue so it backfills the host cache. | |
| 253 } | |
| 254 | |
| 255 void StaleHostResolver::Request::OnNetworkRequestComplete(int error) { | |
| 256 DCHECK(network_request_running()); | |
| 257 | |
| 258 network_handle_ = nullptr; | |
| 259 | |
| 260 if (!returned_stale_result()) | |
| 261 result_callback_.Run(HandleResult(error, network_addresses_)); | |
| 262 | |
| 263 RecordNetworkRequest(error); | |
| 264 complete_callback_.Run(); | |
| 265 } | |
| 266 | |
| 267 int StaleHostResolver::Request::HandleResult( | |
| 268 int rv, | |
| 269 const net::AddressList& addresses) { | |
| 270 DCHECK(addresses_); | |
| 271 | |
| 272 if (rv == net::OK) | |
| 273 *addresses_ = addresses; | |
| 274 addresses_ = nullptr; | |
| 275 return rv; | |
| 276 } | |
| 277 | |
| 278 void StaleHostResolver::Request::RecordSynchronousRequest() { | |
| 279 RecordRequestOutcome(SYNCHRONOUS); | |
| 280 } | |
| 281 | |
| 282 void StaleHostResolver::Request::RecordNetworkRequest(int error) { | |
| 283 if (stale_timer_.IsRunning() || returned_stale_result()) | |
| 284 RecordTimeDelta(base::TimeTicks::Now(), stale_timer_.desired_run_time()); | |
| 285 | |
| 286 if (returned_stale_result() && stale_error_ == net::OK && error == net::OK) { | |
| 287 RecordAddressListDelta( | |
| 288 FindAddressListDeltaType(stale_addresses_, network_addresses_)); | |
| 289 } | |
| 290 | |
| 291 if (returned_stale_result()) | |
| 292 RecordRequestOutcome(STALE_BEFORE_NETWORK); | |
| 293 else if (stale_timer_.IsRunning()) | |
| 294 RecordRequestOutcome(NETWORK_WITH_STALE); | |
| 295 else | |
| 296 RecordRequestOutcome(NETWORK_WITHOUT_STALE); | |
| 297 } | |
| 298 | |
| 299 void StaleHostResolver::Request::RecordCanceledRequest() { | |
| 300 if (stale_timer_.IsRunning()) | |
| 301 RecordRequestOutcome(CANCELED_WITH_STALE); | |
| 302 else | |
| 303 RecordRequestOutcome(CANCELED_WITHOUT_STALE); | |
| 304 } | |
| 305 | |
| 306 StaleHostResolver::StaleHostResolver( | |
| 307 std::unique_ptr<net::HostResolverImpl> inner_resolver, | |
| 308 const StaleOptions& stale_options) | |
| 309 : inner_resolver_(std::move(inner_resolver)), options_(stale_options) { | |
| 310 DCHECK_GE(0, stale_options.max_expired_time.InMicroseconds()); | |
| 311 DCHECK_GE(0, stale_options.max_stale_uses); | |
| 312 } | |
| 313 | |
| 314 StaleHostResolver::~StaleHostResolver() { | |
| 315 STLDeleteElements(&pending_requests_); | |
| 316 } | |
| 317 | |
| 318 int StaleHostResolver::Resolve(const RequestInfo& info, | |
| 319 net::RequestPriority priority, | |
| 320 net::AddressList* addresses, | |
| 321 const net::CompletionCallback& callback, | |
| 322 RequestHandle* out_req, | |
| 323 const net::BoundNetLog& net_log) { | |
| 324 StaleHostResolver::Request::StaleEntryUsableCallback usable_callback = | |
| 325 base::Bind(&StaleEntryIsUsable, options_); | |
| 326 | |
| 327 Request* request = new Request(inner_resolver_.get()); | |
| 328 | |
| 329 const base::Callback<void()> complete_callback = base::Bind( | |
| 330 &StaleHostResolver::OnRequestComplete, base::Unretained(this), request); | |
| 331 int rv = request->Start(info, priority, addresses, callback, net_log, | |
| 332 usable_callback, options_.delay, complete_callback); | |
| 333 if (rv == net::ERR_IO_PENDING) { | |
| 334 pending_requests_.insert(request); | |
| 335 if (out_req) | |
| 336 *out_req = reinterpret_cast<RequestHandle>(request); | |
| 337 } | |
| 338 return rv; | |
| 339 } | |
| 340 | |
| 341 void StaleHostResolver::CancelRequest(RequestHandle req_handle) { | |
| 342 Request* request = reinterpret_cast<Request*>(req_handle); | |
| 343 DCHECK(request); | |
| 344 DCHECK(request->network_request_running()); | |
| 345 | |
| 346 request->Cancel(); | |
| 347 } | |
| 348 | |
| 349 int StaleHostResolver::ResolveFromCache(const RequestInfo& info, | |
| 350 net::AddressList* addresses, | |
| 351 const net::BoundNetLog& net_log) { | |
| 352 return inner_resolver_->ResolveFromCache(info, addresses, net_log); | |
| 353 } | |
| 354 | |
| 355 void StaleHostResolver::SetDnsClientEnabled(bool enabled) { | |
| 356 inner_resolver_->SetDnsClientEnabled(enabled); | |
| 357 } | |
| 358 | |
| 359 net::HostCache* StaleHostResolver::GetHostCache() { | |
| 360 return inner_resolver_->GetHostCache(); | |
| 361 } | |
| 362 | |
| 363 std::unique_ptr<base::Value> StaleHostResolver::GetDnsConfigAsValue() const { | |
| 364 return inner_resolver_->GetDnsConfigAsValue(); | |
| 365 } | |
| 366 | |
| 367 void StaleHostResolver::OnRequestComplete(StaleHostResolver::Request* request) { | |
| 368 DCHECK(request); | |
| 369 DCHECK_EQ(1u, pending_requests_.count(request)); | |
| 370 | |
| 371 pending_requests_.erase(request); | |
| 372 delete request; | |
| 373 } | |
| 374 | |
| 375 } // namespace net | |
| OLD | NEW |