Create base::WorkerPoolJob. Use it for HostResolverImpl and DirectoryLister.

net/base/directory_lister.cc

 // Copyright (c) 2009 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 "net/base/directory_lister.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/i18n/file_util_icu.h"
-#include "base/message_loop.h"
-#include "base/platform_thread.h"
+#include "base/logging.h"
+#include "base/waitable_event.h"
+#include "base/worker_pool_job.h"
+#include "build/build_config.h"
 #include "net/base/net_errors.h"
 
 namespace net {
 
-static const int kFilesPerEvent = 8;
+namespace {
 
-// A task which is used to signal the delegate asynchronously.
-class DirectoryDataEvent : public Task {
-public:
-  explicit DirectoryDataEvent(DirectoryLister* d) : lister(d), error(0) {
-    // Allocations of the FindInfo aren't super cheap, so reserve space.
-    data.reserve(64);
-  }
-
-  void Run() {
-    if (data.empty()) {
-      lister->OnDone(error);
-      return;
-    }
-    lister->OnReceivedData(&data[0], static_cast<int>(data.size()));
-  }
-
-  scoped_refptr<DirectoryLister> lister;
-  std::vector<DirectoryLister::DirectoryListerData> data;
-  int error;
-};
+const int kFilesPerEvent = 8;
 
 // Comparator for sorting lister results. This uses the locale aware filename
 // comparison function on the filenames for sorting in the user's locale.
-// Static.
-bool DirectoryLister::CompareAlphaDirsFirst(const DirectoryListerData& a,
-                                            const DirectoryListerData& b) {
+bool CompareAlphaDirsFirst(const DirectoryLister::Data& a,
+                           const DirectoryLister::Data& b) {
   // Parent directory before all else.
   if (file_util::IsDotDot(file_util::FileEnumerator::GetFilename(a.info)))
     return true;
   if (file_util::IsDotDot(file_util::FileEnumerator::GetFilename(b.info)))
     return false;
 
   // Directories before regular files.
   bool a_is_directory = file_util::FileEnumerator::IsDirectory(a.info);
   bool b_is_directory = file_util::FileEnumerator::IsDirectory(b.info);
   if (a_is_directory != b_is_directory)
     return a_is_directory;
 
   return file_util::LocaleAwareCompareFilenames(
       file_util::FileEnumerator::GetFilename(a.info),
       file_util::FileEnumerator::GetFilename(b.info));
 }
 
-// Static.
-bool DirectoryLister::CompareDate(const DirectoryListerData& a,
-                                  const DirectoryListerData& b) {
+bool CompareDate(const DirectoryLister::Data& a,
+                 const DirectoryLister::Data& b) {
   // Parent directory before all else.
   if (file_util::IsDotDot(file_util::FileEnumerator::GetFilename(a.info)))
     return true;
   if (file_util::IsDotDot(file_util::FileEnumerator::GetFilename(b.info)))
     return false;
 
   // Directories before regular files.
   bool a_is_directory = file_util::FileEnumerator::IsDirectory(a.info);
   bool b_is_directory = file_util::FileEnumerator::IsDirectory(b.info);
   if (a_is_directory != b_is_directory)
     return a_is_directory;
 #if defined(OS_POSIX)
   return a.info.stat.st_mtime > b.info.stat.st_mtime;
 #elif defined(OS_WIN)
   if (a.info.ftLastWriteTime.dwHighDateTime ==
       b.info.ftLastWriteTime.dwHighDateTime) {
     return a.info.ftLastWriteTime.dwLowDateTime >
            b.info.ftLastWriteTime.dwLowDateTime;
   } else {
     return a.info.ftLastWriteTime.dwHighDateTime >
            b.info.ftLastWriteTime.dwHighDateTime;
   }
 #endif
 }
 
 // Comparator for sorting find result by paths. This uses the locale-aware
 // comparison function on the filenames for sorting in the user's locale.
-// Static.
-bool DirectoryLister::CompareFullPath(const DirectoryListerData& a,
-                                      const DirectoryListerData& b) {
+bool CompareFullPath(const DirectoryLister::Data& a,
+                     const DirectoryLister::Data& b) {
   return file_util::LocaleAwareCompareFilenames(a.path, b.path);
 }
 
-DirectoryLister::DirectoryLister(const FilePath& dir,
-                                 DirectoryListerDelegate* delegate)
-    : dir_(dir),
-      recursive_(false),
+}  // namespace
+
+class DirectoryLister::Job : public base::WorkerPoolJob {
+ public:
+  Job(const FilePath& dir,
+      bool recursive,
+      SORT_TYPE sort,
+      Delegate* delegate);
+
+  void Start() { StartJob(); }
+  void Cancel() {
+    CancelJob();
+  }
+
+  void WaitUntilDone();
+
+  using WorkerPoolJob::is_running;
+
+ private:
+  friend class base::RefCountedThreadSafe<Job>;
+
+  virtual ~Job();
+
+  virtual void RunJob();
+  virtual void CompleteJob();
+  virtual void OnCanceled();
+
+  // Construction parameters.
+  const FilePath dir_;
+  const bool recursive_;
+  const SORT_TYPE sort_;
+  Delegate* const delegate_;
+
+  // Job state to pass to delegate.
+  int error_;
+  std::vector<Data> data_;
+
+  // Used to monitor Job progress.
+  base::WaitableEvent done_;
+};
+
+DirectoryLister::Job::Job(const FilePath& dir,
+                          bool recursive,
+                          SORT_TYPE sort,
+                          Delegate* delegate)
+    : base::WorkerPoolJob(true),
+      dir_(dir),
+      recursive_(recursive),
+      sort_(sort),
       delegate_(delegate),
-      sort_(ALPHA_DIRS_FIRST),
-      message_loop_(NULL),
-      thread_(kNullThreadHandle) {
+      error_(OK),
+      done_(false /* set to auto reset */, false /* initial value of false */) {
   DCHECK(!dir.value().empty());
+  // Allocations of the FindInfo aren't super cheap, so reserve space.
+  data_.reserve(64);
 }
 
-DirectoryLister::DirectoryLister(const FilePath& dir,
-                                 bool recursive,
-                                 SORT_TYPE sort,
-                                 DirectoryListerDelegate* delegate)
-    : dir_(dir),
-      recursive_(recursive),
-      delegate_(delegate),
-      sort_(sort),
-      message_loop_(NULL),
-      thread_(kNullThreadHandle) {
-  DCHECK(!dir.value().empty());
+DirectoryLister::Job::~Job() {}
+
+void DirectoryLister::Job::WaitUntilDone() {
+  bool rv = done_.Wait();
+  DCHECK(rv);
 }
 
-DirectoryLister::~DirectoryLister() {
-  if (thread_) {
-    PlatformThread::Join(thread_);
-  }
-}
-
-bool DirectoryLister::Start() {
-  // spawn a thread to enumerate the specified directory
-
-  // pass events back to the current thread
-  message_loop_ = MessageLoop::current();
-  DCHECK(message_loop_) << "calling thread must have a message loop";
-
-  AddRef();  // the thread will release us when it is done
-
-  if (!PlatformThread::Create(0, this, &thread_)) {
-    Release();
-    return false;
-  }
-
-  return true;
-}
-
-void DirectoryLister::Cancel() {
-  canceled_.Set();
-
-  if (thread_) {
-    PlatformThread::Join(thread_);
-    thread_ = kNullThreadHandle;
-  }
-}
-
-void DirectoryLister::ThreadMain() {
-  DirectoryDataEvent* e = new DirectoryDataEvent(this);
-
+void DirectoryLister::Job::RunJob() {
   if (!file_util::DirectoryExists(dir_)) {
-    e->error = net::ERR_FILE_NOT_FOUND;
-    message_loop_->PostTask(FROM_HERE, e);
-    Release();
+    error_ = net::ERR_FILE_NOT_FOUND;
+    done_.Signal();
     return;
   }
 
   int types = file_util::FileEnumerator::FILES |
               file_util::FileEnumerator::DIRECTORIES;
   if (!recursive_)
     types |= file_util::FileEnumerator::INCLUDE_DOT_DOT;
 
   file_util::FileEnumerator file_enum(dir_, recursive_,
       static_cast<file_util::FileEnumerator::FILE_TYPE>(types));
 
   FilePath path;
-  while (!canceled_.IsSet() && !(path = file_enum.Next()).empty()) {
-    DirectoryListerData data;
+  while (!canceled() && !(path = file_enum.Next()).empty()) {
+    Data data;
     file_enum.GetFindInfo(&data.info);
     data.path = path;
-    e->data.push_back(data);
+    data_.push_back(data);
 
     /* TODO(brettw) bug 24107: It would be nice to send incremental updates.
        We gather them all so they can be sorted, but eventually the sorting
        should be done from JS to give more flexibility in the page. When we do
        that, we can uncomment this to send incremental updates to the page.
     if (++e->count == kFilesPerEvent) {
       message_loop_->PostTask(FROM_HERE, e);
       e = new DirectoryDataEvent(this);
     }
     */
   }
 
-  if (!e->data.empty()) {
+  if (!data_.empty()) {
     // Sort the results. See the TODO above (this sort should be removed and we
     // should do it from JS).
     if (sort_ == DATE)
-      std::sort(e->data.begin(), e->data.end(), CompareDate);
+      std::sort(data_.begin(), data_.end(), CompareDate);
     else if (sort_ == FULL_PATH)
-      std::sort(e->data.begin(), e->data.end(), CompareFullPath);
+      std::sort(data_.begin(), data_.end(), CompareFullPath);
     else if (sort_ == ALPHA_DIRS_FIRST)
-      std::sort(e->data.begin(), e->data.end(), CompareAlphaDirsFirst);
+      std::sort(data_.begin(), data_.end(), CompareAlphaDirsFirst);
     else
       DCHECK_EQ(NO_SORT, sort_);
-
-    message_loop_->PostTask(FROM_HERE, e);
-    e = new DirectoryDataEvent(this);
   }
 
-  // Notify done
-  Release();
-  message_loop_->PostTask(FROM_HERE, e);
+  done_.Signal();
 }
 
-void DirectoryLister::OnReceivedData(const DirectoryListerData* data,
-                                     int count) {
-  // Since the delegate can clear itself during the OnListFile callback, we
-  // need to null check it during each iteration of the loop.  Similarly, it is
-  // necessary to check the canceled_ flag to avoid sending data to a delegate
-  // who doesn't want anymore.
-  for (int i = 0; !canceled_.IsSet() && delegate_ && i < count; ++i)
-    delegate_->OnListFile(data[i]);
+void DirectoryLister::Job::CompleteJob() {
+  for (size_t i = 0; i < data_.size(); ++i) {
+    delegate_->OnListFile(data_[i]);
+    if (canceled())
+      return;
+  }
+
+  delegate_->OnListDone(error_);
 }
 
-void DirectoryLister::OnDone(int error) {
-  // If canceled is set, we need to report some kind of error,
-  // but don't overwrite the error condition if it is already set.
-  if (!error && canceled_.IsSet())
-    error = net::ERR_ABORTED;
+void DirectoryLister::Job::OnCanceled() {
+  done_.Signal();
+}
 
-  if (delegate_)
-    delegate_->OnListDone(error);
+DirectoryLister::DirectoryLister(const FilePath& dir,
+                                 Delegate* delegate)
+    : job_handle_(new Job(dir, false, ALPHA_DIRS_FIRST, delegate)) {}
+
+DirectoryLister::DirectoryLister(const FilePath& dir,
+                                 bool recursive,
+                                 SORT_TYPE sort,
+                                 Delegate* delegate)
+    : job_handle_(new Job(dir, recursive, sort, delegate)) {}
+
+DirectoryLister::~DirectoryLister() {}
+
+void DirectoryLister::Start() {
+  job_handle_.job()->Start();
+}
+
+void DirectoryLister::Cancel() {
+  job_handle_.job()->Cancel();
+}
+
+void DirectoryLister::WaitUntilDone() {
+  job_handle_.job()->WaitUntilDone();
 }
 
 }  // namespace net