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

Unified Diff: net/proxy/multi_threaded_proxy_resolver.cc

Issue 11885009: Improve performance of proxy resolver by tracing DNS dependencies. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: rebase off trunk Created 7 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: net/proxy/multi_threaded_proxy_resolver.cc
diff --git a/net/proxy/multi_threaded_proxy_resolver.cc b/net/proxy/multi_threaded_proxy_resolver.cc
index de739133848e39f9008b68b529110fdc423966ff..5d014e60265b6760e3f1bd9406282f8fa68e5a82 100644
--- a/net/proxy/multi_threaded_proxy_resolver.cc
+++ b/net/proxy/multi_threaded_proxy_resolver.cc
@@ -337,11 +337,6 @@ void MultiThreadedProxyResolver::Executor::OnJobCompleted(Job* job) {
void MultiThreadedProxyResolver::Executor::Destroy() {
DCHECK(coordinator_);
- // Give the resolver an opportunity to shutdown from THIS THREAD before
- // joining on the resolver thread. This allows certain implementations
- // to avoid deadlocks.
- resolver_->Shutdown();
-
{
// See http://crbug.com/69710.
base::ThreadRestrictions::ScopedAllowIO allow_io;
@@ -462,19 +457,9 @@ void MultiThreadedProxyResolver::CancelRequest(RequestHandle req) {
LoadState MultiThreadedProxyResolver::GetLoadState(RequestHandle req) const {
DCHECK(CalledOnValidThread());
DCHECK(req);
-
- Job* job = reinterpret_cast<Job*>(req);
- if (job->executor())
- return job->executor()->resolver()->GetLoadStateThreadSafe(NULL);
return LOAD_STATE_RESOLVING_PROXY_FOR_URL;
}
-LoadState MultiThreadedProxyResolver::GetLoadStateThreadSafe(
- RequestHandle req) const {
- NOTIMPLEMENTED();
- return LOAD_STATE_IDLE;
-}
-
void MultiThreadedProxyResolver::CancelSetPacScript() {
DCHECK(CalledOnValidThread());
DCHECK_EQ(0u, pending_jobs_.size());

Powered by Google App Engine
This is Rietveld 408576698