Slow start pipelining.

net/http/http_pipelined_host.h

Index: net/http/http_pipelined_host.h
diff --git a/net/http/http_pipelined_host.h b/net/http/http_pipelined_host.h
index ae3128d8054a75ec2a52d93a5b1e4a9d04550fc6..104d7d6efef3cee1f7c4b79b91ef64f6b3f19298 100644
--- a/net/http/http_pipelined_host.h
+++ b/net/http/http_pipelined_host.h
@@ -6,11 +6,6 @@
 #define NET_HTTP_HTTP_PIPELINED_HOST_H_
 #pragma once
 
-#include <set>
-#include <string>
-
-#include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/net_export.h"
 #include "net/http/http_pipelined_connection.h"

[mmenke, 2011/11/21 14:51:39]

Don't think we need this one.

[James Simonsen, 2011/12/01 01:17:10]

We need it for the HttpPipelinedConnection::Factory.

@@ -26,9 +21,14 @@ struct SSLConfig;
 // Manages all of the pipelining state for specific host with active pipelined
 // HTTP requests. Manages connection jobs, constructs pipelined streams, and
 // assigns requests to the least loaded pipelined connection.
-class NET_EXPORT_PRIVATE HttpPipelinedHost
-    : public HttpPipelinedConnection::Delegate {
+class NET_EXPORT_PRIVATE HttpPipelinedHost {
  public:
+  enum Capability {
+    UNKNOWN,
+    INCAPABLE,
+    CAPABLE,
+  };
+
   class Delegate {
    public:
     // Called when a pipelined host has no outstanding requests on any of its
@@ -38,54 +38,44 @@ class NET_EXPORT_PRIVATE HttpPipelinedHost
     // Called when a pipelined host has newly available pipeline capacity, like
     // when a request completes.
     virtual void OnHostHasAdditionalCapacity(HttpPipelinedHost* host) = 0;
+
+    // Called when a host determines if pipelining can be used.
+    virtual void OnHostDeterminedCapability(HttpPipelinedHost* host,
+                                            Capability capability) = 0;
+  };
+
+  class Factory {
+   public:
+    virtual ~Factory() {}
+
+    // Returns a new HttpPipelinedHost.
+    virtual HttpPipelinedHost* CreateNewHost(
+        Delegate* delegate, const HostPortPair& origin,
+        HttpPipelinedConnection::Factory* factory,
+        Capability capability) = 0;
   };
 
-  HttpPipelinedHost(Delegate* delegate, const HostPortPair& origin,
-                    HttpPipelinedConnection::Factory* factory);
-  virtual ~HttpPipelinedHost();
+  virtual ~HttpPipelinedHost() {}
 
   // Constructs a new pipeline on |connection| and returns a new
   // HttpPipelinedStream that uses it.
-  HttpPipelinedStream* CreateStreamOnNewPipeline(
+  virtual HttpPipelinedStream* CreateStreamOnNewPipeline(
       ClientSocketHandle* connection,
       const SSLConfig& used_ssl_config,
       const ProxyInfo& used_proxy_info,
       const BoundNetLog& net_log,
-      bool was_npn_negotiated);
+      bool was_npn_negotiated) = 0;
 
   // Tries to find an existing pipeline with capacity for a new request. If
   // successful, returns a new stream on that pipeline. Otherwise, returns NULL.
-  HttpPipelinedStream* CreateStreamOnExistingPipeline();
+  virtual HttpPipelinedStream* CreateStreamOnExistingPipeline() = 0;
 
   // Returns true if we have a pipelined connection that can accept new
   // requests.
-  bool IsExistingPipelineAvailable();
-
-  // Callbacks for HttpPipelinedConnection.
-
-  // Called when a pipelined connection completes a request. Adds a pending
-  // request to the pipeline if the pipeline is still usable.
-  virtual void OnPipelineHasCapacity(
-      HttpPipelinedConnection* pipeline) OVERRIDE;
-
-  const HostPortPair& origin() const { return origin_; }
-
- private:
-  // Called when a pipeline is empty and there are no pending requests. Closes
-  // the connection.
-  void OnPipelineEmpty(HttpPipelinedConnection* pipeline);
-
-  // Adds the next pending request to the pipeline if it's still usuable.
-  void AddRequestToPipeline(HttpPipelinedConnection* connection);
-
-  int max_pipeline_depth() const { return 3; }
-
-  Delegate* delegate_;
-  const HostPortPair origin_;
-  std::set<HttpPipelinedConnection*> pipelines_;
-  scoped_ptr<HttpPipelinedConnection::Factory> factory_;
+  virtual bool IsExistingPipelineAvailable() = 0;

[mmenke, 2011/11/21 14:51:39]

Believe this can be const.

[James Simonsen, 2011/12/01 01:17:10]

Yep. Done.

 
-  DISALLOW_COPY_AND_ASSIGN(HttpPipelinedHost);
+  // Returns the host and port associated with this class.
+  virtual const HostPortPair& origin() const = 0;
 };
 
 }  // namespace net