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

Unified Diff: net/http/http_stream_factory_impl.h

Issue 7289006: Basic HTTP pipelining support (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 9 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/http/http_stream_factory.cc ('k') | net/http/http_stream_factory_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_stream_factory_impl.h
diff --git a/net/http/http_stream_factory_impl.h b/net/http/http_stream_factory_impl.h
index b84f1585329d413a105bcb91f6df6f0f018902f3..9c74e23b03d186e0835247d7fe0fc6058d9c4a5f 100644
--- a/net/http/http_stream_factory_impl.h
+++ b/net/http/http_stream_factory_impl.h
@@ -10,13 +10,15 @@
#include "base/memory/ref_counted.h"
#include "net/base/host_port_pair.h"
-#include "net/http/http_stream_factory.h"
#include "net/base/net_log.h"
+#include "net/http/http_pipelined_host_pool.h"
+#include "net/http/http_stream_factory.h"
#include "net/proxy/proxy_server.h"
namespace net {
class HttpNetworkSession;
+class HttpPipelinedHost;
class SpdySession;
class NET_EXPORT_PRIVATE HttpStreamFactoryImpl : public HttpStreamFactory {
@@ -40,12 +42,18 @@ class NET_EXPORT_PRIVATE HttpStreamFactoryImpl : public HttpStreamFactory {
virtual void AddTLSIntolerantServer(const HostPortPair& server);
virtual bool IsTLSIntolerantServer(const HostPortPair& server) const;
+ // Called when a HttpPipelinedHost has new capacity. Attempts to allocate any
+ // pending pipeline-capable requests to pipelines.
+ virtual void OnHttpPipelinedHostHasAdditionalCapacity(
+ const HostPortPair& origin);
+
private:
class Request;
class Job;
typedef std::set<Request*> RequestSet;
typedef std::map<HostPortProxyPair, RequestSet> SpdySessionRequestMap;
+ typedef std::map<HostPortPair, RequestSet> HttpPipeliningRequestMap;
bool GetAlternateProtocolRequestFor(const GURL& original_url,
GURL* alternate_url) const;
@@ -88,6 +96,9 @@ class NET_EXPORT_PRIVATE HttpStreamFactoryImpl : public HttpStreamFactory {
std::map<const Job*, Request*> request_map_;
SpdySessionRequestMap spdy_session_request_map_;
+ HttpPipeliningRequestMap http_pipelining_request_map_;
+
+ HttpPipelinedHostPool http_pipelined_host_pool_;
// These jobs correspond to jobs orphaned by Requests and now owned by
// HttpStreamFactoryImpl. Since they are no longer tied to Requests, they will
« no previous file with comments | « net/http/http_stream_factory.cc ('k') | net/http/http_stream_factory_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698