diff options
author | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-06 17:26:40 +0000 |
---|---|---|
committer | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-06 17:26:40 +0000 |
commit | 2c75400ac98ab4d0caae109f6ea8b1dc979aa24a (patch) | |
tree | dfaf46cd3bc537d084489650e18303e0f8bae731 /net/socket/transport_client_socket_pool.cc | |
parent | 7429426bdc631be48434d85191215f5ca6d703f4 (diff) | |
download | chromium_src-2c75400ac98ab4d0caae109f6ea8b1dc979aa24a.zip chromium_src-2c75400ac98ab4d0caae109f6ea8b1dc979aa24a.tar.gz chromium_src-2c75400ac98ab4d0caae109f6ea8b1dc979aa24a.tar.bz2 |
Reverting again ... More crashes, and the instrumentation did not appear to help
Revert 130129 - Revert 129034 - Revert 127893 - Revert 127730 - Revert 127717 - Revert 118788 - Revert 113405 - Revert 113305 - Revert 113300 - Revert 112134 - 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, 109876, 110368, 119847
TEST=
Review URL: http://codereview.chromium.org/9861032
TBR=rch@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10006036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131145 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/transport_client_socket_pool.cc')
-rw-r--r-- | net/socket/transport_client_socket_pool.cc | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/net/socket/transport_client_socket_pool.cc b/net/socket/transport_client_socket_pool.cc index a00e810..d11099f 100644 --- a/net/socket/transport_client_socket_pool.cc +++ b/net/socket/transport_client_socket_pool.cc @@ -449,10 +449,6 @@ void TransportClientSocketPool::Flush() { base_.Flush(); } -bool TransportClientSocketPool::IsStalled() const { - return base_.IsStalled(); -} - void TransportClientSocketPool::CloseIdleSockets() { base_.CloseIdleSockets(); } @@ -471,14 +467,6 @@ LoadState TransportClientSocketPool::GetLoadState( return base_.GetLoadState(group_name, handle); } -void TransportClientSocketPool::AddLayeredPool(LayeredPool* layered_pool) { - base_.AddLayeredPool(layered_pool); -} - -void TransportClientSocketPool::RemoveLayeredPool(LayeredPool* layered_pool) { - base_.RemoveLayeredPool(layered_pool); -} - DictionaryValue* TransportClientSocketPool::GetInfoAsValue( const std::string& name, const std::string& type, |