OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "base/threading/worker_pool.h" | 5 #include "base/threading/worker_pool.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/callback.h" | 8 #include "base/callback.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/pending_task.h" | 10 #include "base/pending_task.h" |
11 #include "base/threading/thread_local.h" | 11 #include "base/threading/thread_local.h" |
12 #include "base/trace_event/trace_event.h" | 12 #include "base/trace_event/trace_event.h" |
13 #include "base/tracked_objects.h" | 13 #include "base/tracked_objects.h" |
14 | 14 |
15 namespace base { | 15 namespace base { |
16 | 16 |
17 namespace { | 17 namespace { |
18 | 18 |
19 base::LazyInstance<ThreadLocalBoolean>::Leaky | 19 base::LazyInstance<ThreadLocalBoolean>::Leaky |
20 g_worker_pool_running_on_this_thread = LAZY_INSTANCE_INITIALIZER; | 20 g_worker_pool_running_on_this_thread = LAZY_INSTANCE_INITIALIZER; |
21 | 21 |
22 DWORD CALLBACK WorkItemCallback(void* param) { | 22 DWORD CALLBACK WorkItemCallback(void* param) { |
23 PendingTask* pending_task = static_cast<PendingTask*>(param); | 23 PendingTask* pending_task = static_cast<PendingTask*>(param); |
24 TRACE_TASK_EXECUTION("WorkerThread::ThreadMain::Run", *pending_task); | 24 TRACE_TASK_EXECUTION("WorkerThread::ThreadMain::Run", *pending_task); |
25 | 25 |
26 g_worker_pool_running_on_this_thread.Get().Set(true); | 26 g_worker_pool_running_on_this_thread.Get().Set(true); |
27 | 27 |
28 tracked_objects::TaskStopwatch stopwatch; | 28 tracked_objects::TaskStopwatch stopwatch; |
29 stopwatch.Start(); | 29 stopwatch.Start(); |
30 pending_task->task.Run(); | 30 std::move(pending_task->task).Run(); |
31 stopwatch.Stop(); | 31 stopwatch.Stop(); |
32 | 32 |
33 g_worker_pool_running_on_this_thread.Get().Set(false); | 33 g_worker_pool_running_on_this_thread.Get().Set(false); |
34 | 34 |
35 tracked_objects::ThreadData::TallyRunOnWorkerThreadIfTracking( | 35 tracked_objects::ThreadData::TallyRunOnWorkerThreadIfTracking( |
36 pending_task->birth_tally, pending_task->time_posted, stopwatch); | 36 pending_task->birth_tally, pending_task->time_posted, stopwatch); |
37 | 37 |
38 delete pending_task; | 38 delete pending_task; |
39 return 0; | 39 return 0; |
40 } | 40 } |
(...skipping 10 matching lines...) Expand all Loading... |
51 return false; | 51 return false; |
52 } | 52 } |
53 | 53 |
54 return true; | 54 return true; |
55 } | 55 } |
56 | 56 |
57 } // namespace | 57 } // namespace |
58 | 58 |
59 // static | 59 // static |
60 bool WorkerPool::PostTask(const tracked_objects::Location& from_here, | 60 bool WorkerPool::PostTask(const tracked_objects::Location& from_here, |
61 const base::Closure& task, bool task_is_slow) { | 61 base::OnceClosure task, |
62 PendingTask* pending_task = new PendingTask(from_here, task); | 62 bool task_is_slow) { |
| 63 PendingTask* pending_task = new PendingTask(from_here, std::move(task)); |
63 return PostTaskInternal(pending_task, task_is_slow); | 64 return PostTaskInternal(pending_task, task_is_slow); |
64 } | 65 } |
65 | 66 |
66 // static | 67 // static |
67 bool WorkerPool::RunsTasksOnCurrentThread() { | 68 bool WorkerPool::RunsTasksOnCurrentThread() { |
68 return g_worker_pool_running_on_this_thread.Get().Get(); | 69 return g_worker_pool_running_on_this_thread.Get().Get(); |
69 } | 70 } |
70 | 71 |
71 } // namespace base | 72 } // namespace base |
OLD | NEW |