|
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
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=113300
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+662 lines, -47 lines) |
Patch |
|
M |
net/http/http_network_transaction_unittest.cc
|
View
|
1
2
3
4
5
6
|
1 chunk |
+178 lines, -0 lines |
0 comments
|
Download
|
|
M |
net/http/http_proxy_client_socket_pool.h
|
View
|
1
2
3
4
5
6
|
4 chunks |
+11 lines, -1 line |
0 comments
|
Download
|
|
M |
net/http/http_proxy_client_socket_pool.cc
|
View
|
1
2
3
4
5
6
|
4 chunks |
+34 lines, -2 lines |
0 comments
|
Download
|
|
M |
net/socket/client_socket_handle.h
|
View
|
1
2
3
4
5
6
|
2 chunks |
+5 lines, -0 lines |
0 comments
|
Download
|
|
M |
net/socket/client_socket_handle.cc
|
View
|
1
2
3
4
5
6
|
3 chunks |
+19 lines, -0 lines |
0 comments
|
Download
|
|
M |
net/socket/client_socket_pool.h
|
View
|
1
2
3
4
5
6
|
3 chunks |
+21 lines, -0 lines |
0 comments
|
Download
|
|
M |
net/socket/client_socket_pool_base.h
|
View
|
1
2
3
4
5
6
|
10 chunks |
+38 lines, -9 lines |
0 comments
|
Download
|
|
M |
net/socket/client_socket_pool_base.cc
|
View
|
1
2
3
4
5
6
|
9 chunks |
+68 lines, -13 lines |
0 comments
|
Download
|
|
M |
net/socket/client_socket_pool_base_unittest.cc
|
View
|
1
2
3
4
5
6
|
13 chunks |
+167 lines, -18 lines |
0 comments
|
Download
|
|
M |
net/socket/socks_client_socket_pool.h
|
View
|
1
2
3
4
5
6
|
4 chunks |
+11 lines, -1 line |
0 comments
|
Download
|
|
M |
net/socket/socks_client_socket_pool.cc
|
View
|
1
2
3
4
5
6
|
4 chunks |
+26 lines, -1 line |
0 comments
|
Download
|
|
M |
net/socket/ssl_client_socket_pool.h
|
View
|
1
2
3
4
5
6
|
4 chunks |
+10 lines, -0 lines |
0 comments
|
Download
|
|
M |
net/socket/ssl_client_socket_pool.cc
|
View
|
1
2
3
4
5
6
|
4 chunks |
+33 lines, -0 lines |
0 comments
|
Download
|
|
M |
net/socket/transport_client_socket_pool.h
|
View
|
1
2
3
4
5
6
|
2 chunks |
+6 lines, -0 lines |
0 comments
|
Download
|
|
M |
net/socket/transport_client_socket_pool.cc
|
View
|
1
2
3
4
5
6
|
2 chunks |
+12 lines, -0 lines |
0 comments
|
Download
|
|
M |
net/spdy/spdy_session.h
|
View
|
1
2
3
4
5
6
|
3 chunks |
+6 lines, -1 line |
0 comments
|
Download
|
|
M |
net/spdy/spdy_session.cc
|
View
|
1
2
3
4
5
6
|
3 chunks |
+17 lines, -1 line |
0 comments
|
Download
|
Total messages: 4 (0 generated)
|