From cb8a5468be6eb5072a8e9173b554448c0d06e111 Mon Sep 17 00:00:00 2001 From: "willchan@chromium.org" Date: Wed, 30 Nov 2011 04:57:26 +0000 Subject: Close idle connections / SPDY sessions when needed. Due to the idle connection state being held by different socket pools, it's possible for one socket pool to hold an idle socket in a lower layer socket pool. From the lower level socket pool's perspective, the socket is being "actively" used. From the higher socket pool's (including SpdySession, which is more of a connection manager) perspective, the connection is idle and can be closed if we have hit a limit. Normally this isn't a big deal, except when we have a lot of idle SPDY connections and are connecting via a proxy, so we have low connection limits through the proxy server. We address this problem by allowing lower-level socket pools to tell higher level socket pools to close a socket. BUG=62364,92244 TEST=none Review URL: http://codereview.chromium.org/8340012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112130 0039d316-1c4b-4281-b951-d872f2087c98 --- net/socket/ssl_client_socket_pool.h | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'net/socket/ssl_client_socket_pool.h') diff --git a/net/socket/ssl_client_socket_pool.h b/net/socket/ssl_client_socket_pool.h index 3305a6f..ac5c22b7 100644 --- a/net/socket/ssl_client_socket_pool.h +++ b/net/socket/ssl_client_socket_pool.h @@ -167,6 +167,7 @@ class SSLConnectJob : public ConnectJob { class NET_EXPORT_PRIVATE SSLClientSocketPool : public ClientSocketPool, + public LayeredPool, public SSLConfigService::Observer { public: // Only the pools that will be used are required. i.e. if you never @@ -212,6 +213,8 @@ class NET_EXPORT_PRIVATE SSLClientSocketPool virtual void Flush() OVERRIDE; + virtual bool IsStalled() const OVERRIDE; + virtual void CloseIdleSockets() OVERRIDE; virtual int IdleSocketCount() const OVERRIDE; @@ -223,6 +226,10 @@ class NET_EXPORT_PRIVATE SSLClientSocketPool const std::string& group_name, const ClientSocketHandle* handle) const OVERRIDE; + virtual void AddLayeredPool(LayeredPool* layered_pool) OVERRIDE; + + virtual void RemoveLayeredPool(LayeredPool* layered_pool) OVERRIDE; + virtual base::DictionaryValue* GetInfoAsValue( const std::string& name, const std::string& type, @@ -232,6 +239,9 @@ class NET_EXPORT_PRIVATE SSLClientSocketPool virtual ClientSocketPoolHistograms* histograms() const OVERRIDE; + // LayeredPool methods: + virtual bool CloseOneIdleConnection() OVERRIDE; + private: typedef ClientSocketPoolBase PoolBase; -- cgit v1.1