base: Refactor PendingTask out of MessageLoop.

base/threading/worker_pool_posix.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/threading/worker_pool_posix.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/stringprintf.h"
 #include "base/task.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/worker_pool.h"
 #include "base/tracked_objects.h"
 
+using tracked_objects::TrackedTime;
+
 namespace base {
 
 namespace {
 
 const int kIdleSecondsBeforeExit = 10 * 60;
 // A stack size of 64 KB is too small for the CERT_PKIXVerifyCert
 // function of NSS because of NSS bug 439169.
 const int kWorkerThreadStackSize = 128 * 1024;
 
 class WorkerPoolImpl {
@@ skipping 48 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(WorkerThread);
 };
 
 void WorkerThread::ThreadMain() {
   const std::string name = base::StringPrintf(
       "%s/%d", name_prefix_.c_str(), PlatformThread::CurrentId());
   // Note |name.c_str()| must remain valid for for the whole life of the thread.
   PlatformThread::SetName(name.c_str());
 
   for (;;) {
-    PosixDynamicThreadPool::PendingTask pending_task = pool_->WaitForTask();
+    PendingTask pending_task = pool_->WaitForTask();
     if (pending_task.task.is_null())
       break;
     UNSHIPPED_TRACE_EVENT2("task", "WorkerThread::ThreadMain::Run",
         "src_file", pending_task.posted_from.file_name(),
         "src_func", pending_task.posted_from.function_name());
 
-    tracked_objects::TrackedTime start_time =
+    TrackedTime start_time =
         tracked_objects::ThreadData::NowForStartOfRun();
 
     pending_task.task.Run();
 
     tracked_objects::ThreadData::TallyRunOnWorkerThreadIfTracking(
-        pending_task.birth_tally, pending_task.time_posted,
+        pending_task.birth_tally, TrackedTime(pending_task.time_posted),
         start_time, tracked_objects::ThreadData::NowForEndOfRun());
   }
 
   // The WorkerThread is non-joinable, so it deletes itself.
   delete this;
 }
 
 }  // namespace
 
 bool WorkerPool::PostTask(const tracked_objects::Location& from_here,
                           Task* task, bool task_is_slow) {
   g_lazy_worker_pool.Pointer()->PostTask(from_here, task, task_is_slow);
   return true;
 }
 
 bool WorkerPool::PostTask(const tracked_objects::Location& from_here,
                           const base::Closure& task, bool task_is_slow) {
   g_lazy_worker_pool.Pointer()->PostTask(from_here, task, task_is_slow);
   return true;
 }
 
-PosixDynamicThreadPool::PendingTask::PendingTask(
-    const tracked_objects::Location& posted_from,
-    const base::Closure& task)
-    : posted_from(posted_from),
-      task(task) {
-  birth_tally = tracked_objects::ThreadData::TallyABirthIfActive(posted_from);
-  time_posted = tracked_objects::ThreadData::Now();
-}
-
-PosixDynamicThreadPool::PendingTask::~PendingTask() {
-}
-
 PosixDynamicThreadPool::PosixDynamicThreadPool(
     const std::string& name_prefix,
     int idle_seconds_before_exit)
     : name_prefix_(name_prefix),
       idle_seconds_before_exit_(idle_seconds_before_exit),
       pending_tasks_available_cv_(&lock_),
       num_idle_threads_(0),
       terminated_(false),
       num_idle_threads_cv_(NULL) {}
 
@@ skipping 48 matching lines @@
     pending_tasks_available_cv_.Signal();
   } else {
     // The new PlatformThread will take ownership of the WorkerThread object,
     // which will delete itself on exit.
     WorkerThread* worker =
         new WorkerThread(name_prefix_, this);
     PlatformThread::CreateNonJoinable(kWorkerThreadStackSize, worker);
   }
 }
 
-PosixDynamicThreadPool::PendingTask PosixDynamicThreadPool::WaitForTask() {
+PendingTask PosixDynamicThreadPool::WaitForTask() {
   AutoLock locked(lock_);
 
   if (terminated_)
     return PendingTask(FROM_HERE, base::Closure());
 
   if (pending_tasks_.empty()) {  // No work available, wait for work.
     num_idle_threads_++;
     if (num_idle_threads_cv_.get())
       num_idle_threads_cv_->Signal();
     pending_tasks_available_cv_.TimedWait(
         TimeDelta::FromSeconds(idle_seconds_before_exit_));
     num_idle_threads_--;
     if (num_idle_threads_cv_.get())
       num_idle_threads_cv_->Signal();
     if (pending_tasks_.empty()) {
       // We waited for work, but there's still no work.  Return NULL to signal
       // the thread to terminate.
       return PendingTask(FROM_HERE, base::Closure());
     }
   }
 
   PendingTask pending_task = pending_tasks_.front();
   pending_tasks_.pop();
   return pending_task;
 }
 
 }  // namespace base