Add batching parameter to parallel_for_each

parallel_for_each currently requires each thread to process at least
10 elements.  However, when indexing, it's fine for a thread to handle
just a single CU.  This patch parameterizes this, and updates the one
user.

diff --git a/gdb/minsyms.c b/gdb/minsyms.c
index f1c28907fa6c74dc6c056b5aae30adbb26073f14..cbd0ad2239285524fa10dbeb3a70feb8ffddca29 100644 (file)
--- a/gdb/minsyms.c
+++ b/gdb/minsyms.c
@@ -1460,8 +1460,8 @@ minimal_symbol_reader::install ()
       std::vector<computed_hash_values> hash_values (mcount);
 
       msymbols = m_objfile->per_bfd->msymbols.get ();
-      gdb::parallel_for_each
-       (&msymbols[0], &msymbols[mcount],
+      /* Arbitrarily require at least 10 elements in a thread.  */
+      gdb::parallel_for_each (10, &msymbols[0], &msymbols[mcount],
         [&] (minimal_symbol *start, minimal_symbol *end)
         {
           for (minimal_symbol *msym = start; msym < end; ++msym)

diff --git a/gdb/unittests/parallel-for-selftests.c b/gdb/unittests/parallel-for-selftests.c
index adfc82f82bd82dc2753c49fcbd64462238ad6bc7..e0c07e55e0385457a35c7f38df5b53720e22f972 100644 (file)
--- a/gdb/unittests/parallel-for-selftests.c
+++ b/gdb/unittests/parallel-for-selftests.c
@@ -52,7 +52,7 @@ test (int n_threads)
 #define NUMBER 10000
 
   std::atomic<int> counter (0);
-  gdb::parallel_for_each (0, NUMBER,
+  gdb::parallel_for_each (1, 0, NUMBER,
                          [&] (int start, int end)
                          {
                            counter += end - start;

diff --git a/gdbsupport/parallel-for.h b/gdbsupport/parallel-for.h
index 915814e485e169c6c4d8ee4801cb1d394b87d3a2..811ffd61bda45a764b1a6fa7b3c6f29b5eb17bd8 100644 (file)
--- a/gdbsupport/parallel-for.h
+++ b/gdbsupport/parallel-for.h
@@ -32,11 +32,16 @@ namespace gdb
 
    This approach was chosen over having the callback work on single
    items because it makes it simple for the caller to do
-   once-per-subrange initialization and destruction.  */
+   once-per-subrange initialization and destruction.
+
+   The parameter N says how batching ought to be done -- there will be
+   at least N elements processed per thread.  Setting N to 0 is not
+   allowed.  */
 
 template<class RandomIt, class RangeFunction>
 void
-parallel_for_each (RandomIt first, RandomIt last, RangeFunction callback)
+parallel_for_each (unsigned n, RandomIt first, RandomIt last,
+                  RangeFunction callback)
 {
   /* So we can use a local array below.  */
   const size_t local_max = 16;
@@ -48,10 +53,11 @@ parallel_for_each (RandomIt first, RandomIt last, RangeFunction callback)
   size_t n_elements = last - first;
   if (n_threads > 1)
     {
-      /* Arbitrarily require that there should be at least 10 elements
-        in a thread.  */
-      if (n_elements / n_threads < 10)
-       n_threads = std::max (n_elements / 10, (size_t) 1);
+      /* Require that there should be at least N elements in a
+        thread.  */
+      gdb_assert (n > 0);
+      if (n_elements / n_threads < n)
+       n_threads = std::max (n_elements / n, (size_t) 1);
       size_t elts_per_thread = n_elements / n_threads;
       n_actual_threads = n_threads - 1;
       for (int i = 0; i < n_actual_threads; ++i)