diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-30 06:14:42 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-30 06:14:42 +0000 |
| commit | 83e4330078a4f27a90a87e84f5cad95e1af9bb29 (patch) | |
| tree | 31b342a44cbd2c00fadd5736e187c3320de7cbb1 /net/socket/socks_client_socket_pool.h | |
| parent | ad5e75b7b631547499ebded471f8d02b7b91e81c (diff) | |
| download | chromium_src-83e4330078a4f27a90a87e84f5cad95e1af9bb29.zip chromium_src-83e4330078a4f27a90a87e84f5cad95e1af9bb29.tar.gz chromium_src-83e4330078a4f27a90a87e84f5cad95e1af9bb29.tar.bz2 | |
Revert 112130 - 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, 105839
TEST=none
Review URL: http://codereview.chromium.org/8340012
TBR=willchan@chromium.org
Review URL: http://codereview.chromium.org/8745007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112134 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/socks_client_socket_pool.h')
| -rw-r--r-- | net/socket/socks_client_socket_pool.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/net/socket/socks_client_socket_pool.h b/net/socket/socks_client_socket_pool.h index 501f3bf..34352b48 100644 --- a/net/socket/socks_client_socket_pool.h +++ b/net/socket/socks_client_socket_pool.h @@ -105,8 +105,7 @@ class SOCKSConnectJob : public ConnectJob { DISALLOW_COPY_AND_ASSIGN(SOCKSConnectJob); }; -class NET_EXPORT_PRIVATE SOCKSClientSocketPool - : public ClientSocketPool, public LayeredPool { +class NET_EXPORT_PRIVATE SOCKSClientSocketPool : public ClientSocketPool { public: SOCKSClientSocketPool( int max_sockets, @@ -140,8 +139,6 @@ class NET_EXPORT_PRIVATE SOCKSClientSocketPool virtual void Flush() OVERRIDE; - virtual bool IsStalled() const OVERRIDE; - virtual void CloseIdleSockets() OVERRIDE; virtual int IdleSocketCount() const OVERRIDE; @@ -153,10 +150,6 @@ class NET_EXPORT_PRIVATE SOCKSClientSocketPool 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, @@ -166,9 +159,6 @@ class NET_EXPORT_PRIVATE SOCKSClientSocketPool virtual ClientSocketPoolHistograms* histograms() const OVERRIDE; - // LayeredPool methods: - virtual bool CloseOneIdleConnection() OVERRIDE; - private: typedef ClientSocketPoolBase<SOCKSSocketParams> PoolBase; |