diff options
| author | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-04 02:33:17 +0000 |
|---|---|---|
| committer | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-04 02:33:17 +0000 |
| commit | e9d7d2582a0c3c717aa8e3b61767e4b25912ebf5 (patch) | |
| tree | 3c2d554922740f4bb5d9b0b57d3313ecd7ed48a4 /net | |
| parent | cf16180876958530faecbc6757c87e670e5d3d5d (diff) | |
| download | chromium_src-e9d7d2582a0c3c717aa8e3b61767e4b25912ebf5.zip chromium_src-e9d7d2582a0c3c717aa8e3b61767e4b25912ebf5.tar.gz chromium_src-e9d7d2582a0c3c717aa8e3b61767e4b25912ebf5.tar.bz2 | |
NetLog: Move the group_name to a CONNECT_JOB's first
event.
This fixes jobs with a SOCKET_BACKUP_CREATED event as the
second event not having a description. Also simplifies
the net-internals code slightly (Or will once backward
compatibility can be removed).
This slightly breaks compatibility of old versions of Chrome
with new log files - CONNECT_JOBs and SOCKETS from newer
versions of Chrome will not have descriptions on M25 or
earlier.
Review URL: https://chromiumcodereview.appspot.com/11583027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175088 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/net_log_event_type_list.h | 6 | ||||
| -rw-r--r-- | net/socket/client_socket_pool_base.cc | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/net/base/net_log_event_type_list.h b/net/base/net_log_event_type_list.h index 54697a2..bbaeacc 100644 --- a/net/base/net_log_event_type_list.h +++ b/net/base/net_log_event_type_list.h @@ -600,15 +600,15 @@ EVENT_TYPE(UDP_SEND_ERROR) // ------------------------------------------------------------------------ // The start/end of a ConnectJob. -EVENT_TYPE(SOCKET_POOL_CONNECT_JOB) - -// The start/end of the ConnectJob::Connect(). // // The BEGIN phase has these parameters: // // { // "group_name": <The group name for the socket request.>, // } +EVENT_TYPE(SOCKET_POOL_CONNECT_JOB) + +// The start/end of the ConnectJob::Connect(). EVENT_TYPE(SOCKET_POOL_CONNECT_JOB_CONNECT) // This event is logged whenever the ConnectJob gets a new socket diff --git a/net/socket/client_socket_pool_base.cc b/net/socket/client_socket_pool_base.cc index 3e9cd82..1c12412 100644 --- a/net/socket/client_socket_pool_base.cc +++ b/net/socket/client_socket_pool_base.cc @@ -77,7 +77,8 @@ ConnectJob::ConnectJob(const std::string& group_name, idle_(true) { DCHECK(!group_name.empty()); DCHECK(delegate); - net_log.BeginEvent(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB); + net_log.BeginEvent(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB, + NetLog::StringCallback("group_name", &group_name_)); } ConnectJob::~ConnectJob() { @@ -125,8 +126,7 @@ void ConnectJob::ResetTimer(base::TimeDelta remaining_time) { } void ConnectJob::LogConnectStart() { - net_log().BeginEvent(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB_CONNECT, - NetLog::StringCallback("group_name", &group_name_)); + net_log().BeginEvent(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB_CONNECT); } void ConnectJob::LogConnectCompletion(int net_error) { |