Socket Pools Refactor 23: Let SpdySession take a StreamSocket.
This CL allows a SpdySession to be created by passing a StreamSocket
to its constructor directly, in addition to keeping the previous
constructor, which takes a ClientSocketHandle. The new constructor
is intended for use where there's no socket pool below the session.
In particular, for H2 proxies, the SpdySessions are created below
the highest socket pool layer, at the ConnectJob layer. Once the socket
pools are flight, this will become the only socket pool layer, so
we'll only be dealing with a raw StreamSockets, rather than
ClientSocketHandles.
This is part of an effort to flatten the socket pools.
https://docs.google.com/document/d/1g0EA4iDqaDhNXA_mq-YK3SlSX-xRkoKvZetAQqdRrxM/edit
Change-Id: Ibe722bad9814879504757c03e8ad3c135d123971
Reviewed-on: https://chromium-review.googlesource.com/c/1453107
Commit-Queue: Matt Menke <[email protected]>
Reviewed-by: Bence Béky <[email protected]>
Cr-Commit-Position: refs/heads/master@{#629882}diff --git a/net/spdy/spdy_session_pool.cc b/net/spdy/spdy_session_pool.cc
index 27e4f563..014d434 100644
--- a/net/spdy/spdy_session_pool.cc
+++ b/net/spdy/spdy_session_pool.cc
@@ -98,48 +98,38 @@
CertDatabase::GetInstance()->RemoveObserver(this);
}
+base::WeakPtr<SpdySession>
+SpdySessionPool::CreateAvailableSessionFromSocketHandle(
+ const SpdySessionKey& key,
+ bool is_trusted_proxy,
+ std::unique_ptr<ClientSocketHandle> client_socket_handle,
+ const NetLogWithSource& net_log) {
+ TRACE_EVENT0(NetTracingCategory(),
+ "SpdySessionPool::CreateAvailableSessionFromSocketHandle");
+
+ std::unique_ptr<SpdySession> new_session =
+ CreateSession(key, is_trusted_proxy, net_log.net_log());
+ new_session->InitializeWithSocketHandle(std::move(client_socket_handle),
+ this);
+ return InsertSession(key, std::move(new_session), net_log);
+}
+
base::WeakPtr<SpdySession> SpdySessionPool::CreateAvailableSessionFromSocket(
const SpdySessionKey& key,
bool is_trusted_proxy,
- std::unique_ptr<ClientSocketHandle> connection,
+ std::unique_ptr<StreamSocket> socket_stream,
+ const LoadTimingInfo::ConnectTiming& connect_timing,
const NetLogWithSource& net_log) {
TRACE_EVENT0(NetTracingCategory(),
"SpdySessionPool::CreateAvailableSessionFromSocket");
- UMA_HISTOGRAM_ENUMERATION(
- "Net.SpdySessionGet", IMPORTED_FROM_SOCKET, SPDY_SESSION_GET_MAX);
+ std::unique_ptr<SpdySession> new_session =
+ CreateSession(key, is_trusted_proxy, net_log.net_log());
- auto new_session = std::make_unique<SpdySession>(
- key, http_server_properties_, transport_security_state_,
- ssl_config_service_, quic_supported_versions_,
- enable_sending_initial_data_, enable_ping_based_connection_checking_,
- support_ietf_format_quic_altsvc_, is_trusted_proxy,
- session_max_recv_window_size_, initial_settings_, greased_http2_frame_,
- time_func_, push_delegate_, network_quality_estimator_,
- net_log.net_log());
+ new_session->InitializeWithSocket(std::move(socket_stream), connect_timing,
+ this);
- new_session->InitializeWithSocket(std::move(connection), this);
-
- base::WeakPtr<SpdySession> available_session = new_session->GetWeakPtr();
- sessions_.insert(new_session.release());
- MapKeyToAvailableSession(key, available_session);
-
- net_log.AddEvent(
- NetLogEventType::HTTP2_SESSION_POOL_IMPORTED_SESSION_FROM_SOCKET,
- available_session->net_log().source().ToEventParametersCallback());
-
- // Look up the IP address for this session so that we can match
- // future sessions (potentially to different domains) which can
- // potentially be pooled with this one. Because GetPeerAddress()
- // reports the proxy's address instead of the origin server, check
- // to see if this is a direct connection.
- if (key.proxy_server().is_direct()) {
- IPEndPoint address;
- if (available_session->GetPeerAddress(&address) == OK)
- aliases_.insert(AliasMap::value_type(address, key));
- }
-
- return available_session;
+ return InsertSession(key, std::move(new_session), net_log);
}
base::WeakPtr<SpdySession> SpdySessionPool::FindAvailableSession(
@@ -602,4 +592,46 @@
}
}
+std::unique_ptr<SpdySession> SpdySessionPool::CreateSession(
+ const SpdySessionKey& key,
+ bool is_trusted_proxy,
+ NetLog* net_log) {
+ UMA_HISTOGRAM_ENUMERATION("Net.SpdySessionGet", IMPORTED_FROM_SOCKET,
+ SPDY_SESSION_GET_MAX);
+
+ return std::make_unique<SpdySession>(
+ key, http_server_properties_, transport_security_state_,
+ ssl_config_service_, quic_supported_versions_,
+ enable_sending_initial_data_, enable_ping_based_connection_checking_,
+ support_ietf_format_quic_altsvc_, is_trusted_proxy,
+ session_max_recv_window_size_, initial_settings_, greased_http2_frame_,
+ time_func_, push_delegate_, network_quality_estimator_, net_log);
+}
+
+base::WeakPtr<SpdySession> SpdySessionPool::InsertSession(
+ const SpdySessionKey& key,
+ std::unique_ptr<SpdySession> new_session,
+ const NetLogWithSource& source_net_log) {
+ base::WeakPtr<SpdySession> available_session = new_session->GetWeakPtr();
+ sessions_.insert(new_session.release());
+ MapKeyToAvailableSession(key, available_session);
+
+ source_net_log.AddEvent(
+ NetLogEventType::HTTP2_SESSION_POOL_IMPORTED_SESSION_FROM_SOCKET,
+ available_session->net_log().source().ToEventParametersCallback());
+
+ // Look up the IP address for this session so that we can match
+ // future sessions (potentially to different domains) which can
+ // potentially be pooled with this one. Because GetPeerAddress()
+ // reports the proxy's address instead of the origin server, check
+ // to see if this is a direct connection.
+ if (key.proxy_server().is_direct()) {
+ IPEndPoint address;
+ if (available_session->GetPeerAddress(&address) == OK)
+ aliases_.insert(AliasMap::value_type(address, key));
+ }
+
+ return available_session;
+}
+
} // namespace net
