Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(71)

Side by Side Diff: net/http/http_network_transaction_spdy3_unittest.cc

Issue 9667016: Close idle connections / SPDY sessions when needed (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reland willchan's patch with eroman's fixes. Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/http/http_network_transaction.h" 5 #include "net/http/http_network_transaction.h"
6 6
7 #include <math.h> // ceil 7 #include <math.h> // ceil
8 #include <stdarg.h> 8 #include <stdarg.h>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 9352 matching lines...) Expand 10 before | Expand all | Expand 10 after
9363 data_writes2, arraysize(data_writes2)); 9363 data_writes2, arraysize(data_writes2));
9364 StaticSocketDataProvider* data[] = { &data1, &data2 }; 9364 StaticSocketDataProvider* data[] = { &data1, &data2 };
9365 9365
9366 SimpleGetHelperResult out = SimpleGetHelperForData(data, arraysize(data)); 9366 SimpleGetHelperResult out = SimpleGetHelperForData(data, arraysize(data));
9367 9367
9368 EXPECT_EQ(OK, out.rv); 9368 EXPECT_EQ(OK, out.rv);
9369 EXPECT_EQ("HTTP/1.0 200 OK", out.status_line); 9369 EXPECT_EQ("HTTP/1.0 200 OK", out.status_line);
9370 EXPECT_EQ("hello world", out.response_data); 9370 EXPECT_EQ("hello world", out.response_data);
9371 } 9371 }
9372 9372
9373 TEST_F(HttpNetworkTransactionSpdy3Test, CloseOldSpdySessionToOpenNewOne) {
9374 HttpStreamFactory::SetNextProtos(SpdyNextProtos());
9375 int old_max_sockets_per_group =
9376 ClientSocketPoolManager::max_sockets_per_group();
9377 int old_max_sockets_per_proxy_server =
9378 ClientSocketPoolManager::max_sockets_per_proxy_server();
9379 int old_max_sockets_per_pool =
9380 ClientSocketPoolManager::max_sockets_per_pool();
9381 ClientSocketPoolManager::set_max_sockets_per_group(1);
9382 ClientSocketPoolManager::set_max_sockets_per_proxy_server(1);
9383 ClientSocketPoolManager::set_max_sockets_per_pool(1);
9384
9385 // Use two different hosts with different IPs so they don't get pooled.
9386 SessionDependencies session_deps;
9387 session_deps.host_resolver->rules()->AddRule("a.com", "10.0.0.1");
9388 session_deps.host_resolver->rules()->AddRule("b.com", "10.0.0.2");
9389 scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps));
9390
9391 SSLSocketDataProvider ssl1(ASYNC, OK);
9392 ssl1.SetNextProto(SSLClientSocket::kProtoSPDY21);
9393 SSLSocketDataProvider ssl2(ASYNC, OK);
9394 ssl2.SetNextProto(SSLClientSocket::kProtoSPDY21);
9395 session_deps.socket_factory.AddSSLSocketDataProvider(&ssl1);
9396 session_deps.socket_factory.AddSSLSocketDataProvider(&ssl2);
9397
9398 scoped_ptr<spdy::SpdyFrame> host1_req(ConstructSpdyGet(
9399 "https://www.a.com", false, 1, LOWEST));
9400 MockWrite spdy1_writes[] = {
9401 CreateMockWrite(*host1_req, 1),
9402 };
9403 scoped_ptr<spdy::SpdyFrame> host1_resp(ConstructSpdyGetSynReply(NULL, 0, 1));
9404 scoped_ptr<spdy::SpdyFrame> host1_resp_body(ConstructSpdyBodyFrame(1, true));
9405 MockRead spdy1_reads[] = {
9406 CreateMockRead(*host1_resp, 2),
9407 CreateMockRead(*host1_resp_body, 3),
9408 MockRead(ASYNC, ERR_IO_PENDING, 4),
9409 };
9410
9411 scoped_ptr<OrderedSocketData> spdy1_data(
9412 new OrderedSocketData(
9413 spdy1_reads, arraysize(spdy1_reads),
9414 spdy1_writes, arraysize(spdy1_writes)));
9415 session_deps.socket_factory.AddSocketDataProvider(spdy1_data.get());
9416
9417 scoped_ptr<spdy::SpdyFrame> host2_req(ConstructSpdyGet(
9418 "https://www.b.com", false, 1, LOWEST));
9419 MockWrite spdy2_writes[] = {
9420 CreateMockWrite(*host2_req, 1),
9421 };
9422 scoped_ptr<spdy::SpdyFrame> host2_resp(ConstructSpdyGetSynReply(NULL, 0, 1));
9423 scoped_ptr<spdy::SpdyFrame> host2_resp_body(ConstructSpdyBodyFrame(1, true));
9424 MockRead spdy2_reads[] = {
9425 CreateMockRead(*host2_resp, 2),
9426 CreateMockRead(*host2_resp_body, 3),
9427 MockRead(ASYNC, ERR_IO_PENDING, 4),
9428 };
9429
9430 scoped_ptr<OrderedSocketData> spdy2_data(
9431 new OrderedSocketData(
9432 spdy2_reads, arraysize(spdy2_reads),
9433 spdy2_writes, arraysize(spdy2_writes)));
9434 session_deps.socket_factory.AddSocketDataProvider(spdy2_data.get());
9435
9436 MockWrite http_write[] = {
9437 MockWrite("GET / HTTP/1.1\r\n"
9438 "Host: www.a.com\r\n"
9439 "Connection: keep-alive\r\n\r\n"),
9440 };
9441
9442 MockRead http_read[] = {
9443 MockRead("HTTP/1.1 200 OK\r\n"),
9444 MockRead("Content-Type: text/html; charset=iso-8859-1\r\n"),
9445 MockRead("Content-Length: 6\r\n\r\n"),
9446 MockRead("hello!"),
9447 };
9448 StaticSocketDataProvider http_data(http_read, arraysize(http_read),
9449 http_write, arraysize(http_write));
9450 session_deps.socket_factory.AddSocketDataProvider(&http_data);
9451
9452 HostPortPair host_port_pair_a("www.a.com", 443);
9453 HostPortProxyPair host_port_proxy_pair_a(
9454 host_port_pair_a, ProxyServer::Direct());
9455 EXPECT_FALSE(
9456 session->spdy_session_pool()->HasSession(host_port_proxy_pair_a));
9457
9458 TestCompletionCallback callback;
9459 HttpRequestInfo request1;
9460 request1.method = "GET";
9461 request1.url = GURL("https://www.a.com/");
9462 request1.load_flags = 0;
9463 scoped_ptr<HttpNetworkTransaction> trans(new HttpNetworkTransaction(session));
9464
9465 int rv = trans->Start(&request1, callback.callback(), BoundNetLog());
9466 EXPECT_EQ(ERR_IO_PENDING, rv);
9467 EXPECT_EQ(OK, callback.WaitForResult());
9468
9469 const HttpResponseInfo* response = trans->GetResponseInfo();
9470 ASSERT_TRUE(response != NULL);
9471 ASSERT_TRUE(response->headers != NULL);
9472 EXPECT_EQ("HTTP/1.1 200 OK", response->headers->GetStatusLine());
9473 EXPECT_TRUE(response->was_fetched_via_spdy);
9474 EXPECT_TRUE(response->was_npn_negotiated);
9475
9476 std::string response_data;
9477 ASSERT_EQ(OK, ReadTransaction(trans.get(), &response_data));
9478 EXPECT_EQ("hello!", response_data);
9479 trans.reset();
9480 EXPECT_TRUE(
9481 session->spdy_session_pool()->HasSession(host_port_proxy_pair_a));
9482
9483 HostPortPair host_port_pair_b("www.b.com", 443);
9484 HostPortProxyPair host_port_proxy_pair_b(
9485 host_port_pair_b, ProxyServer::Direct());
9486 EXPECT_FALSE(
9487 session->spdy_session_pool()->HasSession(host_port_proxy_pair_b));
9488 HttpRequestInfo request2;
9489 request2.method = "GET";
9490 request2.url = GURL("https://www.b.com/");
9491 request2.load_flags = 0;
9492 trans.reset(new HttpNetworkTransaction(session));
9493
9494 rv = trans->Start(&request2, callback.callback(), BoundNetLog());
9495 EXPECT_EQ(ERR_IO_PENDING, rv);
9496 EXPECT_EQ(OK, callback.WaitForResult());
9497
9498 response = trans->GetResponseInfo();
9499 ASSERT_TRUE(response != NULL);
9500 ASSERT_TRUE(response->headers != NULL);
9501 EXPECT_EQ("HTTP/1.1 200 OK", response->headers->GetStatusLine());
9502 EXPECT_TRUE(response->was_fetched_via_spdy);
9503 EXPECT_TRUE(response->was_npn_negotiated);
9504 ASSERT_EQ(OK, ReadTransaction(trans.get(), &response_data));
9505 EXPECT_EQ("hello!", response_data);
9506 EXPECT_FALSE(
9507 session->spdy_session_pool()->HasSession(host_port_proxy_pair_a));
9508 EXPECT_TRUE(
9509 session->spdy_session_pool()->HasSession(host_port_proxy_pair_b));
9510
9511 HostPortPair host_port_pair_a1("www.a.com", 80);
9512 HostPortProxyPair host_port_proxy_pair_a1(
9513 host_port_pair_a1, ProxyServer::Direct());
9514 EXPECT_FALSE(
9515 session->spdy_session_pool()->HasSession(host_port_proxy_pair_a1));
9516 HttpRequestInfo request3;
9517 request3.method = "GET";
9518 request3.url = GURL("http://www.a.com/");
9519 request3.load_flags = 0;
9520 trans.reset(new HttpNetworkTransaction(session));
9521
9522 rv = trans->Start(&request3, callback.callback(), BoundNetLog());
9523 EXPECT_EQ(ERR_IO_PENDING, rv);
9524 EXPECT_EQ(OK, callback.WaitForResult());
9525
9526 response = trans->GetResponseInfo();
9527 ASSERT_TRUE(response != NULL);
9528 ASSERT_TRUE(response->headers != NULL);
9529 EXPECT_EQ("HTTP/1.1 200 OK", response->headers->GetStatusLine());
9530 EXPECT_FALSE(response->was_fetched_via_spdy);
9531 EXPECT_FALSE(response->was_npn_negotiated);
9532 ASSERT_EQ(OK, ReadTransaction(trans.get(), &response_data));
9533 EXPECT_EQ("hello!", response_data);
9534 EXPECT_FALSE(
9535 session->spdy_session_pool()->HasSession(host_port_proxy_pair_a));
9536 EXPECT_FALSE(
9537 session->spdy_session_pool()->HasSession(host_port_proxy_pair_b));
9538
9539 HttpStreamFactory::SetNextProtos(std::vector<std::string>());
9540 ClientSocketPoolManager::set_max_sockets_per_pool(old_max_sockets_per_pool);
9541 ClientSocketPoolManager::set_max_sockets_per_proxy_server(
9542 old_max_sockets_per_proxy_server);
9543 ClientSocketPoolManager::set_max_sockets_per_group(old_max_sockets_per_group);
9544 }
9545
9373 } // namespace net 9546 } // namespace net
OLDNEW
« no previous file with comments | « no previous file | net/http/http_proxy_client_socket_pool.h » ('j') | net/socket/client_socket_pool_base.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698