summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorpkasting <pkasting@chromium.org>2015-05-01 19:35:26 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-02 02:36:03 +0000
commitde1c4010c241cd0734eca6c827eb7feced350977 (patch)
treec640e638746518760dfa8ca6158929c7c21e7653 /net
parent2e7a8c4e93366cf8a35363f5f43f0c08925c6410 (diff)
downloadchromium_src-de1c4010c241cd0734eca6c827eb7feced350977.zip
chromium_src-de1c4010c241cd0734eca6c827eb7feced350977.tar.gz
chromium_src-de1c4010c241cd0734eca6c827eb7feced350977.tar.bz2
Add more instrumentation for tracking down a jank bug.
BUG=476182 TEST=none TBR=mmenke Review URL: https://codereview.chromium.org/1120163003 Cr-Commit-Position: refs/heads/master@{#328047}
Diffstat (limited to 'net')
-rw-r--r--net/proxy/dhcp_proxy_script_fetcher_win.cc35
1 files changed, 23 insertions, 12 deletions
diff --git a/net/proxy/dhcp_proxy_script_fetcher_win.cc b/net/proxy/dhcp_proxy_script_fetcher_win.cc
index 5d1c37d..b777da5 100644
--- a/net/proxy/dhcp_proxy_script_fetcher_win.cc
+++ b/net/proxy/dhcp_proxy_script_fetcher_win.cc
@@ -76,10 +76,10 @@ DhcpProxyScriptFetcherWin::~DhcpProxyScriptFetcherWin() {
int DhcpProxyScriptFetcherWin::Fetch(base::string16* utf16_text,
const CompletionCallback& callback) {
- // TODO(pkasting): Remove ScopedTracker below once crbug.com/476182 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
+ // TODO(joi): Remove ScopedTracker below once crbug.com/476182 is fixed.
+ tracked_objects::ScopedTracker tracking_profile1(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "476182 DhcpProxyScriptFetcherWin::Fetch"));
+ "476182 DhcpProxyScriptFetcherWin::Fetch 1"));
DCHECK(CalledOnValidThread());
if (state_ != STATE_START && state_ != STATE_DONE) {
@@ -92,6 +92,10 @@ int DhcpProxyScriptFetcherWin::Fetch(base::string16* utf16_text,
destination_string_ = utf16_text;
last_query_ = ImplCreateAdapterQuery();
+ // TODO(joi): Remove ScopedTracker below once crbug.com/476182 is fixed.
+ tracked_objects::ScopedTracker tracking_profile2(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION(
+ "476182 DhcpProxyScriptFetcherWin::Fetch 2"));
GetTaskRunner()->PostTaskAndReply(
FROM_HERE,
base::Bind(
@@ -131,10 +135,11 @@ void DhcpProxyScriptFetcherWin::CancelImpl() {
void DhcpProxyScriptFetcherWin::OnGetCandidateAdapterNamesDone(
scoped_refptr<AdapterQuery> query) {
- // TODO(pkasting): Remove ScopedTracker below once crbug.com/476182 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
+ // TODO(joi): Remove ScopedTracker below once crbug.com/476182 is fixed.
+ tracked_objects::ScopedTracker tracking_profile1(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "476182 DhcpProxyScriptFetcherWin::OnGetCandidateAdapterNamesDone"));
+ "476182 "
+ "DhcpProxyScriptFetcherWin::OnGetCandidateAdapterNamesDone 1"));
DCHECK(CalledOnValidThread());
@@ -154,6 +159,12 @@ void DhcpProxyScriptFetcherWin::OnGetCandidateAdapterNamesDone(
state_ = STATE_NO_RESULTS;
+ // TODO(joi): Remove ScopedTracker below once crbug.com/476182 is fixed.
+ tracked_objects::ScopedTracker tracking_profile2(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION(
+ "476182 "
+ "DhcpProxyScriptFetcherWin::OnGetCandidateAdapterNamesDone 2"));
+
const std::set<std::string>& adapter_names = query->adapter_names();
if (adapter_names.empty()) {
@@ -161,6 +172,12 @@ void DhcpProxyScriptFetcherWin::OnGetCandidateAdapterNamesDone(
return;
}
+ // TODO(joi): Remove ScopedTracker below once crbug.com/476182 is fixed.
+ tracked_objects::ScopedTracker tracking_profile3(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION(
+ "476182 "
+ "DhcpProxyScriptFetcherWin::OnGetCandidateAdapterNamesDone 3"));
+
for (std::set<std::string>::const_iterator it = adapter_names.begin();
it != adapter_names.end();
++it) {
@@ -351,12 +368,6 @@ DhcpProxyScriptFetcherWin::AdapterQuery::AdapterQuery() {
}
void DhcpProxyScriptFetcherWin::AdapterQuery::GetCandidateAdapterNames() {
- // TODO(pkasting): Remove ScopedTracker below once crbug.com/476182 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "476182 DhcpProxyScriptFetcherWin::AdapterQuery::"
- "GetCandidateAdapterNames"));
-
ImplGetCandidateAdapterNames(&adapter_names_);
}