Add a cap of six in-flight requests per host to the ResourceScheduler

content/browser/loader/resource_scheduler.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_LOADER_RESOURCE_SCHEDULER_H_
 #define CONTENT_BROWSER_LOADER_RESOURCE_SCHEDULER_H_
 
 #include <map>
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "content/common/content_export.h"
 #include "net/base/priority_queue.h"
 #include "net/base/request_priority.h"
 
 namespace net {
 class URLRequest;
+class HostPortPair;

[James Simonsen, 2013/11/13 01:26:23]

Alphabetize.

[oystein (OOO til 10th of July), 2013/11/14 00:19:07]

Done.

 }
 
 namespace content {
 class ResourceThrottle;
 
 // There is one ResourceScheduler. All renderer-initiated HTTP requests are
 // expected to pass through it.
 //
 // There are two types of input to the scheduler:
 // 1. Requests to start, cancel, or finish fetching a resource.
@@ skipping 69 matching lines @@
   // level.
   void ReprioritizeRequest(ScheduledResourceRequest* request,
                            net::RequestPriority new_priority);
 
   // Attempts to load any pending requests in |client|, based on the
   // results of ShouldStartRequest().
   void LoadAnyStartablePendingRequests(Client* client);
 
   // Returns the number of requests with priority < LOW that are currently in
   // flight.
-  size_t GetNumDelayableRequestsInFlight(Client* client) const;
+  void GetNumDelayableRequestsInFlight(Client* client,
+                                       net::HostPortPair* active_request_host,
+                                       size_t* total_delayable,
+                                       size_t* total_for_active_host) const;
+
+  enum ShouldStartReqResult {
+    kDoNotStartRequest_StopSearching = -2,

[James Simonsen, 2013/11/13 01:26:23]

Is this proper style now? net/ uses all caps for enums.

You don't seem to be taking advantage of the specific values. I'd leave them
undefined.

[oystein (OOO til 10th of July), 2013/11/14 00:19:07]

Changed; but this seems super inconsistent right now.
chrome/browser/net/referrer.cc uses the kSomeEnum case for example.

The values are to preserve the boolean semantics of ShouldStartRequest(), for
code safety.

[James Simonsen, 2013/11/14 19:22:43]

I don't have a preference. We should just follow whatever the style guide says.
I don't think it has double underscores though. Maybe throw in an _AND_?

[oystein (OOO til 10th of July), 2013/11/14 19:51:49]

Done.

+    kDoNotStartRequest_KeepSearching = -1,
+    kStartRequest = 1,
+  };
 
   // Returns true if the request should start. This is the core scheduling
   // algorithm.
-  bool ShouldStartRequest(ScheduledResourceRequest* request,
-                          Client* client) const;
+  ShouldStartReqResult ShouldStartRequest(ScheduledResourceRequest* request,
+                                          Client* client) const;
 
   // Returns the client ID for the given |child_id| and |route_id| combo.
   ClientId MakeClientId(int child_id, int route_id);
 
   ClientMap client_map_;
   RequestSet unowned_requests_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_LOADER_RESOURCE_SCHEDULER_H_