Fix potential deadlock on full work queue

ecmwf · Jan 6, 2025 · a777486 · a777486
1 parent 6c2e44f
commit a777486
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/gribjump/Task.cc b/src/gribjump/Task.cc
@@ -114,9 +114,12 @@ void TaskGroup::cancelTasks() {
 }
 
 void TaskGroup::enqueueTask(Task* task) {
-    std::lock_guard<std::mutex> lock(m_);
-    tasks_.push_back(std::unique_ptr<Task>(task)); // TaskGroup takes ownership of its tasks
-    WorkQueue::instance().push(task);
+    {
+        std::lock_guard<std::mutex> lock(m_);
+        tasks_.push_back(std::unique_ptr<Task>(task)); // TaskGroup takes ownership of its tasks
+    }
+
+    WorkQueue::instance().push(task); /// @note Can block, so release the lock first
 
     LOG_DEBUG_LIB(LibGribJump) << "Queued task " <<  tasks_.size() << std::endl;
 }