diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-02 23:25:19 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-02 23:25:19 +0000 |
| commit | 5a05c47ae2a497d4efbbb9166fa5ff7aebfd4ecf (patch) | |
| tree | 4f39f1f44be3eb179f8368bca0bc18512e398a40 /net/socket/socks_client_socket.cc | |
| parent | f852667f469ea8fd31b8a1dd0f0130382efe591f (diff) | |
| download | chromium_src-5a05c47ae2a497d4efbbb9166fa5ff7aebfd4ecf.zip chromium_src-5a05c47ae2a497d4efbbb9166fa5ff7aebfd4ecf.tar.gz chromium_src-5a05c47ae2a497d4efbbb9166fa5ff7aebfd4ecf.tar.bz2 | |
Add LoadLog to ClientSocket::Connect().
TODO: Use LoadLog in FLIP code.
Review URL: http://codereview.chromium.org/344026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30765 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/socks_client_socket.cc')
| -rw-r--r-- | net/socket/socks_client_socket.cc | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/net/socket/socks_client_socket.cc b/net/socket/socks_client_socket.cc index ace53d9..09c1dbd 100644 --- a/net/socket/socks_client_socket.cc +++ b/net/socket/socks_client_socket.cc @@ -14,6 +14,7 @@ #include "base/compiler_specific.h" #include "base/trace_event.h" #include "net/base/io_buffer.h" +#include "net/base/load_log.h" #include "net/base/net_util.h" namespace net { @@ -83,7 +84,8 @@ SOCKSClientSocket::~SOCKSClientSocket() { Disconnect(); } -int SOCKSClientSocket::Connect(CompletionCallback* callback) { +int SOCKSClientSocket::Connect(CompletionCallback* callback, + LoadLog* load_log) { DCHECK(transport_.get()); DCHECK(transport_->IsConnected()); DCHECK_EQ(STATE_NONE, next_state_); @@ -94,10 +96,17 @@ int SOCKSClientSocket::Connect(CompletionCallback* callback) { return OK; next_state_ = STATE_RESOLVE_HOST; + load_log_ = load_log; + + LoadLog::BeginEvent(load_log, LoadLog::TYPE_SOCKS_CONNECT); int rv = DoLoop(OK); - if (rv == ERR_IO_PENDING) + if (rv == ERR_IO_PENDING) { user_callback_ = callback; + } else { + LoadLog::EndEvent(load_log, LoadLog::TYPE_SOCKS_CONNECT); + load_log_ = NULL; + } return rv; } @@ -159,8 +168,11 @@ void SOCKSClientSocket::DoCallback(int result) { void SOCKSClientSocket::OnIOComplete(int result) { DCHECK_NE(STATE_NONE, next_state_); int rv = DoLoop(result); - if (rv != ERR_IO_PENDING) + if (rv != ERR_IO_PENDING) { + LoadLog::EndEvent(load_log_, LoadLog::TYPE_SOCKS_CONNECT); + load_log_ = NULL; DoCallback(rv); + } } int SOCKSClientSocket::DoLoop(int last_io_result) { @@ -205,7 +217,7 @@ int SOCKSClientSocket::DoResolveHost() { next_state_ = STATE_RESOLVE_HOST_COMPLETE; return host_resolver_.Resolve( - host_request_info_, &addresses_, &io_callback_, NULL); + host_request_info_, &addresses_, &io_callback_, load_log_); } int SOCKSClientSocket::DoResolveHostComplete(int result) { |