Generalize the net module's LoadLog facility from a passive container, to an event stream (NetLog).

net/socket_stream/socket_stream.cc

 // Copyright (c) 2010 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.
 //
 // TODO(ukai): code is similar with http_network_transaction.cc.  We should
 //   think about ways to share code, if possible.
 
 #include "net/socket_stream/socket_stream.h"
 
 #include <string>
@@ skipping 44 matching lines @@
       ALLOW_THIS_IN_INITIALIZER_LIST(
           write_callback_(this, &SocketStream::OnWriteCompleted)),
       read_buf_(NULL),
       write_buf_(NULL),
       current_write_buf_(NULL),
       write_buf_offset_(0),
       write_buf_size_(0),
       throttle_(
           SocketStreamThrottle::GetSocketStreamThrottleForScheme(
               url.scheme())),
-      metrics_(new SocketStreamMetrics(url)),
-      ALLOW_THIS_IN_INITIALIZER_LIST(
-          request_tracker_node_(this)) {
+      metrics_(new SocketStreamMetrics(url)) {
   DCHECK(MessageLoop::current()) <<
       "The current MessageLoop must exist";
   DCHECK_EQ(MessageLoop::TYPE_IO, MessageLoop::current()->type()) <<
       "The current MessageLoop must be TYPE_IO";
   DCHECK(delegate_);
   DCHECK(throttle_);
 }
 
 SocketStream::~SocketStream() {
   set_context(NULL);
@@ skipping 11 matching lines @@
 void SocketStream::SetUserData(const void* key, UserData* data) {
   user_data_[key] = linked_ptr<UserData>(data);
 }
 
 void SocketStream::set_context(URLRequestContext* context) {
   scoped_refptr<URLRequestContext> prev_context = context_;
 
   context_ = context;
 
   if (prev_context != context) {
-    if (prev_context)
-      prev_context->socket_stream_tracker()->Remove(this);
+    net_log_.AddEvent(NetLog::TYPE_REQUEST_ALIVE);
+    net_log_ = BoundNetLog();
+
     if (context) {
-      if (!load_log_) {
-        // Create the LoadLog -- we waited until now to create it so we know
-        // what constraints the URLRequestContext is enforcing on log levels.
-        load_log_ = context->socket_stream_tracker()->CreateLoadLog();
-      }
-      context->socket_stream_tracker()->Add(this);
+      net_log_ = BoundNetLog::Make(
+          context->net_log(),
+          NetLog::SOURCE_SOCKET_STREAM);
+
+      net_log_.BeginEventWithString(NetLog::TYPE_REQUEST_ALIVE,
+                                    url_.possibly_invalid_spec());
     }
   }
 
   if (context_) {
     host_resolver_ = context_->host_resolver();
     http_auth_handler_factory_ = context_->http_auth_handler_factory();
   }
 }
 
 void SocketStream::Connect() {
   DCHECK(MessageLoop::current()) <<
       "The current MessageLoop must exist";
   DCHECK_EQ(MessageLoop::TYPE_IO, MessageLoop::current()->type()) <<
       "The current MessageLoop must be TYPE_IO";
   if (context_)
     ssl_config_service()->GetSSLConfig(&ssl_config_);
   DCHECK_EQ(next_state_, STATE_NONE);
 
   AddRef();  // Released in Finish()
   // Open a connection asynchronously, so that delegate won't be called
   // back before returning Connect().
   next_state_ = STATE_RESOLVE_PROXY;
-  LoadLog::BeginEvent(load_log_, LoadLog::TYPE_SOCKET_STREAM_CONNECT);
+  net_log_.BeginEvent(NetLog::TYPE_SOCKET_STREAM_CONNECT);
   MessageLoop::current()->PostTask(
       FROM_HERE,
       NewRunnableMethod(this, &SocketStream::DoLoop, OK));
 }
 
 bool SocketStream::SendData(const char* data, int len) {
   DCHECK(MessageLoop::current()) <<
       "The current MessageLoop must exist";
   DCHECK_EQ(MessageLoop::TYPE_IO, MessageLoop::current()->type()) <<
       "The current MessageLoop must be TYPE_IO";
@@ skipping 65 matching lines @@
 
   MessageLoop::current()->PostTask(
       FROM_HERE,
       NewRunnableMethod(this, &SocketStream::DoRestartWithAuth));
 }
 
 void SocketStream::DetachDelegate() {
   if (!delegate_)
     return;
   delegate_ = NULL;
-  LoadLog::AddEvent(load_log_, LoadLog::TYPE_CANCELLED);
+  net_log_.AddEvent(NetLog::TYPE_CANCELLED);
   Close();
 }
 
 void SocketStream::Finish(int result) {
   DCHECK(MessageLoop::current()) <<
       "The current MessageLoop must exist";
   DCHECK_EQ(MessageLoop::TYPE_IO, MessageLoop::current()->type()) <<
       "The current MessageLoop must be TYPE_IO";
   DCHECK_LE(result, OK);
   if (result == OK)
@@ skipping 29 matching lines @@
 }
 
 int SocketStream::DidEstablishConnection() {
   if (!socket_.get() || !socket_->IsConnected()) {
     next_state_ = STATE_CLOSE;
     return ERR_CONNECTION_FAILED;
   }
   next_state_ = STATE_READ_WRITE;
   metrics_->OnConnected();
 
-  LoadLog::EndEvent(load_log_, LoadLog::TYPE_SOCKET_STREAM_CONNECT);
+  net_log_.EndEvent(NetLog::TYPE_SOCKET_STREAM_CONNECT);
   if (delegate_)
     delegate_->OnConnected(this, max_pending_send_allowed_);
 
   return OK;
 }
 
 int SocketStream::DidReceiveData(int result) {
   DCHECK(read_buf_);
   DCHECK_GT(result, 0);
-  LoadLog::AddEvent(load_log_, LoadLog::TYPE_SOCKET_STREAM_RECEIVED);
+  net_log_.AddEvent(NetLog::TYPE_SOCKET_STREAM_RECEIVED);
   int len = result;
   metrics_->OnRead(len);
   result = throttle_->OnRead(this, read_buf_->data(), len, &io_callback_);
   if (delegate_) {
     // Notify recevied data to delegate.
     delegate_->OnReceivedData(this, read_buf_->data(), len);
   }
   read_buf_ = NULL;
   return result;
 }
 
 int SocketStream::DidSendData(int result) {
   DCHECK_GT(result, 0);
-  LoadLog::AddEvent(load_log_, LoadLog::TYPE_SOCKET_STREAM_SENT);
+  net_log_.AddEvent(NetLog::TYPE_SOCKET_STREAM_SENT);
   int len = result;
   metrics_->OnWrite(len);
   result = throttle_->OnWrite(this, current_write_buf_->data(), len,
                               &io_callback_);
   current_write_buf_ = NULL;
   if (delegate_)
     delegate_->OnSentData(this, len);
 
   int remaining_size = write_buf_size_ - write_buf_offset_ - len;
   if (remaining_size == 0) {
@@ skipping 103 matching lines @@
         return;
       default:
         NOTREACHED() << "bad state";
         Finish(result);
         return;
     }
     // If the connection is not established yet and had actual errors,
     // close the connection.
     if (state != STATE_READ_WRITE && result < ERR_IO_PENDING) {
       DCHECK_EQ(next_state_, STATE_CLOSE);
-      LoadLog::EndEvent(load_log_, LoadLog::TYPE_SOCKET_STREAM_CONNECT);
+      net_log_.EndEvent(NetLog::TYPE_SOCKET_STREAM_CONNECT);
     }
   } while (result != ERR_IO_PENDING);
 }
 
 int SocketStream::DoResolveProxy() {
   DCHECK(!pac_request_);
   next_state_ = STATE_RESOLVE_PROXY_COMPLETE;
 
   if (!proxy_url_.is_valid()) {
     next_state_ = STATE_CLOSE;
     return ERR_INVALID_ARGUMENT;
   }
 
   return proxy_service()->ResolveProxy(
-      proxy_url_, &proxy_info_, &io_callback_, &pac_request_, load_log_);
+      proxy_url_, &proxy_info_, &io_callback_, &pac_request_, net_log_);
 }
 
 int SocketStream::DoResolveProxyComplete(int result) {
   next_state_ = STATE_RESOLVE_HOST;
 
   pac_request_ = NULL;
   if (result != OK) {
     LOG(ERROR) << "Failed to resolve proxy: " << result;
     if (delegate_)
       delegate_->OnError(this, result);
@@ skipping 38 matching lines @@
   } else {
     host = url_.HostNoBrackets();
     port = url_.EffectiveIntPort();
   }
 
   HostResolver::RequestInfo resolve_info(host, port);
 
   DCHECK(host_resolver_.get());
   resolver_.reset(new SingleRequestHostResolver(host_resolver_.get()));
   return resolver_->Resolve(resolve_info, &addresses_, &io_callback_,
-                            load_log_);
+                            net_log_);
 }
 
 int SocketStream::DoResolveHostComplete(int result) {
   if (result == OK) {
     next_state_ = STATE_TCP_CONNECT;
     result = throttle_->OnStartOpenConnection(this, &io_callback_);
     if (result == net::ERR_IO_PENDING)
       metrics_->OnWaitConnection();
   } else {
     next_state_ = STATE_CLOSE;
   }
   // TODO(ukai): if error occured, reconsider proxy after error.
   return result;
 }
 
 int SocketStream::DoTcpConnect() {
   next_state_ = STATE_TCP_CONNECT_COMPLETE;
   DCHECK(factory_);
   socket_.reset(factory_->CreateTCPClientSocket(addresses_));
   metrics_->OnStartConnection();
-  return socket_->Connect(&io_callback_, load_log_);
+  return socket_->Connect(&io_callback_, net_log_);
 }
 
 int SocketStream::DoTcpConnectComplete(int result) {
   // TODO(ukai): if error occured, reconsider proxy after error.
   if (result != OK) {
     next_state_ = STATE_CLOSE;
     return result;
   }
 
   if (proxy_mode_ == kTunnelProxy)
@@ skipping 195 matching lines @@
   ClientSocket* s = socket_.release();
   HostResolver::RequestInfo req_info(url_.HostNoBrackets(),
                                      url_.EffectiveIntPort());
 
   if (proxy_info_.proxy_server().scheme() == ProxyServer::SCHEME_SOCKS5)
     s = new SOCKS5ClientSocket(s, req_info);
   else
     s = new SOCKSClientSocket(s, req_info, host_resolver_.get());
   socket_.reset(s);
   metrics_->OnSOCKSProxy();
-  return socket_->Connect(&io_callback_, load_log_);
+  return socket_->Connect(&io_callback_, net_log_);
 }
 
 int SocketStream::DoSOCKSConnectComplete(int result) {
   DCHECK_EQ(kSOCKSProxy, proxy_mode_);
 
   if (result == OK) {
     if (is_secure())
       next_state_ = STATE_SSL_CONNECT;
     else
       result = DidEstablishConnection();
   } else {
     next_state_ = STATE_CLOSE;
   }
   return result;
 }
 
 int SocketStream::DoSSLConnect() {
   DCHECK(factory_);
   socket_.reset(factory_->CreateSSLClientSocket(
       socket_.release(), url_.HostNoBrackets(), ssl_config_));
   next_state_ = STATE_SSL_CONNECT_COMPLETE;
   metrics_->OnSSLConnection();
-  return socket_->Connect(&io_callback_, load_log_);
+  return socket_->Connect(&io_callback_, net_log_);
 }
 
 int SocketStream::DoSSLConnectComplete(int result) {
   if (IsCertificateError(result)) {
     if (socket_->IsConnectedAndIdle()) {
       result = HandleCertificateError(result);
     } else {
       // SSLClientSocket for Mac will report socket is not connected,
       // if it returns cert verification error.  It didn't perform
       // SSLHandshake yet.
@@ skipping 183 matching lines @@
 }
 
 SSLConfigService* SocketStream::ssl_config_service() const {
   return context_->ssl_config_service();
 }
 
 ProxyService* SocketStream::proxy_service() const {
   return context_->proxy_service();
 }
 
-void SocketStream::GetInfoForTracker(
-    RequestTracker<SocketStream>::RecentRequestInfo* info) const {
-  info->original_url = url_;
-  info->load_log = load_log_;
-}
-
 }  // namespace net