Index: components/scheduler/child/task_queue_sets.cc |
diff --git a/components/scheduler/child/task_queue_sets.cc b/components/scheduler/child/task_queue_sets.cc |
index 3d5dcae2d6da5bd4c6a536dab5ec1c3936e1b078..50d9a9e1c823c19f6fe7d0e425d6d0e19ee01e16 100644 |
--- a/components/scheduler/child/task_queue_sets.cc |
+++ b/components/scheduler/child/task_queue_sets.cc |
@@ -10,67 +10,76 @@ |
namespace scheduler { |
namespace internal { |
-TaskQueueSets::TaskQueueSets(size_t num_sets) : age_to_queue_maps_(num_sets) {} |
+TaskQueueSets::TaskQueueSets(size_t num_sets) |
+ : enqueue_order_to_queue_maps_(num_sets) {} |
TaskQueueSets::~TaskQueueSets() {} |
void TaskQueueSets::RemoveQueue(internal::TaskQueueImpl* queue) { |
- int age; |
- bool has_age = queue->GetWorkQueueFrontTaskAge(&age); |
- if (!has_age) |
+ int enqueue_order; |
+ bool has_enqueue_order = |
+ queue->GetWorkQueueFrontTaskEnqueueOrder(&enqueue_order); |
+ if (!has_enqueue_order) |
return; |
size_t set_index = queue->get_task_queue_set_index(); |
- DCHECK_LT(set_index, age_to_queue_maps_.size()); |
- age_to_queue_maps_[set_index].erase(age); |
+ DCHECK_LT(set_index, enqueue_order_to_queue_maps_.size()); |
+ enqueue_order_to_queue_maps_[set_index].erase(enqueue_order); |
} |
void TaskQueueSets::AssignQueueToSet(internal::TaskQueueImpl* queue, |
size_t set_index) { |
- DCHECK_LT(set_index, age_to_queue_maps_.size()); |
- int age; |
- bool has_age = queue->GetWorkQueueFrontTaskAge(&age); |
+ DCHECK_LT(set_index, enqueue_order_to_queue_maps_.size()); |
+ int enqueue_order; |
+ bool has_enqueue_order = |
+ queue->GetWorkQueueFrontTaskEnqueueOrder(&enqueue_order); |
size_t old_set = queue->get_task_queue_set_index(); |
- DCHECK_LT(old_set, age_to_queue_maps_.size()); |
+ DCHECK_LT(old_set, enqueue_order_to_queue_maps_.size()); |
queue->set_task_queue_set_index(set_index); |
- if (!has_age) |
+ if (!has_enqueue_order) |
return; |
- age_to_queue_maps_[old_set].erase(age); |
- age_to_queue_maps_[set_index].insert(std::make_pair(age, queue)); |
+ enqueue_order_to_queue_maps_[old_set].erase(enqueue_order); |
+ enqueue_order_to_queue_maps_[set_index].insert( |
+ std::make_pair(enqueue_order, queue)); |
} |
void TaskQueueSets::OnPushQueue(internal::TaskQueueImpl* queue) { |
- int age; |
- bool has_age = queue->GetWorkQueueFrontTaskAge(&age); |
- DCHECK(has_age); |
+ int enqueue_order; |
+ bool has_enqueue_order = |
+ queue->GetWorkQueueFrontTaskEnqueueOrder(&enqueue_order); |
+ DCHECK(has_enqueue_order); |
size_t set_index = queue->get_task_queue_set_index(); |
- DCHECK_LT(set_index, age_to_queue_maps_.size()) << " set_index = " |
- << set_index; |
- age_to_queue_maps_[set_index].insert(std::make_pair(age, queue)); |
+ DCHECK_LT(set_index, enqueue_order_to_queue_maps_.size()) << " set_index = " |
+ << set_index; |
+ enqueue_order_to_queue_maps_[set_index].insert( |
+ std::make_pair(enqueue_order, queue)); |
} |
void TaskQueueSets::OnPopQueue(internal::TaskQueueImpl* queue) { |
size_t set_index = queue->get_task_queue_set_index(); |
- DCHECK_LT(set_index, age_to_queue_maps_.size()); |
- DCHECK(!age_to_queue_maps_[set_index].empty()) << " set_index = " |
- << set_index; |
- DCHECK_EQ(age_to_queue_maps_[set_index].begin()->second, queue) |
+ DCHECK_LT(set_index, enqueue_order_to_queue_maps_.size()); |
+ DCHECK(!enqueue_order_to_queue_maps_[set_index].empty()) << " set_index = " |
+ << set_index; |
+ DCHECK_EQ(enqueue_order_to_queue_maps_[set_index].begin()->second, queue) |
<< " set_index = " << set_index; |
// O(1) amortised. |
- age_to_queue_maps_[set_index].erase(age_to_queue_maps_[set_index].begin()); |
- int age; |
- bool has_age = queue->GetWorkQueueFrontTaskAge(&age); |
- if (!has_age) |
+ enqueue_order_to_queue_maps_[set_index].erase( |
+ enqueue_order_to_queue_maps_[set_index].begin()); |
+ int enqueue_order; |
+ bool has_enqueue_order = |
+ queue->GetWorkQueueFrontTaskEnqueueOrder(&enqueue_order); |
+ if (!has_enqueue_order) |
return; |
- age_to_queue_maps_[set_index].insert(std::make_pair(age, queue)); |
+ enqueue_order_to_queue_maps_[set_index].insert( |
+ std::make_pair(enqueue_order, queue)); |
} |
bool TaskQueueSets::GetOldestQueueInSet( |
size_t set_index, |
internal::TaskQueueImpl** out_queue) const { |
- DCHECK_LT(set_index, age_to_queue_maps_.size()); |
- if (age_to_queue_maps_[set_index].empty()) |
+ DCHECK_LT(set_index, enqueue_order_to_queue_maps_.size()); |
+ if (enqueue_order_to_queue_maps_[set_index].empty()) |
return false; |
- *out_queue = age_to_queue_maps_[set_index].begin()->second; |
+ *out_queue = enqueue_order_to_queue_maps_[set_index].begin()->second; |
return true; |
} |