feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

TaskTree: Fix continuation of group with parallel limit

Browse Source 
Change-Id: I10c40d06c21a0446187b8227b526ee903c569307
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Jarek Kobus
2023-01-24 11:56:30 +01:00
parent 540b679c14
commit 567216bb49
2 changed files with 58 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/libs/utils/tasktree.cpp
View File

@@ -147,7 +147,7 @@ public:
const TaskItem &task);
~TaskContainer();
TaskAction start();
TaskAction startChildren();
TaskAction startChildren(int nextChild);
void stop();
bool isRunning() const;
int taskCount() const;
@@ -370,13 +370,13 @@ TaskAction TaskContainer::start()
resetSuccessBit();
GuardLocker locker(m_startGuard);
return startChildren();
return startChildren(0);
}
TaskAction TaskContainer::startChildren()
TaskAction TaskContainer::startChildren(int nextChild)
{
const int childCount = m_children.size();
for (int i = m_doneCount; i < childCount; ++i) {
for (int i = nextChild; i < childCount; ++i) {
const int limit = currentLimit();
if (i >= limit)
break;
@@ -432,7 +432,7 @@ int TaskContainer::taskCount() const
int TaskContainer::currentLimit() const
{
const int childCount = m_children.size();
return m_parallelLimit ? qMin(m_doneCount + m_parallelLimit, childCount) : childCount;
return m_parallelLimit ? qMin(m_doneCount + m_parallelLimit, childCount) : childCount;
}
TaskAction TaskContainer::childDone(bool success)
@@ -445,6 +445,7 @@ TaskAction TaskContainer::childDone(bool success)
return toTaskAction(success);
}
const int limit = currentLimit();
++m_doneCount;
updateSuccessBit(success);
@@ -460,7 +461,10 @@ TaskAction TaskContainer::childDone(bool success)
if (m_startGuard.isLocked())
return TaskAction::Continue;
return startChildren();
if (limit >= m_children.size())
return TaskAction::Continue;
return startChildren(limit);
}
void TaskContainer::groupDone(bool success)
@@ -563,6 +567,7 @@ void TaskContainer::deactivateStorages()
TaskAction TaskNode::start()
{
QTC_CHECK(!isRunning());
if (!isTask())
return m_container.start();

47
tests/auto/utils/tasktree/tst_tasktree.cpp
View File

@@ -565,6 +565,53 @@ void tst_TaskTree::processTree_data()
{-1, Handler::GroupDone}};
QTest::newRow("DynamicSetupContinue") << dynamicSetupContinueRoot << storage
<< dynamicSetupContinueLog << true << true << 4;
const Group nestedParallelRoot {
ParallelLimit(2),
Storage(storage),
Group {
Storage(TreeStorage<CustomStorage>()),
OnGroupSetup(std::bind(groupSetup, 1)),
Group {
parallel,
Process(std::bind(setupProcess, _1, 1)),
}
},
Group {
Storage(TreeStorage<CustomStorage>()),
OnGroupSetup(std::bind(groupSetup, 2)),
Group {
parallel,
Process(std::bind(setupProcess, _1, 2)),
}
},
Group {
Storage(TreeStorage<CustomStorage>()),
OnGroupSetup(std::bind(groupSetup, 3)),
Group {
parallel,
Process(std::bind(setupProcess, _1, 3)),
}
},
Group {
Storage(TreeStorage<CustomStorage>()),
OnGroupSetup(std::bind(groupSetup, 4)),
Group {
parallel,
Process(std::bind(setupProcess, _1, 4)),
}
},
};
const Log nestedParallelLog{{1, Handler::GroupSetup},
{1, Handler::Setup},
{2, Handler::GroupSetup},
{2, Handler::Setup},
{3, Handler::GroupSetup},
{3, Handler::Setup},
{4, Handler::GroupSetup},
{4, Handler::Setup}};
QTest::newRow("NestedParallel") << nestedParallelRoot << storage << nestedParallelLog
<< true << true << 4;
}
void tst_TaskTree::processTree()