diff options
| author | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-26 23:10:10 +0000 |
|---|---|---|
| committer | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-26 23:10:10 +0000 |
| commit | f8f951d1535968dbfe3a558b0857dde0b5de8850 (patch) | |
| tree | b8629d6ad3219e57011ae0340ef725e9f8005447 /net/spdy/spdy_session.cc | |
| parent | abed3c4500a80450285a7b61038e54cc5badf75e (diff) | |
| download | chromium_src-f8f951d1535968dbfe3a558b0857dde0b5de8850.zip chromium_src-f8f951d1535968dbfe3a558b0857dde0b5de8850.tar.gz chromium_src-f8f951d1535968dbfe3a558b0857dde0b5de8850.tar.bz2 | |
Reverting this feature, once again. *sigh*
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/9809033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129034 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy/spdy_session.cc')
| -rw-r--r-- | net/spdy/spdy_session.cc | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc index 63e6744..412294a 100644 --- a/net/spdy/spdy_session.cc +++ b/net/spdy/spdy_session.cc @@ -421,7 +421,6 @@ net::Error SpdySession::InitializeWithSocket( state_ = CONNECTED; connection_.reset(connection); - connection_->AddLayeredPool(this); is_secure_ = is_secure; certificate_error_code_ = certificate_error_code; @@ -1219,18 +1218,6 @@ int SpdySession::GetLocalAddress(IPEndPoint* address) const { return connection_->socket()->GetLocalAddress(address); } -bool SpdySession::CloseOneIdleConnection() { - if (spdy_session_pool_ && num_active_streams() == 0) { - bool ret = HasOneRef(); - // Will remove a reference to this. - RemoveFromPool(); - // Since the underlying socket is only returned when |this| is destroyed - // we should only return true if RemoveFromPool() removed the last ref. - return ret; - } - return false; -} - void SpdySession::ActivateStream(SpdyStream* stream) { const SpdyStreamId id = stream->stream_id(); DCHECK(!IsStreamActive(id)); |