[Lldb-commits] [lldb] r319492 - [lldb] A few minor fixes in TaskPool

[Alexander Shaposhnikov via lldb-commits]

Author: alexshap
Date: Thu Nov 30 14:56:11 2017
New Revision: 319492

URL: http://llvm.org/viewvc/llvm-project?rev=319492&view=rev
Log:
[lldb] A few minor fixes in TaskPool

1. Move TaskPool into the namespace lldb_private.
2. Add missing std::move in TaskPoolImpl::Worker.
3. std::thread::hardware_concurrency may return 0,
handle this case correctly.

Differential revision: https://reviews.llvm.org/D40587

Test plan: make check-all

Modified:
    lldb/trunk/include/lldb/Host/TaskPool.h
    lldb/trunk/source/Host/common/TaskPool.cpp
    lldb/trunk/unittests/Host/TaskPoolTest.cpp

Modified: lldb/trunk/include/lldb/Host/TaskPool.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Host/TaskPool.h?rev=319492&r1=319491&r2=319492&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Host/TaskPool.h (original)
+++ lldb/trunk/include/lldb/Host/TaskPool.h Thu Nov 30 14:56:11 2017
@@ -18,6 +18,8 @@
 #include <mutex>       // for mutex, unique_lock, condition_variable
 #include <type_traits> // for forward, result_of, move
 
+namespace lldb_private {
+
 // Global TaskPool class for running tasks in parallel on a set of worker thread
 // created the first
 // time the task pool is used. The TaskPool provide no guarantee about the order
@@ -89,4 +91,8 @@ template <> struct TaskPool::RunTaskImpl
 void TaskMapOverInt(size_t begin, size_t end,
                     const llvm::function_ref<void(size_t)> &func);
 
+unsigned GetHardwareConcurrencyHint();
+
+} // namespace lldb_private
+
 #endif // #ifndef utility_TaskPool_h_

Modified: lldb/trunk/source/Host/common/TaskPool.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/common/TaskPool.cpp?rev=319492&r1=319491&r2=319492&view=diff
==============================================================================
--- lldb/trunk/source/Host/common/TaskPool.cpp (original)
+++ lldb/trunk/source/Host/common/TaskPool.cpp Thu Nov 30 14:56:11 2017
@@ -14,6 +14,8 @@
 #include <queue>   // for queue
 #include <thread>  // for thread
 
+namespace lldb_private {
+
 namespace {
 class TaskPoolImpl {
 public:
@@ -46,13 +48,20 @@ void TaskPool::AddTaskImpl(std::function
 
 TaskPoolImpl::TaskPoolImpl() : m_thread_count(0) {}
 
+unsigned GetHardwareConcurrencyHint() {
+  // std::thread::hardware_concurrency may return 0
+  // if the value is not well defined or not computable.
+  static const unsigned g_hardware_concurrency = 
+    std::max(1u, std::thread::hardware_concurrency());
+  return g_hardware_concurrency;
+}
+
 void TaskPoolImpl::AddTask(std::function<void()> &&task_fn) {
-  static const uint32_t max_threads = std::thread::hardware_concurrency();
   const size_t min_stack_size = 8 * 1024 * 1024;
 
   std::unique_lock<std::mutex> lock(m_tasks_mutex);
   m_tasks.emplace(std::move(task_fn));
-  if (m_thread_count < max_threads) {
+  if (m_thread_count < GetHardwareConcurrencyHint()) {
     m_thread_count++;
     // Note that this detach call needs to happen with the m_tasks_mutex held.
     // This prevents the thread
@@ -77,7 +86,7 @@ void TaskPoolImpl::Worker(TaskPoolImpl *
       break;
     }
 
-    std::function<void()> f = pool->m_tasks.front();
+    std::function<void()> f = std::move(pool->m_tasks.front());
     pool->m_tasks.pop();
     lock.unlock();
 
@@ -87,10 +96,9 @@ void TaskPoolImpl::Worker(TaskPoolImpl *
 
 void TaskMapOverInt(size_t begin, size_t end,
                     const llvm::function_ref<void(size_t)> &func) {
+  const size_t num_workers = std::min<size_t>(end, GetHardwareConcurrencyHint());
   std::atomic<size_t> idx{begin};
-  size_t num_workers =
-      std::min<size_t>(end, std::thread::hardware_concurrency());
-
+  
   auto wrapper = [&idx, end, &func]() {
     while (true) {
       size_t i = idx.fetch_add(1);
@@ -107,3 +115,6 @@ void TaskMapOverInt(size_t begin, size_t
   for (size_t i = 0; i < num_workers; i++)
     futures[i].wait();
 }
+
+} // namespace lldb_private
+

Modified: lldb/trunk/unittests/Host/TaskPoolTest.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/Host/TaskPoolTest.cpp?rev=319492&r1=319491&r2=319492&view=diff
==============================================================================
--- lldb/trunk/unittests/Host/TaskPoolTest.cpp (original)
+++ lldb/trunk/unittests/Host/TaskPoolTest.cpp Thu Nov 30 14:56:11 2017
@@ -2,6 +2,8 @@
 
 #include "lldb/Host/TaskPool.h"
 
+using namespace lldb_private;
+
 TEST(TaskPoolTest, AddTask) {
   auto fn = [](int x) { return x * x + 1; };