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

Side by Side Diff: third_party/WebKit/Source/platform/scheduler/base/time_domain.h

Issue 2419793002: [Reland] Optimize blink scheduler with an intrusive heap (Closed)
Patch Set: Fixed perf test and increaced test coverage Created 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_BASE_TIME_DOMAIN_H_ 5 #ifndef THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_BASE_TIME_DOMAIN_H_
6 #define THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_BASE_TIME_DOMAIN_H_ 6 #define THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_BASE_TIME_DOMAIN_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
15 #include "base/time/time.h" 15 #include "base/time/time.h"
16 #include "platform/scheduler/base/intrusive_heap.h"
16 #include "platform/scheduler/base/lazy_now.h" 17 #include "platform/scheduler/base/lazy_now.h"
17 #include "platform/scheduler/base/task_queue_impl.h" 18 #include "platform/scheduler/base/task_queue_impl.h"
18 19
19 namespace blink { 20 namespace blink {
20 namespace scheduler { 21 namespace scheduler {
21 namespace internal { 22 namespace internal {
22 class TaskQueueImpl; 23 class TaskQueueImpl;
23 } // internal 24 } // internal
24 class TaskQueueManager; 25 class TaskQueueManager;
25 class TaskQueueManagerDelegate; 26 class TaskQueueManagerDelegate;
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 virtual void RequestWakeup(base::TimeTicks now, base::TimeDelta delay) = 0; 125 virtual void RequestWakeup(base::TimeTicks now, base::TimeDelta delay) = 0;
125 126
126 // For implementation specific tracing. 127 // For implementation specific tracing.
127 virtual void AsValueIntoInternal( 128 virtual void AsValueIntoInternal(
128 base::trace_event::TracedValue* state) const = 0; 129 base::trace_event::TracedValue* state) const = 0;
129 130
130 // Call TaskQueueImpl::UpdateDelayedWorkQueue for each queue where the delay 131 // Call TaskQueueImpl::UpdateDelayedWorkQueue for each queue where the delay
131 // has elapsed. 132 // has elapsed.
132 void WakeupReadyDelayedQueues(LazyNow* lazy_now); 133 void WakeupReadyDelayedQueues(LazyNow* lazy_now);
133 134
135 size_t NumberOfScheduledWakeups() const {
136 return delayed_wakeup_queue_.size();
137 }
138
134 private: 139 private:
135 void MoveNewlyUpdatableQueuesIntoUpdatableQueueSet(); 140 void MoveNewlyUpdatableQueuesIntoUpdatableQueueSet();
136 141
137 using DelayedWakeupMultimap = 142 struct DelayedWakeup {
138 std::multimap<base::TimeTicks, internal::TaskQueueImpl*>; 143 base::TimeTicks time;
144 internal::TaskQueueImpl* queue;
139 145
140 DelayedWakeupMultimap delayed_wakeup_multimap_; 146 bool operator<=(const DelayedWakeup& other) const {
147 if (time == other.time)
148 return queue <= other.queue;
149 return time < other.time;
150 }
141 151
142 // This map makes it easy to remove a queue from |delayed_wakeup_multimap_|. 152 void SetHeapHandle(HeapHandle handle) {
143 // NOTE inserting or removing elements from a std::map does not invalidate any 153 DCHECK(handle.IsValid());
144 // iterators. 154 queue->set_heap_handle(handle);
145 using QueueToDelayedWakeupMultimapIteratorMap = 155 }
146 std::unordered_map<internal::TaskQueueImpl*,
147 DelayedWakeupMultimap::iterator>;
148 156
149 QueueToDelayedWakeupMultimapIteratorMap 157 void ClearHeapHandle() {
150 queue_to_delayed_wakeup_multimap_iterator_map_; 158 DCHECK(queue->heap_handle().IsValid());
159 queue->set_heap_handle(HeapHandle());
160
161 DCHECK_NE(queue->scheduled_time_domain_wakeup(), base::TimeTicks());
162 queue->set_scheduled_time_domain_wakeup(base::TimeTicks());
163 }
164 };
165
166 IntrusiveHeap<DelayedWakeup> delayed_wakeup_queue_;
151 167
152 // This lock guards only |newly_updatable_|. It's not expected to be heavily 168 // This lock guards only |newly_updatable_|. It's not expected to be heavily
153 // contended. 169 // contended.
154 base::Lock newly_updatable_lock_; 170 base::Lock newly_updatable_lock_;
155 std::vector<internal::TaskQueueImpl*> newly_updatable_; 171 std::vector<internal::TaskQueueImpl*> newly_updatable_;
156 172
157 // Set of task queues with avaliable work on the incoming queue. This should 173 // Set of task queues with avaliable work on the incoming queue. This should
158 // only be accessed from the main thread. 174 // only be accessed from the main thread.
159 std::set<internal::TaskQueueImpl*> updatable_queue_set_; 175 std::set<internal::TaskQueueImpl*> updatable_queue_set_;
160 176
161 Observer* observer_; // NOT OWNED. 177 Observer* observer_; // NOT OWNED.
162 178
163 base::ThreadChecker main_thread_checker_; 179 base::ThreadChecker main_thread_checker_;
164 180
165 DISALLOW_COPY_AND_ASSIGN(TimeDomain); 181 DISALLOW_COPY_AND_ASSIGN(TimeDomain);
166 }; 182 };
167 183
168 } // namespace scheduler 184 } // namespace scheduler
169 } // namespace blink 185 } // namespace blink
170 186
171 #endif // THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_BASE_TIME_DOMAIN_H_ 187 #endif // THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_BASE_TIME_DOMAIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698