Skip to content

GitLab

T
tangled
Commit 844c1557 authored by vadimt's avatar vadimt Committed by Commit bot
Browse files
Options

Instrumenting URLRequestJob::NotifyHeadersComplete to locate the source of jankiness 

Previous instrumentations showed that URLRequestJob::NotifyHeadersComplete
alone is responsible for ~57.1 janks per hour in IO thread. I need to instrument
the code inside it to find out which part causes jank.

This is a mechanical change that adds instrumentation required to locate the
source of jankiness (i.e. a long-running fragment of code executed as a part of
the task that causes jank) in the code. See the bug for details on what kind of
jank we are after.
A number of similar CLs were landed, and none of them caused issues. They've
helped to find and fix janky code. The code of the instrumentation is highly
optimized and is not expected to affect performance. The code simply creates a
diagnostic task which is identical to ones created by PostTask or IPC message
handlers. The task gets created only in developer build and in Canary channel.

BUG=423948

Review URL: https://codereview.chromium.org/696483002

Cr-Commit-Position: refs/heads/master@{#302694}
parent c9aa95f7
Hide whitespace changes
Inline Side-by-side
Showing with 192 additions and 6 deletions
base/profiler/scoped_tracker.h
View file @ 844c1557
...@@ -19,6 +19,21 @@ namespace tracked_objects { ...@@ -19,6 +19,21 @@ namespace tracked_objects {
// ScopedTracker instruments a region within the code if the instrumentation is // ScopedTracker instruments a region within the code if the instrumentation is
// enabled. It can be used, for example, to find out if a source of jankiness is // enabled. It can be used, for example, to find out if a source of jankiness is
// inside the instrumented code region. // inside the instrumented code region.
// Details:
// 1. This class creates a task (like ones created by PostTask calls or IPC
// message handlers). This task can be seen in chrome://profiler and is sent as
// a part of profiler data to the UMA server. See profiler_event.proto.
// 2. That task's lifetime is same as the lifetime of the ScopedTracker
// instance.
// 3. The execution time associated with the task is the wallclock time between
// its constructor and destructor, minus wallclock times of directly nested
// tasks.
// 4. Task creation that this class utilizes is highly optimized.
// 5. The class doesn't create a task unless this was enabled for the current
// process. Search for ScopedTracker::Enable for the current list of processes
// and channels where it's activated.
// 6. The class is designed for temporarily instrumenting code to find
// performance problems, after which the instrumentation must be removed.
class BASE_EXPORT ScopedTracker { class BASE_EXPORT ScopedTracker {
public: public:
ScopedTracker(const Location& location); ScopedTracker(const Location& location);
......
net/base/network_delegate.cc
View file @ 844c1557
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include "net/base/network_delegate.h" #include "net/base/network_delegate.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/profiler/scoped_tracker.h"
#include "net/base/load_flags.h" #include "net/base/load_flags.h"
#include "net/base/net_errors.h" #include "net/base/net_errors.h"
#include "net/proxy/proxy_info.h" #include "net/proxy/proxy_info.h"
...@@ -18,6 +19,10 @@ int NetworkDelegate::NotifyBeforeURLRequest( ...@@ -18,6 +19,10 @@ int NetworkDelegate::NotifyBeforeURLRequest(
DCHECK(CalledOnValidThread()); DCHECK(CalledOnValidThread());
DCHECK(request); DCHECK(request);
DCHECK(!callback.is_null()); DCHECK(!callback.is_null());
// TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"423948 NetworkDelegate::OnBeforeURLRequest"));
return OnBeforeURLRequest(request, callback, new_url); return OnBeforeURLRequest(request, callback, new_url);
} }
...@@ -28,6 +33,10 @@ void NetworkDelegate::NotifyResolveProxy( ...@@ -28,6 +33,10 @@ void NetworkDelegate::NotifyResolveProxy(
ProxyInfo* result) { ProxyInfo* result) {
DCHECK(CalledOnValidThread()); DCHECK(CalledOnValidThread());
DCHECK(result); DCHECK(result);
// TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"423948 NetworkDelegate::OnResolveProxy"));
OnResolveProxy(url, load_flags, proxy_service, result); OnResolveProxy(url, load_flags, proxy_service, result);
} }
...@@ -35,6 +44,10 @@ void NetworkDelegate::NotifyProxyFallback( ...@@ -35,6 +44,10 @@ void NetworkDelegate::NotifyProxyFallback(
const ProxyServer& bad_proxy, const ProxyServer& bad_proxy,
int net_error) { int net_error) {
DCHECK(CalledOnValidThread()); DCHECK(CalledOnValidThread());
// TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"423948 NetworkDelegate::OnProxyFallback"));
OnProxyFallback(bad_proxy, net_error); OnProxyFallback(bad_proxy, net_error);
} }
...@@ -44,6 +57,10 @@ int NetworkDelegate::NotifyBeforeSendHeaders( ...@@ -44,6 +57,10 @@ int NetworkDelegate::NotifyBeforeSendHeaders(
DCHECK(CalledOnValidThread()); DCHECK(CalledOnValidThread());
DCHECK(headers); DCHECK(headers);
DCHECK(!callback.is_null()); DCHECK(!callback.is_null());
// TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"423948 NetworkDelegate::OnBeforeSendHeaders"));
return OnBeforeSendHeaders(request, callback, headers); return OnBeforeSendHeaders(request, callback, headers);
} }
...@@ -53,12 +70,20 @@ void NetworkDelegate::NotifyBeforeSendProxyHeaders( ...@@ -53,12 +70,20 @@ void NetworkDelegate::NotifyBeforeSendProxyHeaders(
HttpRequestHeaders* headers) { HttpRequestHeaders* headers) {
DCHECK(CalledOnValidThread()); DCHECK(CalledOnValidThread());
DCHECK(headers); DCHECK(headers);
// TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"423948 NetworkDelegate::OnBeforeSendProxyHeaders"));
OnBeforeSendProxyHeaders(request, proxy_info, headers); OnBeforeSendProxyHeaders(request, proxy_info, headers);
} }
void NetworkDelegate::NotifySendHeaders(URLRequest* request, void NetworkDelegate::NotifySendHeaders(URLRequest* request,
const HttpRequestHeaders& headers) { const HttpRequestHeaders& headers) {
DCHECK(CalledOnValidThread()); DCHECK(CalledOnValidThread());
// TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"423948 NetworkDelegate::OnSendHeaders"));
OnSendHeaders(request, headers); OnSendHeaders(request, headers);
} }
...@@ -71,6 +96,10 @@ int NetworkDelegate::NotifyHeadersReceived( ...@@ -71,6 +96,10 @@ int NetworkDelegate::NotifyHeadersReceived(
DCHECK(CalledOnValidThread()); DCHECK(CalledOnValidThread());
DCHECK(original_response_headers); DCHECK(original_response_headers);
DCHECK(!callback.is_null()); DCHECK(!callback.is_null());
// TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"423948 NetworkDelegate::OnHeadersReceived"));
return OnHeadersReceived(request, return OnHeadersReceived(request,
callback, callback,
original_response_headers, original_response_headers,
...@@ -81,12 +110,20 @@ int NetworkDelegate::NotifyHeadersReceived( ...@@ -81,12 +110,20 @@ int NetworkDelegate::NotifyHeadersReceived(
void NetworkDelegate::NotifyResponseStarted(URLRequest* request) { void NetworkDelegate::NotifyResponseStarted(URLRequest* request) {
DCHECK(CalledOnValidThread()); DCHECK(CalledOnValidThread());
DCHECK(request); DCHECK(request);
// TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"423948 NetworkDelegate::OnResponseStarted"));
OnResponseStarted(request); OnResponseStarted(request);
} }
void NetworkDelegate::NotifyRawBytesRead(const URLRequest& request, void NetworkDelegate::NotifyRawBytesRead(const URLRequest& request,
int bytes_read) { int bytes_read) {
DCHECK(CalledOnValidThread()); DCHECK(CalledOnValidThread());
// TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"423948 NetworkDelegate::OnRawBytesRead"));
OnRawBytesRead(request, bytes_read); OnRawBytesRead(request, bytes_read);
} }
...@@ -94,24 +131,39 @@ void NetworkDelegate::NotifyBeforeRedirect(URLRequest* request, ...@@ -94,24 +131,39 @@ void NetworkDelegate::NotifyBeforeRedirect(URLRequest* request,
const GURL& new_location) { const GURL& new_location) {
DCHECK(CalledOnValidThread()); DCHECK(CalledOnValidThread());
DCHECK(request); DCHECK(request);
// TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"423948 NetworkDelegate::OnBeforeRedirect"));
OnBeforeRedirect(request, new_location); OnBeforeRedirect(request, new_location);
} }
void NetworkDelegate::NotifyCompleted(URLRequest* request, bool started) { void NetworkDelegate::NotifyCompleted(URLRequest* request, bool started) {
DCHECK(CalledOnValidThread()); DCHECK(CalledOnValidThread());
DCHECK(request); DCHECK(request);
// TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION("423948 NetworkDelegate::OnCompleted"));
OnCompleted(request, started); OnCompleted(request, started);
} }
void NetworkDelegate::NotifyURLRequestDestroyed(URLRequest* request) { void NetworkDelegate::NotifyURLRequestDestroyed(URLRequest* request) {
DCHECK(CalledOnValidThread()); DCHECK(CalledOnValidThread());
DCHECK(request); DCHECK(request);
// TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"423948 NetworkDelegate::OnURLRequestDestroyed"));
OnURLRequestDestroyed(request); OnURLRequestDestroyed(request);
} }
void NetworkDelegate::NotifyPACScriptError(int line_number, void NetworkDelegate::NotifyPACScriptError(int line_number,
const base::string16& error) { const base::string16& error) {
DCHECK(CalledOnValidThread()); DCHECK(CalledOnValidThread());
// TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"423948 NetworkDelegate::OnPACScriptError"));
OnPACScriptError(line_number, error); OnPACScriptError(line_number, error);
} }
...@@ -130,6 +182,10 @@ int NetworkDelegate::NotifyBeforeSocketStreamConnect( ...@@ -130,6 +182,10 @@ int NetworkDelegate::NotifyBeforeSocketStreamConnect(
DCHECK(CalledOnValidThread()); DCHECK(CalledOnValidThread());
DCHECK(socket); DCHECK(socket);
DCHECK(!callback.is_null()); DCHECK(!callback.is_null());
// TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"423948 NetworkDelegate::OnBeforeSocketStreamConnect"));
return OnBeforeSocketStreamConnect(socket, callback); return OnBeforeSocketStreamConnect(socket, callback);
} }
...@@ -137,6 +193,10 @@ bool NetworkDelegate::CanGetCookies(const URLRequest& request, ...@@ -137,6 +193,10 @@ bool NetworkDelegate::CanGetCookies(const URLRequest& request,
const CookieList& cookie_list) { const CookieList& cookie_list) {
DCHECK(CalledOnValidThread()); DCHECK(CalledOnValidThread());
DCHECK(!(request.load_flags() & net::LOAD_DO_NOT_SEND_COOKIES)); DCHECK(!(request.load_flags() & net::LOAD_DO_NOT_SEND_COOKIES));
// TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"423948 NetworkDelegate::OnCanGetCookies"));
return OnCanGetCookies(request, cookie_list); return OnCanGetCookies(request, cookie_list);
} }
...@@ -145,17 +205,29 @@ bool NetworkDelegate::CanSetCookie(const URLRequest& request, ...@@ -145,17 +205,29 @@ bool NetworkDelegate::CanSetCookie(const URLRequest& request,
CookieOptions* options) { CookieOptions* options) {
DCHECK(CalledOnValidThread()); DCHECK(CalledOnValidThread());
DCHECK(!(request.load_flags() & net::LOAD_DO_NOT_SAVE_COOKIES)); DCHECK(!(request.load_flags() & net::LOAD_DO_NOT_SAVE_COOKIES));
// TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"423948 NetworkDelegate::OnCanSetCookie"));
return OnCanSetCookie(request, cookie_line, options); return OnCanSetCookie(request, cookie_line, options);
} }
bool NetworkDelegate::CanAccessFile(const URLRequest& request, bool NetworkDelegate::CanAccessFile(const URLRequest& request,
const base::FilePath& path) const { const base::FilePath& path) const {
DCHECK(CalledOnValidThread()); DCHECK(CalledOnValidThread());
// TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"423948 NetworkDelegate::OnCanAccessFile"));
return OnCanAccessFile(request, path); return OnCanAccessFile(request, path);
} }
bool NetworkDelegate::CanThrottleRequest(const URLRequest& request) const { bool NetworkDelegate::CanThrottleRequest(const URLRequest& request) const {
DCHECK(CalledOnValidThread()); DCHECK(CalledOnValidThread());
// TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"423948 NetworkDelegate::OnCanThrottleRequest"));
return OnCanThrottleRequest(request); return OnCanThrottleRequest(request);
} }
...@@ -163,6 +235,10 @@ bool NetworkDelegate::CanEnablePrivacyMode( ...@@ -163,6 +235,10 @@ bool NetworkDelegate::CanEnablePrivacyMode(
const GURL& url, const GURL& url,
const GURL& first_party_for_cookies) const { const GURL& first_party_for_cookies) const {
DCHECK(CalledOnValidThread()); DCHECK(CalledOnValidThread());
// TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"423948 NetworkDelegate::OnCanEnablePrivacyMode"));
return OnCanEnablePrivacyMode(url, first_party_for_cookies); return OnCanEnablePrivacyMode(url, first_party_for_cookies);
} }
...@@ -171,6 +247,10 @@ bool NetworkDelegate::CancelURLRequestWithPolicyViolatingReferrerHeader( ...@@ -171,6 +247,10 @@ bool NetworkDelegate::CancelURLRequestWithPolicyViolatingReferrerHeader(
const GURL& target_url, const GURL& target_url,
const GURL& referrer_url) const { const GURL& referrer_url) const {
DCHECK(CalledOnValidThread()); DCHECK(CalledOnValidThread());
// TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"423948 NetworkDelegate::OnCancelURLRequestWithPolicy..."));
return OnCancelURLRequestWithPolicyViolatingReferrerHeader( return OnCancelURLRequestWithPolicyViolatingReferrerHeader(
request, target_url, referrer_url); request, target_url, referrer_url);
} }
......
net/url_request/url_request.cc
View file @ 844c1557
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include "base/memory/singleton.h" #include "base/memory/singleton.h"
#include "base/message_loop/message_loop.h" #include "base/message_loop/message_loop.h"
#include "base/metrics/stats_counters.h" #include "base/metrics/stats_counters.h"
#include "base/profiler/scoped_tracker.h"
#include "base/stl_util.h" #include "base/stl_util.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "base/synchronization/lock.h" #include "base/synchronization/lock.h"
...@@ -832,6 +833,11 @@ void URLRequest::NotifyReceivedRedirect(const RedirectInfo& redirect_info, ...@@ -832,6 +833,11 @@ void URLRequest::NotifyReceivedRedirect(const RedirectInfo& redirect_info,
RestartWithJob(job); RestartWithJob(job);
} else if (delegate_) { } else if (delegate_) {
OnCallToDelegate(); OnCallToDelegate();
// TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"423948 URLRequest::Delegate::OnReceivedRedirect"));
delegate_->OnReceivedRedirect(this, redirect_info, defer_redirect); delegate_->OnReceivedRedirect(this, redirect_info, defer_redirect);
// |this| may be have been destroyed here. // |this| may be have been destroyed here.
} }
...@@ -840,7 +846,14 @@ void URLRequest::NotifyReceivedRedirect(const RedirectInfo& redirect_info, ...@@ -840,7 +846,14 @@ void URLRequest::NotifyReceivedRedirect(const RedirectInfo& redirect_info,
void URLRequest::NotifyBeforeNetworkStart(bool* defer) { void URLRequest::NotifyBeforeNetworkStart(bool* defer) {
if (delegate_ && !notified_before_network_start_) { if (delegate_ && !notified_before_network_start_) {
OnCallToDelegate(); OnCallToDelegate();
delegate_->OnBeforeNetworkStart(this, defer); {
// TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is
// fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"423948 URLRequest::Delegate::OnBeforeNetworkStart"));
delegate_->OnBeforeNetworkStart(this, defer);
}
if (!*defer) if (!*defer)
OnCallToDelegateComplete(); OnCallToDelegateComplete();
notified_before_network_start_ = true; notified_before_network_start_ = true;
...@@ -881,6 +894,11 @@ void URLRequest::NotifyResponseStarted() { ...@@ -881,6 +894,11 @@ void URLRequest::NotifyResponseStarted() {
NotifyRequestCompleted(); NotifyRequestCompleted();
OnCallToDelegate(); OnCallToDelegate();
// TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is
// fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"423948 URLRequest::Delegate::OnResponseStarted"));
delegate_->OnResponseStarted(this); delegate_->OnResponseStarted(this);
// Nothing may appear below this line as OnResponseStarted may delete // Nothing may appear below this line as OnResponseStarted may delete
// |this|. // |this|.
...@@ -1097,8 +1115,14 @@ void URLRequest::NotifyAuthRequiredComplete( ...@@ -1097,8 +1115,14 @@ void URLRequest::NotifyAuthRequiredComplete(
case NetworkDelegate::AUTH_REQUIRED_RESPONSE_NO_ACTION: case NetworkDelegate::AUTH_REQUIRED_RESPONSE_NO_ACTION:
// Defer to the URLRequest::Delegate, since the NetworkDelegate // Defer to the URLRequest::Delegate, since the NetworkDelegate
// didn't take an action. // didn't take an action.
if (delegate_) if (delegate_) {
// TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is
// fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"423948 URLRequest::Delegate::OnAuthRequired"));
delegate_->OnAuthRequired(this, auth_info.get()); delegate_->OnAuthRequired(this, auth_info.get());
}
break; break;
case NetworkDelegate::AUTH_REQUIRED_RESPONSE_SET_AUTH: case NetworkDelegate::AUTH_REQUIRED_RESPONSE_SET_AUTH:
...@@ -1117,14 +1141,24 @@ void URLRequest::NotifyAuthRequiredComplete( ...@@ -1117,14 +1141,24 @@ void URLRequest::NotifyAuthRequiredComplete(
void URLRequest::NotifyCertificateRequested( void URLRequest::NotifyCertificateRequested(
SSLCertRequestInfo* cert_request_info) { SSLCertRequestInfo* cert_request_info) {
if (delegate_) if (delegate_) {
// TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"423948 URLRequest::Delegate::OnCertificateRequested"));
delegate_->OnCertificateRequested(this, cert_request_info); delegate_->OnCertificateRequested(this, cert_request_info);
}
} }
void URLRequest::NotifySSLCertificateError(const SSLInfo& ssl_info, void URLRequest::NotifySSLCertificateError(const SSLInfo& ssl_info,
bool fatal) { bool fatal) {
if (delegate_) if (delegate_) {
// TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"423948 URLRequest::Delegate::OnSSLCertificateError"));
delegate_->OnSSLCertificateError(this, ssl_info, fatal); delegate_->OnSSLCertificateError(this, ssl_info, fatal);
}
} }
bool URLRequest::CanGetCookies(const CookieList& cookie_list) const { bool URLRequest::CanGetCookies(const CookieList& cookie_list) const {
...@@ -1165,8 +1199,13 @@ void URLRequest::NotifyReadCompleted(int bytes_read) { ...@@ -1165,8 +1199,13 @@ void URLRequest::NotifyReadCompleted(int bytes_read) {
if (bytes_read > 0 && !was_cached()) if (bytes_read > 0 && !was_cached())
NetworkChangeNotifier::NotifyDataReceived(*this, bytes_read); NetworkChangeNotifier::NotifyDataReceived(*this, bytes_read);
if (delegate_) if (delegate_) {
// TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"423948 URLRequest::Delegate::OnReadCompleted"));
delegate_->OnReadCompleted(this, bytes_read); delegate_->OnReadCompleted(this, bytes_read);
}
// Nothing below this line as OnReadCompleted may delete |this|. // Nothing below this line as OnReadCompleted may delete |this|.
} }
......
net/url_request/url_request_job.cc
View file @ 844c1557
...@@ -326,19 +326,45 @@ void URLRequestJob::NotifyHeadersComplete() { ...@@ -326,19 +326,45 @@ void URLRequestJob::NotifyHeadersComplete() {
// survival until we can get out of this method. // survival until we can get out of this method.
scoped_refptr<URLRequestJob> self_preservation(this); scoped_refptr<URLRequestJob> self_preservation(this);
if (request_) if (request_) {
// TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
tracked_objects::ScopedTracker tracking_profile1(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"423948 URLRequestJob::NotifyHeadersComplete 1"));
request_->OnHeadersComplete(); request_->OnHeadersComplete();
}
// TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
tracked_objects::ScopedTracker tracking_profile2(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"423948 URLRequestJob::NotifyHeadersComplete 2"));
GURL new_location; GURL new_location;
int http_status_code; int http_status_code;
if (IsRedirectResponse(&new_location, &http_status_code)) { if (IsRedirectResponse(&new_location, &http_status_code)) {
// TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
tracked_objects::ScopedTracker tracking_profile3(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"423948 URLRequestJob::NotifyHeadersComplete 3"));
// Redirect response bodies are not read. Notify the transaction // Redirect response bodies are not read. Notify the transaction
// so it does not treat being stopped as an error. // so it does not treat being stopped as an error.
DoneReadingRedirectResponse(); DoneReadingRedirectResponse();
// TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
tracked_objects::ScopedTracker tracking_profile4(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"423948 URLRequestJob::NotifyHeadersComplete 4"));
RedirectInfo redirect_info = RedirectInfo redirect_info =
ComputeRedirectInfo(new_location, http_status_code); ComputeRedirectInfo(new_location, http_status_code);
// TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
tracked_objects::ScopedTracker tracking_profile5(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"423948 URLRequestJob::NotifyHeadersComplete 5"));
bool defer_redirect = false; bool defer_redirect = false;
request_->NotifyReceivedRedirect(redirect_info, &defer_redirect); request_->NotifyReceivedRedirect(redirect_info, &defer_redirect);
...@@ -347,6 +373,11 @@ void URLRequestJob::NotifyHeadersComplete() { ...@@ -347,6 +373,11 @@ void URLRequestJob::NotifyHeadersComplete() {
if (!request_ || !request_->has_delegate()) if (!request_ || !request_->has_delegate())
return; return;
// TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
tracked_objects::ScopedTracker tracking_profile6(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"423948 URLRequestJob::NotifyHeadersComplete 6"));
// If we were not cancelled, then maybe follow the redirect. // If we were not cancelled, then maybe follow the redirect.
if (request_->status().is_success()) { if (request_->status().is_success()) {
if (defer_redirect) { if (defer_redirect) {
...@@ -357,8 +388,19 @@ void URLRequestJob::NotifyHeadersComplete() { ...@@ -357,8 +388,19 @@ void URLRequestJob::NotifyHeadersComplete() {
return; return;
} }
} else if (NeedsAuth()) { } else if (NeedsAuth()) {
// TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
tracked_objects::ScopedTracker tracking_profile7(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"423948 URLRequestJob::NotifyHeadersComplete 7"));
scoped_refptr<AuthChallengeInfo> auth_info; scoped_refptr<AuthChallengeInfo> auth_info;
GetAuthChallengeInfo(&auth_info); GetAuthChallengeInfo(&auth_info);
// TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
tracked_objects::ScopedTracker tracking_profile8(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"423948 URLRequestJob::NotifyHeadersComplete 8"));
// Need to check for a NULL auth_info because the server may have failed // Need to check for a NULL auth_info because the server may have failed
// to send a challenge with the 401 response. // to send a challenge with the 401 response.
if (auth_info.get()) { if (auth_info.get()) {
...@@ -368,6 +410,11 @@ void URLRequestJob::NotifyHeadersComplete() { ...@@ -368,6 +410,11 @@ void URLRequestJob::NotifyHeadersComplete() {
} }
} }
// TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
tracked_objects::ScopedTracker tracking_profile9(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"423948 URLRequestJob::NotifyHeadersComplete 9"));
has_handled_response_ = true; has_handled_response_ = true;
if (request_->status().is_success()) if (request_->status().is_success())
filter_.reset(SetupFilter()); filter_.reset(SetupFilter());
...@@ -379,6 +426,11 @@ void URLRequestJob::NotifyHeadersComplete() { ...@@ -379,6 +426,11 @@ void URLRequestJob::NotifyHeadersComplete() {
base::StringToInt64(content_length, &expected_content_size_); base::StringToInt64(content_length, &expected_content_size_);
} }
// TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
tracked_objects::ScopedTracker tracking_profile10(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"423948 URLRequestJob::NotifyHeadersComplete 10"));
request_->NotifyResponseStarted(); request_->NotifyResponseStarted();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment