Rework the logging for sockets/connectjobs.

In particular, make it work better when using backup jobs / late binding (the display was very confused before because of how these asynchronous events would nest).

Also changed the paradigm for how PassiveLogCollector preserves these async associations -- this fixes how it replays the events to net-internals. (Before we would collapse the event streams into the SOURCE_URL_REQUEST which lost some hiearchy.. now I keep the separate streams).

Some of the particular changes to the event streams:

* ConnectJobs now create their own source stream internally.
* Sockets are now bounded by +SOCKET_ALIVE / -SOCKET_ALIVE events (removed the one-off SOCKET_DONE event).
* The socket log streams contains +SOCKET_IN_USE / -SOCKET_IN_USE event blocks to show which URLRequest was controlling it at various points in time (this makes it much easier to understand which read/writes belonged to a particular network transaction when a socket gets re-used).
* ConnectJobs are bounded by +SOCKET_POOL_CONNECT_JOB / - SOCKET_POOL_CONNECT_JOB events.
* ConnectJobs log the net error they failed with.
* Removed the SOCKET_BACKUP_TIMER_EXTENDED event.
Review URL: http://codereview.chromium.org/2363003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48797 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 7 deletions

diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
index dddb223..4301a76 100644
--- a/net/http/http_network_session.cc
+++ b/net/http/http_network_session.cc
@@ -42,7 +42,8 @@ HttpNetworkSession::HttpNetworkSession(
     ClientSocketFactory* client_socket_factory,
     SSLConfigService* ssl_config_service,
     SpdySessionPool* spdy_session_pool,
-    HttpAuthHandlerFactory* http_auth_handler_factory)
+    HttpAuthHandlerFactory* http_auth_handler_factory,
+    NetLog* net_log)
     : network_change_notifier_(network_change_notifier),
       // TODO(vandebo) when we've completely converted to pools, the base TCP
       // pool name should get changed to TCP instead of Transport.
@@ -53,13 +54,15 @@ HttpNetworkSession::HttpNetworkSession(
       socks_pool_histograms_(new ClientSocketPoolHistograms("SOCK")),
       tcp_socket_pool_(new TCPClientSocketPool(
           g_max_sockets, g_max_sockets_per_group, tcp_pool_histograms_,
-          host_resolver, client_socket_factory, network_change_notifier_)),
+          host_resolver, client_socket_factory, network_change_notifier_,
+          net_log)),
       socket_factory_(client_socket_factory),
       host_resolver_(host_resolver),
       proxy_service_(proxy_service),
       ssl_config_service_(ssl_config_service),
       spdy_session_pool_(spdy_session_pool),
-      http_auth_handler_factory_(http_auth_handler_factory) {
+      http_auth_handler_factory_(http_auth_handler_factory),
+      net_log_(net_log) {
   DCHECK(proxy_service);
   DCHECK(ssl_config_service);
 }
@@ -81,7 +84,8 @@ HttpNetworkSession::GetSocketPoolForHTTPProxy(const HostPortPair& http_proxy) {
               new TCPClientSocketPool(
                   g_max_sockets_per_proxy_server, g_max_sockets_per_group,
                   http_proxy_pool_histograms_, host_resolver_, socket_factory_,
-                  network_change_notifier_)));
+                  network_change_notifier_,
+                  net_log_)));
 
   return ret.first->second;
 }
@@ -104,8 +108,9 @@ HttpNetworkSession::GetSocketPoolForSOCKSProxy(
                                           g_max_sockets_per_group,
                                           tcp_for_socks_pool_histograms_,
                                           host_resolver_, socket_factory_,
-                                          network_change_notifier_),
-                  network_change_notifier_)));
+                                          network_change_notifier_,
+                                          net_log_),
+                  network_change_notifier_, net_log_)));
 
   return ret.first->second;
 }
@@ -144,7 +149,8 @@ void HttpNetworkSession::ReplaceTCPSocketPool() {
                                              tcp_pool_histograms_,
                                              host_resolver_,
                                              socket_factory_,
-                                             network_change_notifier_);
+                                             network_change_notifier_,
+                                             net_log_);
 }
 
 }  //  namespace net