diff options
author | Peter Kasting <pkasting@google.com> | 2015-02-05 13:43:27 -0800 |
---|---|---|
committer | Peter Kasting <pkasting@google.com> | 2015-02-05 21:45:28 +0000 |
commit | 650180680cc05b5771628d502bc6803a1d8997ad (patch) | |
tree | 54f97d086ed1ffd10574926b498330016f2bfec9 | |
parent | 7fcb729df6369250da0eccb113a64073e272de39 (diff) | |
download | chromium_src-650180680cc05b5771628d502bc6803a1d8997ad.zip chromium_src-650180680cc05b5771628d502bc6803a1d8997ad.tar.gz chromium_src-650180680cc05b5771628d502bc6803a1d8997ad.tar.bz2 |
Adding instrumentation to locate the source of jankiness.
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.
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.
This also updates the existing instrumentation for bug 418183 to include the bug
number everywhere.
BUG=418183,455423,455434,455469
TEST=none
R=vadimt@chromium.org
TBR=jochen, mmenke, rockot, thestig
Review URL: https://codereview.chromium.org/901773002
Cr-Commit-Position: refs/heads/master@{#314885}
20 files changed, 104 insertions, 23 deletions
diff --git a/base/files/file_path_watcher_win.cc b/base/files/file_path_watcher_win.cc index 73f9cfb..63e5480 100644 --- a/base/files/file_path_watcher_win.cc +++ b/base/files/file_path_watcher_win.cc @@ -149,7 +149,8 @@ void FilePathWatcherImpl::WillDestroyCurrentMessageLoop() { void FilePathWatcherImpl::OnObjectSignaled(HANDLE object) { // TODO(vadimt): Remove ScopedTracker below once crbug.com/418183 is fixed. tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION("FilePathWatcherImpl_OnObjectSignaled")); + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "418183 FilePathWatcherImpl::OnObjectSignaled")); DCHECK(object == handle_); // Make sure we stay alive through the body of this function. diff --git a/base/process/kill_win.cc b/base/process/kill_win.cc index 0a0c99c..4d7225f 100644 --- a/base/process/kill_win.cc +++ b/base/process/kill_win.cc @@ -73,7 +73,8 @@ void TimerExpiredTask::TimedOut() { void TimerExpiredTask::OnObjectSignaled(HANDLE object) { // TODO(vadimt): Remove ScopedTracker below once crbug.com/418183 is fixed. tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION("TimerExpiredTask_OnObjectSignaled")); + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "418183 TimerExpiredTask::OnObjectSignaled")); process_.Close(); } diff --git a/base/synchronization/waitable_event_watcher_win.cc b/base/synchronization/waitable_event_watcher_win.cc index f5218f1..a04a435 100644 --- a/base/synchronization/waitable_event_watcher_win.cc +++ b/base/synchronization/waitable_event_watcher_win.cc @@ -39,7 +39,8 @@ WaitableEvent* WaitableEventWatcher::GetWatchedEvent() { void WaitableEventWatcher::OnObjectSignaled(HANDLE h) { // TODO(vadimt): Remove ScopedTracker below once crbug.com/418183 is fixed. tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION("WaitableEventWatche_OnObjectSignaled")); + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "418183 WaitableEventWatcher::OnObjectSignaled")); WaitableEvent* event = event_; EventCallback callback = callback_; diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc index 358cfa2..04690dc 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc @@ -15,6 +15,7 @@ #include "base/path_service.h" #include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_service.h" +#include "base/profiler/scoped_tracker.h" #include "base/stl_util.h" #include "base/strings/string_util.h" #include "base/threading/thread.h" @@ -462,18 +463,34 @@ void SafeBrowsingService::StartOnIOThread( return; enabled_ = true; + // TODO(pkasting): Remove ScopedTracker below once crbug.com/455469 is fixed. + tracked_objects::ScopedTracker tracking_profile1( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "455469 SafeBrowsingService::GetProtocolConfig")); SafeBrowsingProtocolConfig config = GetProtocolConfig(); #if defined(FULL_SAFE_BROWSING) + // TODO(pkasting): Remove ScopedTracker below once crbug.com/455469 is fixed. + tracked_objects::ScopedTracker tracking_profile2( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "455469 SafeBrowsingDatabaseManager::StartOnIOThread")); DCHECK(database_manager_.get()); database_manager_->StartOnIOThread(); + // TODO(pkasting): Remove ScopedTracker below once crbug.com/455469 is fixed. + tracked_objects::ScopedTracker tracking_profile3( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "455469 SafeBrowsingProtocolManager::Create")); DCHECK(!protocol_manager_); protocol_manager_ = SafeBrowsingProtocolManager::Create( database_manager_.get(), url_request_context_getter, config); protocol_manager_->Initialize(); #endif + // TODO(pkasting): Remove ScopedTracker below once crbug.com/455469 is fixed. + tracked_objects::ScopedTracker tracking_profile4( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "455469 SafeBrowsingPingManager::Create")); DCHECK(!ping_manager_); ping_manager_ = SafeBrowsingPingManager::Create( url_request_context_getter, config); diff --git a/chrome/common/service_process_util_win.cc b/chrome/common/service_process_util_win.cc index 6800353..b858d70 100644 --- a/chrome/common/service_process_util_win.cc +++ b/chrome/common/service_process_util_win.cc @@ -67,7 +67,7 @@ class ServiceProcessTerminateMonitor // TODO(vadimt): Remove ScopedTracker below once crbug.com/418183 is fixed. tracked_objects::ScopedTracker tracking_profile( FROM_HERE_WITH_EXPLICIT_FUNCTION( - "ServiceProcessTerminateMonitor_OnObjectSignaled")); + "418183 ServiceProcessTerminateMonitor::OnObjectSignaled")); if (!terminate_task_.is_null()) { terminate_task_.Run(); diff --git a/chrome/service/cloud_print/print_system_win.cc b/chrome/service/cloud_print/print_system_win.cc index 2d78735..b9aa994 100644 --- a/chrome/service/cloud_print/print_system_win.cc +++ b/chrome/service/cloud_print/print_system_win.cc @@ -92,7 +92,7 @@ class PrintSystemWatcherWin : public base::win::ObjectWatcher::Delegate { // TODO(vadimt): Remove ScopedTracker below once crbug.com/418183 is fixed. tracked_objects::ScopedTracker tracking_profile( FROM_HERE_WITH_EXPLICIT_FUNCTION( - "PrintSystemWatcherWin_OnObjectSignaled")); + "418183 PrintSystemWatcherWin::OnObjectSignaled")); crash_keys::ScopedPrinterInfo crash_key(printer_info_); DWORD change = 0; diff --git a/components/policy/core/common/policy_loader_win.cc b/components/policy/core/common/policy_loader_win.cc index 2989a36..bfa675c 100644 --- a/components/policy/core/common/policy_loader_win.cc +++ b/components/policy/core/common/policy_loader_win.cc @@ -683,7 +683,8 @@ void PolicyLoaderWin::SetupWatches() { void PolicyLoaderWin::OnObjectSignaled(HANDLE object) { // TODO(vadimt): Remove ScopedTracker below once crbug.com/418183 is fixed. tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION("PolicyLoaderWin_OnObjectSignaled")); + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "418183 PolicyLoaderWin::OnObjectSignaled")); DCHECK(object == user_policy_changed_event_.handle() || object == machine_policy_changed_event_.handle()) diff --git a/content/browser/webui/url_data_manager_backend.cc b/content/browser/webui/url_data_manager_backend.cc index 3bde564..100f3cb 100644 --- a/content/browser/webui/url_data_manager_backend.cc +++ b/content/browser/webui/url_data_manager_backend.cc @@ -337,11 +337,20 @@ void URLRequestChromeJob::DataAvailable(base::RefCountedMemory* bytes) { int bytes_read; if (pending_buf_.get()) { CHECK(pending_buf_->data()); + // TODO(pkasting): Remove ScopedTracker below once crbug.com/455423 is + // fixed. + tracked_objects::ScopedTracker tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "455423 URLRequestChromeJob::CompleteRead")); CompleteRead(pending_buf_.get(), pending_buf_size_, &bytes_read); pending_buf_ = NULL; NotifyReadComplete(bytes_read); } } else { + // TODO(pkasting): Remove ScopedTracker below once crbug.com/455423 is + // fixed. + tracked_objects::ScopedTracker tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION("455423 URLRequestJob::NotifyDone")); // The request failed. NotifyDone(net::URLRequestStatus(net::URLRequestStatus::FAILED, net::ERR_FAILED)); @@ -716,10 +725,14 @@ void URLDataManagerBackend::RemoveRequest(URLRequestChromeJob* job) { void URLDataManagerBackend::DataAvailable(RequestID request_id, base::RefCountedMemory* bytes) { + // TODO(pkasting): Remove ScopedTracker below once crbug.com/455423 is fixed. + tracked_objects::ScopedTracker tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "455423 URLDataManagerBackend::DataAvailable")); // Forward this data on to the pending net::URLRequest, if it exists. PendingRequestMap::iterator i = pending_requests_.find(request_id); if (i != pending_requests_.end()) { - URLRequestChromeJob* job(i->second); + URLRequestChromeJob* job = i->second; pending_requests_.erase(i); job->DataAvailable(bytes); } diff --git a/content/child/web_data_consumer_handle_impl.cc b/content/child/web_data_consumer_handle_impl.cc index a26656e..a310238 100644 --- a/content/child/web_data_consumer_handle_impl.cc +++ b/content/child/web_data_consumer_handle_impl.cc @@ -7,6 +7,7 @@ #include <limits> #include "base/bind.h" #include "base/logging.h" +#include "base/profiler/scoped_tracker.h" #include "third_party/mojo/src/mojo/public/c/system/types.h" namespace content { @@ -109,6 +110,11 @@ Result WebDataConsumerHandleImpl::HandleReadResult(MojoResult mojo_result) { } void WebDataConsumerHandleImpl::OnHandleGotReadable(MojoResult) { + // TODO(pkasting): Remove ScopedTracker below once crbug.com/455434 is + // fixed. + tracked_objects::ScopedTracker tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "455434 WebDataConsumerHandleImpl::OnHandleGotReadable")); DCHECK(client_); client_->didGetReadable(); } diff --git a/content/child/web_url_loader_impl.cc b/content/child/web_url_loader_impl.cc index 1f852bd..adca0da 100644 --- a/content/child/web_url_loader_impl.cc +++ b/content/child/web_url_loader_impl.cc @@ -14,6 +14,7 @@ #include "base/command_line.h" #include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" +#include "base/profiler/scoped_tracker.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_util.h" #include "base/time/time.h" @@ -896,6 +897,11 @@ MojoResult WebURLLoaderImpl::Context::WriteDataOnBodyStream(const char* data, } void WebURLLoaderImpl::Context::OnHandleGotWritable(MojoResult result) { + // TODO(pkasting): Remove ScopedTracker below once crbug.com/455434 is + // fixed. + tracked_objects::ScopedTracker tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "455434 WebURLLoaderImpl::Context::OnHandleGotWritable")); if (result != MOJO_RESULT_OK) { if (client_) { client_->didFail(loader_, diff --git a/device/hid/hid_connection_win.cc b/device/hid/hid_connection_win.cc index a0c8a50..b453c2f 100644 --- a/device/hid/hid_connection_win.cc +++ b/device/hid/hid_connection_win.cc @@ -91,7 +91,8 @@ void PendingHidTransfer::TakeResultFromWindowsAPI(BOOL result) { void PendingHidTransfer::OnObjectSignaled(HANDLE event_handle) { // TODO(vadimt): Remove ScopedTracker below once crbug.com/418183 is fixed. tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION("PendingHidTransfer_OnObjectSignaled")); + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "418183 PendingHidTransfer::OnObjectSignaled")); callback_.Run(this, true); Release(); diff --git a/net/base/network_change_notifier_win.cc b/net/base/network_change_notifier_win.cc index 0512594..03cc4c0 100644 --- a/net/base/network_change_notifier_win.cc +++ b/net/base/network_change_notifier_win.cc @@ -227,7 +227,7 @@ void NetworkChangeNotifierWin::OnObjectSignaled(HANDLE object) { // TODO(vadimt): Remove ScopedTracker below once crbug.com/418183 is fixed. tracked_objects::ScopedTracker tracking_profile( FROM_HERE_WITH_EXPLICIT_FUNCTION( - "NetworkChangeNotifierWin_OnObjectSignaled")); + "418183 NetworkChangeNotifierWin::OnObjectSignaled")); DCHECK(CalledOnValidThread()); DCHECK(is_watching_); diff --git a/net/dns/dns_config_service_win.cc b/net/dns/dns_config_service_win.cc index b0da34e..8d0ac54 100644 --- a/net/dns/dns_config_service_win.cc +++ b/net/dns/dns_config_service_win.cc @@ -312,7 +312,8 @@ class RegistryWatcher : public base::NonThreadSafe { void OnObjectSignaled() { // TODO(vadimt): Remove ScopedTracker below once crbug.com/418183 is fixed. tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION("RegistryWatcher_OnObjectSignaled")); + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "418183 RegistryWatcher::OnObjectSignaled")); DCHECK(CalledOnValidThread()); DCHECK(!callback_.is_null()); diff --git a/net/proxy/proxy_config_service_win.cc b/net/proxy/proxy_config_service_win.cc index 6547659..df9014e 100644 --- a/net/proxy/proxy_config_service_win.cc +++ b/net/proxy/proxy_config_service_win.cc @@ -116,7 +116,7 @@ void ProxyConfigServiceWin::OnObjectSignaled(base::win::RegKey* key) { // TODO(vadimt): Remove ScopedTracker below once crbug.com/418183 is fixed. tracked_objects::ScopedTracker tracking_profile( FROM_HERE_WITH_EXPLICIT_FUNCTION( - "ProxyConfigServiceWin_OnObjectSignaled")); + "418183 ProxyConfigServiceWin::OnObjectSignaled")); // Figure out which registry key signalled this change. RegKeyList::iterator it = diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index 483c5e7..011474f 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -2288,7 +2288,7 @@ void SSLClientSocketNSS::Core::DoReadCallback(int rv) { // TODO(vadimt): Remove ScopedTracker below once crbug.com/418183 is fixed. tracked_objects::ScopedTracker tracking_profile1( FROM_HERE_WITH_EXPLICIT_FUNCTION( - "SSLClientSocketNSS::Core::DoReadCallback")); + "418183 SSLClientSocketNSS::Core::DoReadCallback")); PostOrRunCallback( FROM_HERE, base::Bind(base::ResetAndReturn(&user_read_callback_), rv)); diff --git a/net/socket/stream_listen_socket.cc b/net/socket/stream_listen_socket.cc index abb5fbc..619070d 100644 --- a/net/socket/stream_listen_socket.cc +++ b/net/socket/stream_listen_socket.cc @@ -249,7 +249,8 @@ void StreamListenSocket::UnwatchSocket() { void StreamListenSocket::OnObjectSignaled(HANDLE object) { // TODO(vadimt): Remove ScopedTracker below once crbug.com/418183 is fixed. tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION("StreamListenSocket_OnObjectSignaled")); + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "418183 StreamListenSocket::OnObjectSignaled")); WSANETWORKEVENTS ev; if (kSocketError == WSAEnumNetworkEvents(socket_, socket_event_, &ev)) { diff --git a/net/socket/tcp_client_socket.cc b/net/socket/tcp_client_socket.cc index 8eda581..8e719f0 100644 --- a/net/socket/tcp_client_socket.cc +++ b/net/socket/tcp_client_socket.cc @@ -327,7 +327,7 @@ void TCPClientSocket::DidCompleteReadWrite(const CompletionCallback& callback, // TODO(vadimt): Remove ScopedTracker below once crbug.com/418183 is fixed. tracked_objects::ScopedTracker tracking_profile( FROM_HERE_WITH_EXPLICIT_FUNCTION( - "TCPClientSocket::DidCompleteReadWrite")); + "418183 TCPClientSocket::DidCompleteReadWrite")); callback.Run(result); } diff --git a/net/socket/tcp_socket_win.cc b/net/socket/tcp_socket_win.cc index 0031c63..538c8d7 100644 --- a/net/socket/tcp_socket_win.cc +++ b/net/socket/tcp_socket_win.cc @@ -250,7 +250,7 @@ void TCPSocketWin::Core::ReadDelegate::OnObjectSignaled(HANDLE object) { // TODO(vadimt): Remove ScopedTracker below once crbug.com/418183 is fixed. tracked_objects::ScopedTracker tracking_profile( FROM_HERE_WITH_EXPLICIT_FUNCTION( - "TCPSocketWin_Core_ReadDelegate_OnObjectSignaled")); + "418183 TCPSocketWin::Core::ReadDelegate::OnObjectSignaled")); DCHECK_EQ(object, core_->read_overlapped_.hEvent); if (core_->socket_) { @@ -268,7 +268,7 @@ void TCPSocketWin::Core::WriteDelegate::OnObjectSignaled( // TODO(vadimt): Remove ScopedTracker below once crbug.com/418183 is fixed. tracked_objects::ScopedTracker tracking_profile( FROM_HERE_WITH_EXPLICIT_FUNCTION( - "TCPSocketWin_Core_WriteDelegate_OnObjectSignaled")); + "418183 TCPSocketWin::Core::WriteDelegate::OnObjectSignaled")); DCHECK_EQ(object, core_->write_overlapped_.hEvent); if (core_->socket_) @@ -774,7 +774,8 @@ int TCPSocketWin::AcceptInternal(scoped_ptr<TCPSocketWin>* socket, void TCPSocketWin::OnObjectSignaled(HANDLE object) { // TODO(vadimt): Remove ScopedTracker below once crbug.com/418183 is fixed. tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION("TCPSocketWin_OnObjectSignaled")); + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "418383 TCPSocketWin::OnObjectSignaled")); WSANETWORKEVENTS ev; if (WSAEnumNetworkEvents(socket_, accept_event_, &ev) == SOCKET_ERROR) { @@ -963,6 +964,10 @@ void TCPSocketWin::DidCompleteConnect() { DCHECK(!read_callback_.is_null()); int result; + // TODO(pkasting): Remove ScopedTracker below once crbug.com/418183 is fixed. + tracked_objects::ScopedTracker tracking_profile1( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "418183 TCPSocketWin::DidCompleteConnect1")); WSANETWORKEVENTS events; int rv = WSAEnumNetworkEvents(socket_, core_->read_overlapped_.hEvent, &events); @@ -972,6 +977,11 @@ void TCPSocketWin::DidCompleteConnect() { os_error = WSAGetLastError(); result = MapSystemError(os_error); } else if (events.lNetworkEvents & FD_CONNECT) { + // TODO(pkasting): Remove ScopedTracker below once crbug.com/418183 is + // fixed. + tracked_objects::ScopedTracker tracking_profile2( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "418183 TCPSocketWin::DidCompleteConnect2")); os_error = events.iErrorCode[FD_CONNECT_BIT]; result = MapConnectError(os_error); } else { @@ -979,10 +989,18 @@ void TCPSocketWin::DidCompleteConnect() { result = ERR_UNEXPECTED; } + // TODO(pkasting): Remove ScopedTracker below once crbug.com/418183 is fixed. + tracked_objects::ScopedTracker tracking_profile3( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "418183 TCPSocketWin::DidCompleteConnect3")); connect_os_error_ = os_error; DoConnectComplete(result); waiting_connect_ = false; + // TODO(pkasting): Remove ScopedTracker below once crbug.com/418183 is fixed. + tracked_objects::ScopedTracker tracking_profile4( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "418183 TCPSocketWin::DidCompleteConnect4")); DCHECK_NE(result, ERR_IO_PENDING); base::ResetAndReturn(&read_callback_).Run(result); } @@ -1030,6 +1048,9 @@ void TCPSocketWin::DidSignalRead() { DCHECK(waiting_read_); DCHECK(!read_callback_.is_null()); + // TODO(pkasting): Remove ScopedTracker below once crbug.com/418183 is fixed. + tracked_objects::ScopedTracker tracking_profile1( + FROM_HERE_WITH_EXPLICIT_FUNCTION("418183 TCPSocketWin::DidSignalRead1")); int os_error = 0; WSANETWORKEVENTS network_events; int rv = WSAEnumNetworkEvents(socket_, core_->read_overlapped_.hEvent, @@ -1038,6 +1059,11 @@ void TCPSocketWin::DidSignalRead() { os_error = WSAGetLastError(); rv = MapSystemError(os_error); } else if (network_events.lNetworkEvents) { + // TODO(pkasting): Remove ScopedTracker below once crbug.com/418183 is + // fixed. + tracked_objects::ScopedTracker tracking_profile2( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "418183 TCPSocketWin::DidSignalRead2")); DCHECK_EQ(network_events.lNetworkEvents & ~(FD_READ | FD_CLOSE), 0); // If network_events.lNetworkEvents is FD_CLOSE and // network_events.iErrorCode[FD_CLOSE_BIT] is 0, it is a graceful @@ -1058,6 +1084,11 @@ void TCPSocketWin::DidSignalRead() { if (rv == ERR_IO_PENDING) return; } else { + // TODO(pkasting): Remove ScopedTracker below once crbug.com/418183 is + // fixed. + tracked_objects::ScopedTracker tracking_profile3( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "418183 TCPSocketWin::DidSignalRead3")); // This may happen because Read() may succeed synchronously and // consume all the received data without resetting the event object. core_->WatchForRead(); @@ -1068,10 +1099,10 @@ void TCPSocketWin::DidSignalRead() { core_->read_iobuffer_ = NULL; core_->read_buffer_length_ = 0; - DCHECK_NE(rv, ERR_IO_PENDING); // TODO(vadimt): Remove ScopedTracker below once crbug.com/418183 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION("TCPSocketWin::DidSignalRead")); + tracked_objects::ScopedTracker tracking_profile4( + FROM_HERE_WITH_EXPLICIT_FUNCTION("418183 TCPSocketWin::DidSignalRead4")); + DCHECK_NE(rv, ERR_IO_PENDING); base::ResetAndReturn(&read_callback_).Run(rv); } diff --git a/net/udp/udp_socket_win.cc b/net/udp/udp_socket_win.cc index 3ef3e86..90ce661 100644 --- a/net/udp/udp_socket_win.cc +++ b/net/udp/udp_socket_win.cc @@ -149,7 +149,7 @@ void UDPSocketWin::Core::ReadDelegate::OnObjectSignaled(HANDLE object) { // TODO(vadimt): Remove ScopedTracker below once crbug.com/418183 is fixed. tracked_objects::ScopedTracker tracking_profile( FROM_HERE_WITH_EXPLICIT_FUNCTION( - "UDPSocketWin_Core_ReadDelegate_OnObjectSignaled")); + "418183 UDPSocketWin::Core::ReadDelegate::OnObjectSignaled")); DCHECK_EQ(object, core_->read_overlapped_.hEvent); if (core_->socket_) @@ -162,7 +162,7 @@ void UDPSocketWin::Core::WriteDelegate::OnObjectSignaled(HANDLE object) { // TODO(vadimt): Remove ScopedTracker below once crbug.com/418183 is fixed. tracked_objects::ScopedTracker tracking_profile( FROM_HERE_WITH_EXPLICIT_FUNCTION( - "UDPSocketWin_Core_WriteDelegate_OnObjectSignaled")); + "418183 UDPSocketWin::Core::WriteDelegate::OnObjectSignaled")); DCHECK_EQ(object, core_->write_overlapped_.hEvent); if (core_->socket_) diff --git a/net/url_request/url_request_job.cc b/net/url_request/url_request_job.cc index 2be8a74..3fae14f 100644 --- a/net/url_request/url_request_job.cc +++ b/net/url_request/url_request_job.cc @@ -503,7 +503,8 @@ void URLRequestJob::NotifyHeadersComplete() { void URLRequestJob::NotifyReadComplete(int bytes_read) { // TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed. tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION("URLRequestJob::NotifyReadComplete")); + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "423948 URLRequestJob::NotifyReadComplete")); if (!request_ || !request_->has_delegate()) return; // The request was destroyed, so there is no more work to do. |