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

Side by Side Diff: third_party/WebKit/Source/platform/scheduler/base/task_queue_manager.cc

Issue 2386653002: Replace base::Callback with base::OnceCallback in base::PendingTask (Closed)
Patch Set: revert most of task_scheduler changes 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "platform/scheduler/base/task_queue_manager.h" 5 #include "platform/scheduler/base/task_queue_manager.h"
6 6
7 #include <queue> 7 #include <queue>
8 #include <set> 8 #include <set>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 internal::TaskQueueImpl* queue = work_queue->task_queue(); 313 internal::TaskQueueImpl* queue = work_queue->task_queue();
314 if (queue->GetQuiescenceMonitored()) 314 if (queue->GetQuiescenceMonitored())
315 task_was_run_on_quiescence_monitored_queue_ = true; 315 task_was_run_on_quiescence_monitored_queue_ = true;
316 316
317 if (!pending_task.nestable && delegate_->IsNested()) { 317 if (!pending_task.nestable && delegate_->IsNested()) {
318 // Defer non-nestable work to the main task runner. NOTE these tasks can be 318 // Defer non-nestable work to the main task runner. NOTE these tasks can be
319 // arbitrarily delayed so the additional delay should not be a problem. 319 // arbitrarily delayed so the additional delay should not be a problem.
320 // TODO(skyostil): Figure out a way to not forget which task queue the 320 // TODO(skyostil): Figure out a way to not forget which task queue the
321 // task is associated with. See http://crbug.com/522843. 321 // task is associated with. See http://crbug.com/522843.
322 delegate_->PostNonNestableTask(pending_task.posted_from, 322 delegate_->PostNonNestableTask(pending_task.posted_from,
323 std::move(pending_task.task)); 323 base::UnsafeConvertOnceClosureToRepeating(
fdoray 2016/10/06 17:37:22 Add a TODO to remove this unsafe conversion once T
tzik 2016/10/13 05:58:04 Done.
324 std::move(pending_task.task)));
324 return ProcessTaskResult::DEFERRED; 325 return ProcessTaskResult::DEFERRED;
325 } 326 }
326 327
327 MaybeRecordTaskDelayHistograms(pending_task, queue); 328 MaybeRecordTaskDelayHistograms(pending_task, queue);
328 329
329 TRACE_TASK_EXECUTION("TaskQueueManager::ProcessTaskFromWorkQueue", 330 TRACE_TASK_EXECUTION("TaskQueueManager::ProcessTaskFromWorkQueue",
330 pending_task); 331 pending_task);
331 if (queue->GetShouldNotifyObservers()) { 332 if (queue->GetShouldNotifyObservers()) {
332 FOR_EACH_OBSERVER(base::MessageLoop::TaskObserver, task_observers_, 333 FOR_EACH_OBSERVER(base::MessageLoop::TaskObserver, task_observers_,
333 WillProcessTask(pending_task)); 334 WillProcessTask(pending_task));
334 queue->NotifyWillProcessTask(pending_task); 335 queue->NotifyWillProcessTask(pending_task);
335 } 336 }
336 TRACE_EVENT1(tracing_category_, "TaskQueueManager::RunTask", "queue", 337 TRACE_EVENT1(tracing_category_, "TaskQueueManager::RunTask", "queue",
337 queue->GetName()); 338 queue->GetName());
338 // NOTE when TaskQueues get unregistered a reference ends up getting retained 339 // NOTE when TaskQueues get unregistered a reference ends up getting retained
339 // by |queues_to_delete_| which is cleared at the top of |DoWork|. This means 340 // by |queues_to_delete_| which is cleared at the top of |DoWork|. This means
340 // we are OK to use raw pointers here. 341 // we are OK to use raw pointers here.
341 internal::TaskQueueImpl* prev_executing_task_queue = 342 internal::TaskQueueImpl* prev_executing_task_queue =
342 currently_executing_task_queue_; 343 currently_executing_task_queue_;
343 currently_executing_task_queue_ = queue; 344 currently_executing_task_queue_ = queue;
344 task_annotator_.RunTask("TaskQueueManager::PostTask", pending_task); 345 task_annotator_.RunTask("TaskQueueManager::PostTask", &pending_task);
345 // Detect if the TaskQueueManager just got deleted. If this happens we must 346 // Detect if the TaskQueueManager just got deleted. If this happens we must
346 // not access any member variables after this point. 347 // not access any member variables after this point.
347 if (protect->HasOneRef()) 348 if (protect->HasOneRef())
348 return ProcessTaskResult::TASK_QUEUE_MANAGER_DELETED; 349 return ProcessTaskResult::TASK_QUEUE_MANAGER_DELETED;
349 350
350 currently_executing_task_queue_ = prev_executing_task_queue; 351 currently_executing_task_queue_ = prev_executing_task_queue;
351 352
352 if (queue->GetShouldNotifyObservers()) { 353 if (queue->GetShouldNotifyObservers()) {
353 FOR_EACH_OBSERVER(base::MessageLoop::TaskObserver, task_observers_, 354 FOR_EACH_OBSERVER(base::MessageLoop::TaskObserver, task_observers_,
354 DidProcessTask(pending_task)); 355 DidProcessTask(pending_task));
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
465 DCHECK(main_thread_checker_.CalledOnValidThread()); 466 DCHECK(main_thread_checker_.CalledOnValidThread());
466 DCHECK(!work_queue->Empty()); 467 DCHECK(!work_queue->Empty());
467 if (observer_) { 468 if (observer_) {
468 observer_->OnTriedToExecuteBlockedTask(*work_queue->task_queue(), 469 observer_->OnTriedToExecuteBlockedTask(*work_queue->task_queue(),
469 *work_queue->GetFrontTask()); 470 *work_queue->GetFrontTask());
470 } 471 }
471 } 472 }
472 473
473 } // namespace scheduler 474 } // namespace scheduler
474 } // namespace blink 475 } // namespace blink
OLDNEW
« base/task_scheduler/task_tracker.h ('K') | « components/timers/alarm_timer_chromeos.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698