summaryrefslogtreecommitdiffstats
path: root/net/http/http_proxy_client_socket_pool.cc
diff options
context:
space:
mode:
authorrtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-07 00:40:01 +0000
committerrtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-07 00:40:01 +0000
commita4f8f99b48afb5daaad7e05919e01dc0715d7a00 (patch)
treefcf29701d05444277d96db9bc232b249e0a0dd14 /net/http/http_proxy_client_socket_pool.cc
parent075a12f065899ff19eac647efad651a79353dbbd (diff)
downloadchromium_src-a4f8f99b48afb5daaad7e05919e01dc0715d7a00.zip
chromium_src-a4f8f99b48afb5daaad7e05919e01dc0715d7a00.tar.gz
chromium_src-a4f8f99b48afb5daaad7e05919e01dc0715d7a00.tar.bz2
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 probably causing the memory allocator to allocate the pools differently. The std::set is ordered by LayeredPool* which is the address of the LayeredPool (willchan). 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 Review URL: http://codereview.chromium.org/8825014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113305 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_proxy_client_socket_pool.cc')
-rw-r--r--net/http/http_proxy_client_socket_pool.cc36
1 files changed, 2 insertions, 34 deletions
diff --git a/net/http/http_proxy_client_socket_pool.cc b/net/http/http_proxy_client_socket_pool.cc
index f7d3206..d4c080f 100644
--- a/net/http/http_proxy_client_socket_pool.cc
+++ b/net/http/http_proxy_client_socket_pool.cc
@@ -391,21 +391,9 @@ HttpProxyClientSocketPool::HttpProxyClientSocketPool(
new HttpProxyConnectJobFactory(transport_pool,
ssl_pool,
host_resolver,
- net_log)) {
- // We should always have a |transport_pool_| except in unit tests.
- if (transport_pool_)
- transport_pool_->AddLayeredPool(this);
- if (ssl_pool_)
- ssl_pool_->AddLayeredPool(this);
-}
+ net_log)) {}
-HttpProxyClientSocketPool::~HttpProxyClientSocketPool() {
- if (ssl_pool_)
- ssl_pool_->RemoveLayeredPool(this);
- // We should always have a |transport_pool_| except in unit tests.
- if (transport_pool_)
- transport_pool_->RemoveLayeredPool(this);
-}
+HttpProxyClientSocketPool::~HttpProxyClientSocketPool() {}
int HttpProxyClientSocketPool::RequestSocket(const std::string& group_name,
const void* socket_params,
@@ -446,12 +434,6 @@ void HttpProxyClientSocketPool::Flush() {
base_.Flush();
}
-bool HttpProxyClientSocketPool::IsStalled() const {
- return base_.IsStalled() ||
- (transport_pool_ && transport_pool_->IsStalled()) ||
- (ssl_pool_ && ssl_pool_->IsStalled());
-}
-
void HttpProxyClientSocketPool::CloseIdleSockets() {
base_.CloseIdleSockets();
}
@@ -470,14 +452,6 @@ LoadState HttpProxyClientSocketPool::GetLoadState(
return base_.GetLoadState(group_name, handle);
}
-void HttpProxyClientSocketPool::AddLayeredPool(LayeredPool* layered_pool) {
- base_.AddLayeredPool(layered_pool);
-}
-
-void HttpProxyClientSocketPool::RemoveLayeredPool(LayeredPool* layered_pool) {
- base_.RemoveLayeredPool(layered_pool);
-}
-
DictionaryValue* HttpProxyClientSocketPool::GetInfoAsValue(
const std::string& name,
const std::string& type,
@@ -508,10 +482,4 @@ ClientSocketPoolHistograms* HttpProxyClientSocketPool::histograms() const {
return base_.histograms();
}
-bool HttpProxyClientSocketPool::CloseOneIdleConnection() {
- if (base_.CloseOneIdleSocket())
- return true;
- return base_.CloseOneIdleConnectionInLayeredPool();
-}
-
} // namespace net