no tasks from inside tasks

Author: tjhei

include/deal.II/base/thread_management.h

@@ -505,8 +505,19 @@ namespace Threads
       if (MultithreadInfo::n_threads() > 1)
         {
 #ifdef DEAL_II_WITH_TASKFLOW
-          task_data = std::make_shared<TaskData>(
-            MultithreadInfo::get_taskflow_executor().async(function_object));
+          // Detect if we are running in a TaskFlow worker thread or on
+          // the main thread. We only schedule an async task in the latter
+          // case and will eagerly run the task otherwise. This is to avoid
+          // potential deadlocks with locks being taken within tasks.
+          // Performance gain from scheduling tasks from within tasks is
+          // questionable at best anyways.
+          if (MultithreadInfo::get_taskflow_executor().this_worker_id() < 0)
+            {
+              task_data = std::make_shared<TaskData>(
+                MultithreadInfo::get_taskflow_executor().async(
+                  function_object));
+              return;
+            }
 #elif defined(DEAL_II_WITH_TBB)
           // Create a promise object and from it extract a future that
           // we can use to refer to the outcome of the task. For reasons
@@ -574,6 +585,7 @@ namespace Threads
                     }
                 }
             });
+          return;
 
 #else
           // If no threading library is supported, just fall back onto C++11
@@ -596,40 +608,40 @@ namespace Threads
           task_data = std::make_shared<TaskData>(
             std::async(std::launch::async | std::launch::deferred,
                        function_object));
+          return;
 #endif
         }
-      else
-        {
-          // Only one thread allowed. So let the task run to completion
-          // and just emplace a 'ready' future.
-          //
-          // The design of std::promise/std::future is unclear, but it
-          // seems that the intent is to obtain the std::future before
-          // we set the std::promise. So create the TaskData object at
-          // the top and then run the task and set the returned
-          // value. Since everything here happens sequentially, it
-          // really doesn't matter in which order all of this is
-          // happening.
-          std::promise<RT> promise;
-          task_data = std::make_shared<TaskData>(promise.get_future());
-          try
-            {
-              internal::evaluate_and_set_promise(function_object, promise);
-            }
-          catch (...)
-            {
-              try
-                {
-                  // store anything thrown in the promise
-                  promise.set_exception(std::current_exception());
-                }
-              catch (...)
-                {
-                  // set_exception() may throw too. But ignore this on
-                  // the task.
-                }
-            }
-        }
+      {
+        // Only one thread allowed. So let the task run to completion
+        // and just emplace a 'ready' future.
+        //
+        // The design of std::promise/std::future is unclear, but it
+        // seems that the intent is to obtain the std::future before
+        // we set the std::promise. So create the TaskData object at
+        // the top and then run the task and set the returned
+        // value. Since everything here happens sequentially, it
+        // really doesn't matter in which order all of this is
+        // happening.
+        std::promise<RT> promise;
+        task_data = std::make_shared<TaskData>(promise.get_future());
+        try
+          {
+            internal::evaluate_and_set_promise(function_object, promise);
+          }
+        catch (...)
+          {
+            try
+              {
+                // store anything thrown in the promise
+                promise.set_exception(std::current_exception());
+              }
+            catch (...)
+              {
+                // set_exception() may throw too. But ignore this on
+                // the task.
+              }
+          }
+      }
     }
 
     /**