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

Side by Side Diff: net/socket/transport_client_socket_pool.cc

Issue 2533953005: Standardize "net" category trace events (Closed)
Patch Set: self review Created 4 years 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/socket/transport_client_socket_pool.h" 5 #include "net/socket/transport_client_socket_pool.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
13 #include "base/metrics/histogram_macros.h" 13 #include "base/metrics/histogram_macros.h"
14 #include "base/profiler/scoped_tracker.h" 14 #include "base/profiler/scoped_tracker.h"
15 #include "base/strings/string_util.h" 15 #include "base/strings/string_util.h"
16 #include "base/synchronization/lock.h" 16 #include "base/synchronization/lock.h"
17 #include "base/time/time.h" 17 #include "base/time/time.h"
18 #include "base/trace_event/trace_event.h" 18 #include "base/trace_event/trace_event.h"
19 #include "base/values.h" 19 #include "base/values.h"
20 #include "net/base/ip_endpoint.h" 20 #include "net/base/ip_endpoint.h"
21 #include "net/base/net_errors.h" 21 #include "net/base/net_errors.h"
22 #include "net/log/net_log.h" 22 #include "net/log/net_log.h"
23 #include "net/log/net_log_event_type.h" 23 #include "net/log/net_log_event_type.h"
24 #include "net/log/net_log_source_type.h" 24 #include "net/log/net_log_source_type.h"
25 #include "net/log/net_log_with_source.h" 25 #include "net/log/net_log_with_source.h"
26 #include "net/log/trace_constants.h"
26 #include "net/socket/client_socket_factory.h" 27 #include "net/socket/client_socket_factory.h"
27 #include "net/socket/client_socket_handle.h" 28 #include "net/socket/client_socket_handle.h"
28 #include "net/socket/client_socket_pool_base.h" 29 #include "net/socket/client_socket_pool_base.h"
29 #include "net/socket/socket_net_log_params.h" 30 #include "net/socket/socket_net_log_params.h"
30 #include "net/socket/socket_performance_watcher.h" 31 #include "net/socket/socket_performance_watcher.h"
31 #include "net/socket/socket_performance_watcher_factory.h" 32 #include "net/socket/socket_performance_watcher_factory.h"
32 #include "net/socket/tcp_client_socket.h" 33 #include "net/socket/tcp_client_socket.h"
33 34
34 using base::TimeDelta; 35 using base::TimeDelta;
35 36
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 next_state_ = STATE_RESOLVE_HOST_COMPLETE; 261 next_state_ = STATE_RESOLVE_HOST_COMPLETE;
261 connect_timing_.dns_start = base::TimeTicks::Now(); 262 connect_timing_.dns_start = base::TimeTicks::Now();
262 263
263 return resolver_->Resolve( 264 return resolver_->Resolve(
264 params_->destination(), priority(), &addresses_, 265 params_->destination(), priority(), &addresses_,
265 base::Bind(&TransportConnectJob::OnIOComplete, base::Unretained(this)), 266 base::Bind(&TransportConnectJob::OnIOComplete, base::Unretained(this)),
266 &request_, net_log()); 267 &request_, net_log());
267 } 268 }
268 269
269 int TransportConnectJob::DoResolveHostComplete(int result) { 270 int TransportConnectJob::DoResolveHostComplete(int result) {
270 TRACE_EVENT0("net", "TransportConnectJob::DoResolveHostComplete"); 271 TRACE_EVENT0(kNetTracingCategory,
272 "TransportConnectJob::DoResolveHostComplete");
271 connect_timing_.dns_end = base::TimeTicks::Now(); 273 connect_timing_.dns_end = base::TimeTicks::Now();
272 // Overwrite connection start time, since for connections that do not go 274 // Overwrite connection start time, since for connections that do not go
273 // through proxies, |connect_start| should not include dns lookup time. 275 // through proxies, |connect_start| should not include dns lookup time.
274 connect_timing_.connect_start = connect_timing_.dns_end; 276 connect_timing_.connect_start = connect_timing_.dns_end;
275 resolve_result_ = result; 277 resolve_result_ = result;
276 278
277 if (result != OK) 279 if (result != OK)
278 return result; 280 return result;
279 281
280 // Invoke callback, and abort if it fails. 282 // Invoke callback, and abort if it fails.
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
594 HigherLayeredPool* higher_pool) { 596 HigherLayeredPool* higher_pool) {
595 base_.AddHigherLayeredPool(higher_pool); 597 base_.AddHigherLayeredPool(higher_pool);
596 } 598 }
597 599
598 void TransportClientSocketPool::RemoveHigherLayeredPool( 600 void TransportClientSocketPool::RemoveHigherLayeredPool(
599 HigherLayeredPool* higher_pool) { 601 HigherLayeredPool* higher_pool) {
600 base_.RemoveHigherLayeredPool(higher_pool); 602 base_.RemoveHigherLayeredPool(higher_pool);
601 } 603 }
602 604
603 } // namespace net 605 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698