diff options
| author | eroman <eroman@chromium.org> | 2015-04-23 16:07:44 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-23 23:07:59 +0000 |
| commit | e186724963e66587af264ef6c37701c70f34658e (patch) | |
| tree | 02c668129f7d48df92bcdef18b89d87acde42f0a /net | |
| parent | 66c83b1fd5e97358046b9fec051d2ce63530194a (diff) | |
| download | chromium_src-e186724963e66587af264ef6c37701c70f34658e.zip chromium_src-e186724963e66587af264ef6c37701c70f34658e.tar.gz chromium_src-e186724963e66587af264ef6c37701c70f34658e.tar.bz2 | |
More instrumentation to track down net/ jank.
BUG=455942
Review URL: https://codereview.chromium.org/1105743002
Cr-Commit-Position: refs/heads/master@{#326687}
Diffstat (limited to 'net')
| -rw-r--r-- | net/dns/host_resolver_impl.cc | 5 | ||||
| -rw-r--r-- | net/proxy/proxy_script_fetcher_impl.cc | 16 |
2 files changed, 21 insertions, 0 deletions
diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc index 5e050c6..5390462 100644 --- a/net/dns/host_resolver_impl.cc +++ b/net/dns/host_resolver_impl.cc @@ -24,6 +24,7 @@ #include "base/message_loop/message_loop_proxy.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" +#include "base/profiler/scoped_tracker.h" #include "base/stl_util.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" @@ -1871,6 +1872,10 @@ int HostResolverImpl::Resolve(const RequestInfo& info, const CompletionCallback& callback, RequestHandle* out_req, const BoundNetLog& source_net_log) { + // TODO(eroman): Remove ScopedTracker below once crbug.com/455942 is fixed. + tracked_objects::ScopedTracker tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION("455942 HostResolverImpl::Resolve")); + DCHECK(addresses); DCHECK(CalledOnValidThread()); DCHECK_EQ(false, callback.is_null()); diff --git a/net/proxy/proxy_script_fetcher_impl.cc b/net/proxy/proxy_script_fetcher_impl.cc index 7d5d1ff..8ef777a 100644 --- a/net/proxy/proxy_script_fetcher_impl.cc +++ b/net/proxy/proxy_script_fetcher_impl.cc @@ -7,6 +7,7 @@ #include "base/compiler_specific.h" #include "base/logging.h" #include "base/message_loop/message_loop.h" +#include "base/profiler/scoped_tracker.h" #include "base/strings/string_util.h" #include "net/base/data_url.h" #include "net/base/io_buffer.h" @@ -114,6 +115,11 @@ void ProxyScriptFetcherImpl::OnResponseCompleted(URLRequest* request) { int ProxyScriptFetcherImpl::Fetch( const GURL& url, base::string16* text, const CompletionCallback& callback) { + // TODO(eroman): Remove ScopedTracker below once crbug.com/455942 is fixed. + tracked_objects::ScopedTracker tracking_profile1( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "455942 ProxyScriptFetcherImpl::Fetch (Other)")); + // It is invalid to call Fetch() while a request is already in progress. DCHECK(!cur_request_.get()); DCHECK(!callback.is_null()); @@ -121,6 +127,10 @@ int ProxyScriptFetcherImpl::Fetch( // Handle base-64 encoded data-urls that contain custom PAC scripts. if (url.SchemeIs("data")) { + // TODO(eroman): Remove ScopedTracker below once crbug.com/455942 is fixed. + tracked_objects::ScopedTracker tracking_profile2( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "455942 ProxyScriptFetcherImpl::Fetch (data url)")); std::string mime_type; std::string charset; std::string data; @@ -155,6 +165,12 @@ int ProxyScriptFetcherImpl::Fetch( // Post a task to timeout this request if it takes too long. cur_request_id_ = ++next_id_; + + // TODO(eroman): Remove ScopedTracker below once crbug.com/455942 is fixed. + tracked_objects::ScopedTracker tracking_profile3( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "455942 ProxyScriptFetcherImpl::Fetch (PostDelayedTask)")); + base::MessageLoop::current()->PostDelayedTask( FROM_HERE, base::Bind(&ProxyScriptFetcherImpl::OnTimeout, |