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

Unified Diff: trunk/src/net/base/prioritized_dispatcher.cc

Issue 23102009: Revert 218616 "[net/dns] Perform A/AAAA queries for AF_UNSPEC re..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 4 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 | « trunk/src/net/base/prioritized_dispatcher.h ('k') | trunk/src/net/base/prioritized_dispatcher_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/net/base/prioritized_dispatcher.cc
===================================================================
--- trunk/src/net/base/prioritized_dispatcher.cc (revision 219026)
+++ trunk/src/net/base/prioritized_dispatcher.cc (working copy)
@@ -18,7 +18,17 @@
: queue_(limits.reserved_slots.size()),
max_running_jobs_(limits.reserved_slots.size()),
num_running_jobs_(0) {
- SetLimits(limits);
+ size_t total = 0;
+ for (size_t i = 0; i < limits.reserved_slots.size(); ++i) {
+ total += limits.reserved_slots[i];
+ max_running_jobs_[i] = total;
+ }
+ // Unreserved slots are available for all priorities.
+ DCHECK_LE(total, limits.total_jobs) << "sum(reserved_slots) <= total_jobs";
+ size_t spare = limits.total_jobs - total;
+ for (size_t i = limits.reserved_slots.size(); i > 0; --i) {
+ max_running_jobs_[i - 1] += spare;
+ }
}
PrioritizedDispatcher::~PrioritizedDispatcher() {}
@@ -35,18 +45,6 @@
return queue_.Insert(job, priority);
}
-PrioritizedDispatcher::Handle PrioritizedDispatcher::AddAtHead(
- Job* job, Priority priority) {
- DCHECK(job);
- DCHECK_LT(priority, num_priorities());
- if (num_running_jobs_ < max_running_jobs_[priority]) {
- ++num_running_jobs_;
- job->Start();
- return Handle();
- }
- return queue_.InsertAtFront(job, priority);
-}
-
void PrioritizedDispatcher::Cancel(const Handle& handle) {
queue_.Erase(handle);
}
@@ -88,11 +86,6 @@
MaybeDispatchJob(handle, handle.priority());
}
-void PrioritizedDispatcher::Disable() {
- // Set limits to allow no new jobs to start.
- SetLimits(Limits(queue_.num_priorities(), 0));
-}
-
bool PrioritizedDispatcher::MaybeDispatchJob(const Handle& handle,
Priority job_priority) {
DCHECK_LT(job_priority, num_priorities());
@@ -105,19 +98,4 @@
return true;
}
-void PrioritizedDispatcher::SetLimits(const Limits& limits) {
- DCHECK_EQ(queue_.num_priorities(), limits.reserved_slots.size());
- size_t total = 0;
- for (size_t i = 0; i < limits.reserved_slots.size(); ++i) {
- total += limits.reserved_slots[i];
- max_running_jobs_[i] = total;
- }
- // Unreserved slots are available for all priorities.
- DCHECK_LE(total, limits.total_jobs) << "sum(reserved_slots) <= total_jobs";
- size_t spare = limits.total_jobs - total;
- for (size_t i = limits.reserved_slots.size(); i > 0; --i) {
- max_running_jobs_[i - 1] += spare;
- }
-}
-
} // namespace net
« no previous file with comments | « trunk/src/net/base/prioritized_dispatcher.h ('k') | trunk/src/net/base/prioritized_dispatcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698