Add LoadLog to ClientSocket::Connect().

net/socket/socks5_client_socket.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/socket/socks5_client_socket.h"
 
 #include "base/basictypes.h"
 #include "build/build_config.h"
 #if defined(OS_WIN)
 #include <ws2tcpip.h>
 #elif defined(OS_POSIX)
 #include <netdb.h>
 #endif
 #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 {
 
 const unsigned int SOCKS5ClientSocket::kGreetReadHeaderSize = 2;
 const unsigned int SOCKS5ClientSocket::kWriteHeaderSize = 10;
 const unsigned int SOCKS5ClientSocket::kReadHeaderSize = 5;
 const uint8 SOCKS5ClientSocket::kSOCKS5Version = 0x05;
 const uint8 SOCKS5ClientSocket::kTunnelCommand = 0x01;
 const uint8 SOCKS5ClientSocket::kNullByte = 0x00;
@@ skipping 15 matching lines @@
       bytes_received_(0),
       read_header_size(kReadHeaderSize),
       host_resolver_(host_resolver),
       host_request_info_(req_info) {
 }
 
 SOCKS5ClientSocket::~SOCKS5ClientSocket() {
   Disconnect();
 }
 
-int SOCKS5ClientSocket::Connect(CompletionCallback* callback) {
+int SOCKS5ClientSocket::Connect(CompletionCallback* callback,
+                                LoadLog* load_log) {
   DCHECK(transport_.get());
   DCHECK(transport_->IsConnected());
   DCHECK_EQ(STATE_NONE, next_state_);
   DCHECK(!user_callback_);
 
   // If already connected, then just return OK.
   if (completed_handshake_)
     return OK;
 
   next_state_ = STATE_RESOLVE_HOST;
+  load_log_ = load_log;
+
+  LoadLog::BeginEvent(load_log, LoadLog::TYPE_SOCKS5_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_SOCKS5_CONNECT);
+    load_log_ = NULL;
+  }
   return rv;
 }
 
 void SOCKS5ClientSocket::Disconnect() {
   completed_handshake_ = false;
   transport_->Disconnect();
 }
 
 bool SOCKS5ClientSocket::IsConnected() const {
   return completed_handshake_ && transport_->IsConnected();
@@ skipping 41 matching lines @@
   // clear user_callback_ up front.
   CompletionCallback* c = user_callback_;
   user_callback_ = NULL;
   DLOG(INFO) << "Finished setting up SOCKSv5 handshake";
   c->Run(result);
 }
 
 void SOCKS5ClientSocket::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_SOCKS5_CONNECT);
+    load_log_ = NULL;
     DoCallback(rv);
+  }
 }
 
 int SOCKS5ClientSocket::DoLoop(int last_io_result) {
   DCHECK_NE(next_state_, STATE_NONE);
   int rv = last_io_result;
   do {
     State state = next_state_;
     next_state_ = STATE_NONE;
     switch (state) {
       case STATE_RESOLVE_HOST:
@@ skipping 38 matching lines @@
     }
   } while (rv != ERR_IO_PENDING && next_state_ != STATE_NONE);
   return rv;
 }
 
 int SOCKS5ClientSocket::DoResolveHost() {
   DCHECK_EQ(kEndPointUnresolved, address_type_);
 
   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 SOCKS5ClientSocket::DoResolveHostComplete(int result) {
   DCHECK_EQ(kEndPointUnresolved, address_type_);
 
   bool ok = (result == OK);
   next_state_ = STATE_GREET_WRITE;
   if (ok) {
     DCHECK(addresses_.head());
     struct sockaddr* host_info = addresses_.head()->ai_addr;
@@ skipping 230 matching lines @@
 }
 
 #if defined(OS_LINUX)
 int SOCKS5ClientSocket::GetPeerName(struct sockaddr* name,
                                     socklen_t* namelen) {
   return transport_->GetPeerName(name, namelen);
 }
 #endif
 
 }  // namespace net