diff options
| author | rtenneti@google.com <rtenneti@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 16:56:59 +0000 |
|---|---|---|
| committer | rtenneti@google.com <rtenneti@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 16:56:59 +0000 |
| commit | d4dfdabaa55cd23291495b46cbf4e538f8a1aa1e (patch) | |
| tree | d48794f80d94c8e01ac3c4725e071c81b43fcfb1 /net/socket/transport_client_socket_pool.h | |
| parent | 18a728de85cf6b020056f380d0e52eac52cb1983 (diff) | |
| download | chromium_src-d4dfdabaa55cd23291495b46cbf4e538f8a1aa1e.zip chromium_src-d4dfdabaa55cd23291495b46cbf4e538f8a1aa1e.tar.gz chromium_src-d4dfdabaa55cd23291495b46cbf4e538f8a1aa1e.tar.bz2 | |
Revert 113305 - Revert 113300 - Revert of 112134 of 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.
Fixed ASAN test failures by removing .Times(1) and .Times(2) from CloseMultipleIdleSocketsHeldByLayeredPoolWhenNeeded unittest (this removes the tests relying on the order of std::set in CloseOneIdleConnectionInLayeredPool). ASAN is prob
ably causing the memory allocator to allocate the pools differently. The std::set is ordered by LayeredPool* which is the address of the LayeredPool (willchan).
Added NET_EXPORT for layered_pool class defintion to fix windows shared compile.
BUG=62364, 92244, 105839
TEST=none
Review URL: http://codereview.chromium.org/8340012
TBR=willchan@chromium.org
Review URL: http://codereview.chromium.org/8745007
TBR=willchan@chromium.org
Review URL: http://codereview.chromium.org/8803019
TBR=rtenneti@chromium.org
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=113305
TBR=willchan@chromium.org
Review URL: http://codereview.chromium.org/8836002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113405 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/transport_client_socket_pool.h')
| -rw-r--r-- | net/socket/transport_client_socket_pool.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/socket/transport_client_socket_pool.h b/net/socket/transport_client_socket_pool.h index 055fae1..e3e6f02 100644 --- a/net/socket/transport_client_socket_pool.h +++ b/net/socket/transport_client_socket_pool.h @@ -165,6 +165,8 @@ class NET_EXPORT_PRIVATE TransportClientSocketPool : public ClientSocketPool { virtual void Flush() OVERRIDE; + virtual bool IsStalled() const OVERRIDE; + virtual void CloseIdleSockets() OVERRIDE; virtual int IdleSocketCount() const OVERRIDE; @@ -176,6 +178,10 @@ class NET_EXPORT_PRIVATE TransportClientSocketPool : public ClientSocketPool { 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, |