ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

logic: Fixed concurrency issues in TaskGroupParallel causing scheduler freeze

Browse Source
This commit is contained in:
Eberhard Graether
2017-05-04 11:57:52 +02:00
parent 74da2c7de9
commit e8c01ae2ce
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/utility/scheduling/TaskGroupParallel.cpp
+7 -5
View File
@@ -26,12 +26,11 @@ void TaskGroupParallel::doEnter(std::shared_ptr<Blackboard> blackboard)
if (m_needsToStartThreads) if (m_needsToStartThreads)
{ {
m_needsToStartThreads = false; m_needsToStartThreads = false;
m_activeTaskCount = 0; m_activeTaskCount = m_tasks.size();
for (size_t i = 0; i < m_tasks.size(); i++) for (size_t i = 0; i < m_tasks.size(); i++)
{ {
m_tasks[i]->thread = std::make_shared<std::thread>(&TaskGroupParallel::processTaskThreaded, this, m_tasks[i], blackboard);
m_tasks[i]->active = true; m_tasks[i]->active = true;
m_activeTaskCount++; m_tasks[i]->thread = std::make_shared<std::thread>(&TaskGroupParallel::processTaskThreaded, this, m_tasks[i], blackboard);
} }
} }
} }
@@ -65,10 +64,13 @@ void TaskGroupParallel::doReset(std::shared_ptr<Blackboard> blackboard)
m_tasks[i]->taskRunner->reset(); m_tasks[i]->taskRunner->reset();
if (!m_tasks[i]->active) if (!m_tasks[i]->active)
{ {
{
std::lock_guard<std::mutex> lock(m_activeTaskCountMutex);
m_activeTaskCount++;
}
m_tasks[i]->thread->join(); m_tasks[i]->thread->join();
m_tasks[i]->thread = std::make_shared<std::thread>(&TaskGroupParallel::processTaskThreaded, this, m_tasks[i], blackboard);
m_tasks[i]->active = true; m_tasks[i]->active = true;
m_activeTaskCount++; m_tasks[i]->thread = std::make_shared<std::thread>(&TaskGroupParallel::processTaskThreaded, this, m_tasks[i], blackboard);
} }
} }
} }