diff options
| author | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-10 19:19:48 +0000 |
|---|---|---|
| committer | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-10 19:19:48 +0000 |
| commit | 51fdc7c93c7d239c95272b943fe33e17346c079a (patch) | |
| tree | 7a4ace8fe459dcc25dc25b707680a417d939c321 /net/socket/client_socket_pool.cc | |
| parent | 87fd5ab39e79a8ecccf447e4ed3bcc9bcf6da2aa (diff) | |
| download | chromium_src-51fdc7c93c7d239c95272b943fe33e17346c079a.zip chromium_src-51fdc7c93c7d239c95272b943fe33e17346c079a.tar.gz chromium_src-51fdc7c93c7d239c95272b943fe33e17346c079a.tar.bz2 | |
Attempting to re-land a small portion of this change... Simply add links from
lower layer pools to higher layer pool.
Revert 10006036 - 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/10026024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131604 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/client_socket_pool.cc')
| -rw-r--r-- | net/socket/client_socket_pool.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/socket/client_socket_pool.cc b/net/socket/client_socket_pool.cc index a1967ef..0eebd11 100644 --- a/net/socket/client_socket_pool.cc +++ b/net/socket/client_socket_pool.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. |