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

TaskTree: Replace usages of OnGroup... with onGroup... functions

Browse Source 
Change-Id: I06ce6c917ac28b6362ad2cdef42355e5aa28f4eb
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2023-05-02 12:31:16 +02:00
parent 04382d39a0
commit 0793b945f3
18 changed files with 142 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/autotest/testrunner.cpp
View File

@@ -444,7 +444,7 @@ void TestRunner::runTestsHelper()
const Group group { const Group group {
optional, optional,
Storage(storage), Storage(storage),
OnGroupSetup(onSetup), onGroupSetup(onSetup),
ProcessTask(onProcessSetup, onProcessDone, onProcessDone) ProcessTask(onProcessSetup, onProcessDone, onProcessDone)
}; };
tasks.append(group); tasks.append(group);

2
src/plugins/clangtools/clangtoolrunner.cpp
View File

@@ -184,7 +184,7 @@ TaskItem clangToolTask(const AnalyzeInputData &input,
const Group group { const Group group {
Storage(storage), Storage(storage),
OnGroupSetup(onSetup), onGroupSetup(onSetup),
Group { Group {
optional, optional,
ProcessTask(onProcessSetup, onProcessDone, onProcessError) ProcessTask(onProcessSetup, onProcessDone, onProcessError)

2
src/plugins/coreplugin/locator/directoryfilter.cpp
View File

@@ -95,7 +95,7 @@ DirectoryFilter::DirectoryFilter(Id id)
m_cache.setFilePaths(async.result()); m_cache.setFilePaths(async.result());
}; };
const Group root { const Group root {
OnGroupSetup(groupSetup), onGroupSetup(groupSetup),
AsyncTask<FilePaths>(asyncSetup, asyncDone) AsyncTask<FilePaths>(asyncSetup, asyncDone)
}; };
setRefreshRecipe(root); setRefreshRecipe(root);

6
src/plugins/coreplugin/locator/ilocatorfilter.cpp
View File

@@ -472,9 +472,9 @@ void LocatorMatcher::start()
const Group group { const Group group {
optional, optional,
Storage(storage), Storage(storage),
OnGroupSetup(onSetup(storage, index)), onGroupSetup(onSetup(storage, index)),
OnGroupDone(onDone(storage)), onGroupDone(onDone(storage)),
OnGroupError(onDone(storage)), onGroupError(onDone(storage)),
task.task task.task
}; };
parallelTasks << group; parallelTasks << group;

2
src/plugins/coreplugin/locator/javascriptfilter.cpp
View File

@@ -426,7 +426,7 @@ LocatorMatcherTasks JavaScriptFilter::matchers()
}; };
const Group root { const Group root {
OnGroupSetup(onSetup), onGroupSetup(onSetup),
JavaScriptRequestTask(onJavaScriptSetup, onJavaScriptDone, onJavaScriptError) JavaScriptRequestTask(onJavaScriptSetup, onJavaScriptDone, onJavaScriptError)
}; };

2
src/plugins/coreplugin/locator/locator.cpp
View File

@@ -389,7 +389,7 @@ void Locator::refresh(const QList<ILocatorFilter *> &filters)
const Group group { const Group group {
optional, optional,
*task, *task,
OnGroupDone([this, filter] { m_refreshingFilters.removeOne(filter); }) onGroupDone([this, filter] { m_refreshingFilters.removeOne(filter); })
}; };
tasks.append(group); tasks.append(group);
} }

4
src/plugins/cppeditor/cppprojectupdater.cpp
View File

@@ -93,8 +93,8 @@ void CppProjectUpdater::update(const ProjectUpdateInfo &projectUpdateInfo,
const Group root { const Group root {
Storage(storage), Storage(storage),
Group(tasks), Group(tasks),
OnGroupDone(onDone), onGroupDone(onDone),
OnGroupError(onError) onGroupError(onError)
}; };
m_taskTree.reset(new TaskTree(root)); m_taskTree.reset(new TaskTree(root));
auto progress = new Core::TaskProgress(m_taskTree.get()); auto progress = new Core::TaskProgress(m_taskTree.get());

4
src/plugins/diffeditor/diffeditorplugin.cpp
View File

@@ -151,8 +151,8 @@ DiffFilesController::DiffFilesController(IDocument *document)
const Group root = { const Group root = {
Storage(storage), Storage(storage),
TaskTreeTask(setupTree), TaskTreeTask(setupTree),
OnGroupDone(onTreeDone), onGroupDone(onTreeDone),
OnGroupError(onTreeError) onGroupError(onTreeError)
}; };
setReloadRecipe(root); setReloadRecipe(root);
} }

4
src/plugins/git/branchmodel.cpp
View File

@@ -472,8 +472,8 @@ void BranchModel::refresh(const FilePath &workingDirectory, ShowError showError)
const Group root { const Group root {
topRevisionProc, topRevisionProc,
ProcessTask(setupForEachRef, forEachRefDone, forEachRefError), ProcessTask(setupForEachRef, forEachRefDone, forEachRefError),
OnGroupDone(finalize), onGroupDone(finalize),
OnGroupError(finalize) onGroupError(finalize)
}; };
d->refreshTask.reset(new TaskTree(root)); d->refreshTask.reset(new TaskTree(root));
d->refreshTask->start(); d->refreshTask->start();

2
src/plugins/git/branchview.cpp
View File

@@ -560,7 +560,7 @@ TaskTree *BranchView::onFastForwardMerge(const std::function<void()> &callback)
parallel, parallel,
ProcessTask(setupMergeBase, onMergeBaseDone), ProcessTask(setupMergeBase, onMergeBaseDone),
topRevisionProc, topRevisionProc,
OnGroupDone([storage, callback] { onGroupDone([storage, callback] {
if (storage->mergeBase == storage->topRevision) if (storage->mergeBase == storage->topRevision)
callback(); callback();
}) })

8
src/plugins/git/gitclient.cpp
View File

@@ -270,7 +270,7 @@ FileListDiffController::FileListDiffController(IDocument *document, const QStrin
continueOnDone, continueOnDone,
ProcessTask(setupStaged, onStagedDone), ProcessTask(setupStaged, onStagedDone),
ProcessTask(setupUnstaged, onUnstagedDone), ProcessTask(setupUnstaged, onUnstagedDone),
OnGroupDone(onStagingDone) onGroupDone(onStagingDone)
}, },
postProcessTask() postProcessTask()
}; };
@@ -441,7 +441,7 @@ ShowController::ShowController(IDocument *document, const QString &id)
}; };
using namespace std::placeholders; using namespace std::placeholders;
QList<TaskItem> tasks {parallel, continueOnDone, OnGroupError(onFollowsError)}; QList<TaskItem> tasks {parallel, continueOnDone, onGroupError(onFollowsError)};
for (int i = 0, total = parents.size(); i < total; ++i) { for (int i = 0, total = parents.size(); i < total; ++i) {
tasks.append(ProcessTask(std::bind(setupFollow, _1, parents.at(i)), tasks.append(ProcessTask(std::bind(setupFollow, _1, parents.at(i)),
std::bind(onFollowDone, _1, i))); std::bind(onFollowDone, _1, i)));
@@ -463,14 +463,14 @@ ShowController::ShowController(IDocument *document, const QString &id)
Storage(storage), Storage(storage),
Storage(diffInputStorage), Storage(diffInputStorage),
parallel, parallel,
OnGroupSetup([this] { setStartupFile(VcsBase::source(this->document()).toString()); }), onGroupSetup([this] { setStartupFile(VcsBase::source(this->document()).toString()); }),
Group { Group {
optional, optional,
ProcessTask(setupDescription, onDescriptionDone), ProcessTask(setupDescription, onDescriptionDone),
Group { Group {
parallel, parallel,
optional, optional,
OnGroupSetup(desciptionDetailsSetup), onGroupSetup(desciptionDetailsSetup),
ProcessTask(setupBranches, onBranchesDone, onBranchesError), ProcessTask(setupBranches, onBranchesDone, onBranchesError),
ProcessTask(setupPrecedes, onPrecedesDone, onPrecedesError), ProcessTask(setupPrecedes, onPrecedesDone, onPrecedesError),
TaskTreeTask(setupFollows) TaskTreeTask(setupFollows)

2
src/plugins/qmakeprojectmanager/qmakestep.cpp
View File

@@ -333,7 +333,7 @@ void QMakeStep::doRun()
QList<TaskItem> processList = {ProcessTask(setupQMake, onProcessDone, onProcessError)}; QList<TaskItem> processList = {ProcessTask(setupQMake, onProcessDone, onProcessError)};
if (m_runMakeQmake) if (m_runMakeQmake)
processList << ProcessTask(setupMakeQMake, onProcessDone, onProcessError); processList << ProcessTask(setupMakeQMake, onProcessDone, onProcessError);
processList << OnGroupDone(onDone); processList << onGroupDone(onDone);
runTaskTree(Group(processList)); runTaskTree(Group(processList));
} }

6
src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp
View File

@@ -261,18 +261,18 @@ Group QnxDeployQtLibrariesDialogPrivate::deployRecipe()
return TaskAction::Continue; return TaskAction::Continue;
}; };
const Group root { const Group root {
OnGroupSetup(setupHandler), onGroupSetup(setupHandler),
Group { Group {
optional, optional,
checkDirTask() checkDirTask()
}, },
Group { Group {
OnGroupSetup(subGroupSetupHandler), onGroupSetup(subGroupSetupHandler),
removeDirTask(), removeDirTask(),
uploadTask(), uploadTask(),
chmodTree() chmodTree()
}, },
OnGroupDone(doneHandler) onGroupDone(doneHandler)
}; };
return root; return root;
} }

2
src/plugins/remotelinux/genericdirectuploadstep.cpp
View File

@@ -310,7 +310,7 @@ Group GenericDirectUploadStep::deployRecipe()
chmodTree(storage), chmodTree(storage),
statTree(storage, postFilesToStat, postStatEndHandler) statTree(storage, postFilesToStat, postStatEndHandler)
}, },
OnGroupDone(doneHandler) onGroupDone(doneHandler)
}; };
return root; return root;
} }

8
src/plugins/remotelinux/linuxdevicetester.cpp
View File

@@ -225,7 +225,7 @@ TaskItem GenericLinuxDeviceTesterPrivate::transferTasks() const
transferTask(FileTransferMethod::GenericCopy, storage), transferTask(FileTransferMethod::GenericCopy, storage),
transferTask(FileTransferMethod::Sftp, storage), transferTask(FileTransferMethod::Sftp, storage),
transferTask(FileTransferMethod::Rsync, storage), transferTask(FileTransferMethod::Rsync, storage),
OnGroupError([this] { emit q->errorMessage(Tr::tr("Deployment to this device will not " onGroupError([this] { emit q->errorMessage(Tr::tr("Deployment to this device will not "
"work out of the box.\n")); "work out of the box.\n"));
}) })
}; };
@@ -255,7 +255,7 @@ TaskItem GenericLinuxDeviceTesterPrivate::commandTask(const QString &commandName
TaskItem GenericLinuxDeviceTesterPrivate::commandTasks() const TaskItem GenericLinuxDeviceTesterPrivate::commandTasks() const
{ {
QList<TaskItem> tasks {continueOnError}; QList<TaskItem> tasks {continueOnError};
tasks.append(OnGroupSetup([this] { tasks.append(onGroupSetup([this] {
emit q->progressMessage(Tr::tr("Checking if required commands are available...")); emit q->progressMessage(Tr::tr("Checking if required commands are available..."));
})); }));
for (const QString &commandName : commandsToTest()) for (const QString &commandName : commandsToTest())
@@ -305,8 +305,8 @@ void GenericLinuxDeviceTester::testDevice(const IDevice::Ptr &deviceConfiguratio
if (!d->m_extraTests.isEmpty()) if (!d->m_extraTests.isEmpty())
taskItems << Group { d->m_extraTests }; taskItems << Group { d->m_extraTests };
taskItems << d->commandTasks() taskItems << d->commandTasks()
<< OnGroupDone(std::bind(allFinished, TestSuccess)) << onGroupDone(std::bind(allFinished, TestSuccess))
<< OnGroupError(std::bind(allFinished, TestFailure)); << onGroupError(std::bind(allFinished, TestFailure));
d->m_taskTree.reset(new TaskTree(taskItems)); d->m_taskTree.reset(new TaskTree(taskItems));
d->m_taskTree->start(); d->m_taskTree->start();

196
tests/auto/solutions/tasking/tst_tasking.cpp
View File

@@ -111,12 +111,12 @@ void tst_Tasking::validConstructs()
Group { Group {
parallel, parallel,
Test([](TestTask &) {}, [](const TestTask &) {}), Test([](TestTask &) {}, [](const TestTask &) {}),
OnGroupDone([] {}) onGroupDone([] {})
} }
}, },
task, task,
OnGroupDone([] {}), onGroupDone([] {}),
OnGroupError([] {}) onGroupError([] {})
}; };
const auto setupHandler = [](TestTask &) {}; const auto setupHandler = [](TestTask &) {};
@@ -272,8 +272,8 @@ void tst_Tasking::testTree_data()
Test(setupTask(1), logDone), Test(setupTask(1), logDone),
Test(setupFailingTask(2), logDone, logError), Test(setupFailingTask(2), logDone, logError),
Test(setupTask(3), logDone), Test(setupTask(3), logDone),
OnGroupDone(groupDone(0)), onGroupDone(groupDone(0)),
OnGroupError(groupError(0)) onGroupError(groupError(0))
}; };
}; };
const auto constructDynamicHierarchy = [=](TaskAction taskAction) { const auto constructDynamicHierarchy = [=](TaskAction taskAction) {
@@ -283,39 +283,39 @@ void tst_Tasking::testTree_data()
Test(setupTask(1), logDone) Test(setupTask(1), logDone)
}, },
Group { Group {
OnGroupSetup([=] { return taskAction; }), onGroupSetup([=] { return taskAction; }),
Test(setupTask(2), logDone), Test(setupTask(2), logDone),
Test(setupTask(3), logDone), Test(setupTask(3), logDone),
Test(setupTask(4), logDone) Test(setupTask(4), logDone)
}, },
OnGroupDone(groupDone(0)), onGroupDone(groupDone(0)),
OnGroupError(groupError(0)) onGroupError(groupError(0))
}; };
}; };
{ {
const Group root1 { const Group root1 {
Storage(storage), Storage(storage),
OnGroupDone(groupDone(0)), onGroupDone(groupDone(0)),
OnGroupError(groupError(0)) onGroupError(groupError(0))
}; };
const Group root2 { const Group root2 {
Storage(storage), Storage(storage),
OnGroupSetup([] { return TaskAction::Continue; }), onGroupSetup([] { return TaskAction::Continue; }),
OnGroupDone(groupDone(0)), onGroupDone(groupDone(0)),
OnGroupError(groupError(0)) onGroupError(groupError(0))
}; };
const Group root3 { const Group root3 {
Storage(storage), Storage(storage),
OnGroupSetup([] { return TaskAction::StopWithDone; }), onGroupSetup([] { return TaskAction::StopWithDone; }),
OnGroupDone(groupDone(0)), onGroupDone(groupDone(0)),
OnGroupError(groupError(0)) onGroupError(groupError(0))
}; };
const Group root4 { const Group root4 {
Storage(storage), Storage(storage),
OnGroupSetup([] { return TaskAction::StopWithError; }), onGroupSetup([] { return TaskAction::StopWithError; }),
OnGroupDone(groupDone(0)), onGroupDone(groupDone(0)),
OnGroupError(groupError(0)) onGroupError(groupError(0))
}; };
const Log logDone {{0, Handler::GroupDone}}; const Log logDone {{0, Handler::GroupDone}};
const Log logError {{0, Handler::GroupError}}; const Log logError {{0, Handler::GroupError}};
@@ -410,7 +410,7 @@ void tst_Tasking::testTree_data()
Test(setupDynamicTask(1, TaskAction::Continue), logDone, logError), Test(setupDynamicTask(1, TaskAction::Continue), logDone, logError),
Test(setupDynamicTask(2, TaskAction::Continue), logDone, logError), Test(setupDynamicTask(2, TaskAction::Continue), logDone, logError),
Group { Group {
OnGroupSetup([storage] { onGroupSetup([storage] {
storage->m_log.append({0, Handler::GroupSetup}); storage->m_log.append({0, Handler::GroupSetup});
return TaskAction::StopWithError; return TaskAction::StopWithError;
}), }),
@@ -438,22 +438,22 @@ void tst_Tasking::testTree_data()
Group { Group {
Group { Group {
Test(setupTask(5), logDone, logError), Test(setupTask(5), logDone, logError),
OnGroupSetup(groupSetup(5)), onGroupSetup(groupSetup(5)),
OnGroupDone(groupDone(5)) onGroupDone(groupDone(5))
}, },
OnGroupSetup(groupSetup(4)), onGroupSetup(groupSetup(4)),
OnGroupDone(groupDone(4)) onGroupDone(groupDone(4))
}, },
OnGroupSetup(groupSetup(3)), onGroupSetup(groupSetup(3)),
OnGroupDone(groupDone(3)) onGroupDone(groupDone(3))
}, },
OnGroupSetup(groupSetup(2)), onGroupSetup(groupSetup(2)),
OnGroupDone(groupDone(2)) onGroupDone(groupDone(2))
}, },
OnGroupSetup(groupSetup(1)), onGroupSetup(groupSetup(1)),
OnGroupDone(groupDone(1)) onGroupDone(groupDone(1))
}, },
OnGroupDone(groupDone(0)) onGroupDone(groupDone(0))
}; };
const Log log { const Log log {
{1, Handler::GroupSetup}, {1, Handler::GroupSetup},
@@ -485,7 +485,7 @@ void tst_Tasking::testTree_data()
Test(setupTask(3), logDoneAnonymously), Test(setupTask(3), logDoneAnonymously),
Test(setupTask(4), logDoneAnonymously), Test(setupTask(4), logDoneAnonymously),
Test(setupTask(5), logDoneAnonymously), Test(setupTask(5), logDoneAnonymously),
OnGroupDone(groupDone(0)) onGroupDone(groupDone(0))
}; };
const Log log { const Log log {
{1, Handler::Setup}, // Setup order is determined in parallel mode {1, Handler::Setup}, // Setup order is determined in parallel mode
@@ -525,7 +525,7 @@ void tst_Tasking::testTree_data()
Test(setupTask(3), logDone), Test(setupTask(3), logDone),
Test(setupTask(4), logDone), Test(setupTask(4), logDone),
Test(setupTask(5), logDone), Test(setupTask(5), logDone),
OnGroupDone(groupDone(0)) onGroupDone(groupDone(0))
}; };
const Group root2 { const Group root2 {
Storage(storage), Storage(storage),
@@ -534,14 +534,14 @@ void tst_Tasking::testTree_data()
Group { Test(setupTask(3), logDone) }, Group { Test(setupTask(3), logDone) },
Group { Test(setupTask(4), logDone) }, Group { Test(setupTask(4), logDone) },
Group { Test(setupTask(5), logDone) }, Group { Test(setupTask(5), logDone) },
OnGroupDone(groupDone(0)) onGroupDone(groupDone(0))
}; };
const Group root3 { const Group root3 {
Storage(storage), Storage(storage),
Test(setupTask(1), logDone), Test(setupTask(1), logDone),
TaskTreeTask(setupSubTree), TaskTreeTask(setupSubTree),
Test(setupTask(5), logDone), Test(setupTask(5), logDone),
OnGroupDone(groupDone(0)) onGroupDone(groupDone(0))
}; };
const Log log { const Log log {
{1, Handler::Setup}, {1, Handler::Setup},
@@ -575,17 +575,17 @@ void tst_Tasking::testTree_data()
Test(setupTask(4), logDone), Test(setupTask(4), logDone),
Group { Group {
Test(setupTask(5), logDone), Test(setupTask(5), logDone),
OnGroupDone(groupDone(5)) onGroupDone(groupDone(5))
}, },
OnGroupDone(groupDone(4)) onGroupDone(groupDone(4))
}, },
OnGroupDone(groupDone(3)) onGroupDone(groupDone(3))
}, },
OnGroupDone(groupDone(2)) onGroupDone(groupDone(2))
}, },
OnGroupDone(groupDone(1)) onGroupDone(groupDone(1))
}, },
OnGroupDone(groupDone(0)) onGroupDone(groupDone(0))
}; };
const Log log { const Log log {
{1, Handler::Setup}, {1, Handler::Setup},
@@ -616,8 +616,8 @@ void tst_Tasking::testTree_data()
Test(setupFailingTask(3), logDone, logError), Test(setupFailingTask(3), logDone, logError),
Test(setupTask(4), logDone), Test(setupTask(4), logDone),
Test(setupTask(5), logDone), Test(setupTask(5), logDone),
OnGroupDone(groupDone(0)), onGroupDone(groupDone(0)),
OnGroupError(groupError(0)) onGroupError(groupError(0))
}; };
const Log log { const Log log {
{1, Handler::Setup}, {1, Handler::Setup},
@@ -699,8 +699,8 @@ void tst_Tasking::testTree_data()
Storage(storage), Storage(storage),
Test(setupSleepingTask(1, firstSuccess, 1000ms), logDone, logError), Test(setupSleepingTask(1, firstSuccess, 1000ms), logDone, logError),
Test(setupSleepingTask(2, secondSuccess, 5ms), logDone, logError), Test(setupSleepingTask(2, secondSuccess, 5ms), logDone, logError),
OnGroupDone(groupDone(0)), onGroupDone(groupDone(0)),
OnGroupError(groupError(0)) onGroupError(groupError(0))
}; };
}; };
@@ -736,8 +736,8 @@ void tst_Tasking::testTree_data()
optional, optional,
Test(setupFailingTask(1), logDone, logError), Test(setupFailingTask(1), logDone, logError),
Test(setupFailingTask(2), logDone, logError), Test(setupFailingTask(2), logDone, logError),
OnGroupDone(groupDone(0)), onGroupDone(groupDone(0)),
OnGroupError(groupError(0)) onGroupError(groupError(0))
}; };
const Log log { const Log log {
{1, Handler::Setup}, {1, Handler::Setup},
@@ -790,19 +790,19 @@ void tst_Tasking::testTree_data()
ParallelLimit(2), ParallelLimit(2),
Storage(storage), Storage(storage),
Group { Group {
OnGroupSetup(groupSetup(1)), onGroupSetup(groupSetup(1)),
Test(setupTask(1)) Test(setupTask(1))
}, },
Group { Group {
OnGroupSetup(groupSetup(2)), onGroupSetup(groupSetup(2)),
Test(setupTask(2)) Test(setupTask(2))
}, },
Group { Group {
OnGroupSetup(groupSetup(3)), onGroupSetup(groupSetup(3)),
Test(setupTask(3)) Test(setupTask(3))
}, },
Group { Group {
OnGroupSetup(groupSetup(4)), onGroupSetup(groupSetup(4)),
Test(setupTask(4)) Test(setupTask(4))
} }
}; };
@@ -824,23 +824,23 @@ void tst_Tasking::testTree_data()
ParallelLimit(2), ParallelLimit(2),
Storage(storage), Storage(storage),
Group { Group {
OnGroupSetup(groupSetup(1)), onGroupSetup(groupSetup(1)),
Test(setupTask(1)) Test(setupTask(1))
}, },
Group { Group {
OnGroupSetup(groupSetup(2)), onGroupSetup(groupSetup(2)),
Test(setupTask(2)) Test(setupTask(2))
}, },
Group { Group {
OnGroupSetup(groupSetup(3)), onGroupSetup(groupSetup(3)),
Test(setupDynamicTask(3, TaskAction::StopWithDone)) Test(setupDynamicTask(3, TaskAction::StopWithDone))
}, },
Group { Group {
OnGroupSetup(groupSetup(4)), onGroupSetup(groupSetup(4)),
Test(setupTask(4)) Test(setupTask(4))
}, },
Group { Group {
OnGroupSetup(groupSetup(5)), onGroupSetup(groupSetup(5)),
Test(setupTask(5)) Test(setupTask(5))
} }
}; };
@@ -864,23 +864,23 @@ void tst_Tasking::testTree_data()
ParallelLimit(2), ParallelLimit(2),
Storage(storage), Storage(storage),
Group { Group {
OnGroupSetup(groupSetup(1)), onGroupSetup(groupSetup(1)),
Test(setupTask(1)) Test(setupTask(1))
}, },
Group { Group {
OnGroupSetup(groupSetup(2)), onGroupSetup(groupSetup(2)),
Test(setupTask(2)) Test(setupTask(2))
}, },
Group { Group {
OnGroupSetup(groupSetup(3)), onGroupSetup(groupSetup(3)),
Test(setupDynamicTask(3, TaskAction::StopWithError)) Test(setupDynamicTask(3, TaskAction::StopWithError))
}, },
Group { Group {
OnGroupSetup(groupSetup(4)), onGroupSetup(groupSetup(4)),
Test(setupTask(4)) Test(setupTask(4))
}, },
Group { Group {
OnGroupSetup(groupSetup(5)), onGroupSetup(groupSetup(5)),
Test(setupTask(5)) Test(setupTask(5))
} }
}; };
@@ -893,23 +893,23 @@ void tst_Tasking::testTree_data()
ParallelLimit(2), ParallelLimit(2),
Storage(storage), Storage(storage),
Group { Group {
OnGroupSetup(groupSetup(1)), onGroupSetup(groupSetup(1)),
Test(setupSleepingTask(1, true, 10ms)) Test(setupSleepingTask(1, true, 10ms))
}, },
Group { Group {
OnGroupSetup(groupSetup(2)), onGroupSetup(groupSetup(2)),
Test(setupTask(2)) Test(setupTask(2))
}, },
Group { Group {
OnGroupSetup(groupSetup(3)), onGroupSetup(groupSetup(3)),
Test(setupDynamicTask(3, TaskAction::StopWithError)) Test(setupDynamicTask(3, TaskAction::StopWithError))
}, },
Group { Group {
OnGroupSetup(groupSetup(4)), onGroupSetup(groupSetup(4)),
Test(setupTask(4)) Test(setupTask(4))
}, },
Group { Group {
OnGroupSetup(groupSetup(5)), onGroupSetup(groupSetup(5)),
Test(setupTask(5)) Test(setupTask(5))
} }
}; };
@@ -928,24 +928,24 @@ void tst_Tasking::testTree_data()
Group { Group {
ParallelLimit(2), ParallelLimit(2),
Group { Group {
OnGroupSetup(groupSetup(1)), onGroupSetup(groupSetup(1)),
Test(setupSleepingTask(1, true, 20ms)) Test(setupSleepingTask(1, true, 20ms))
}, },
Group { Group {
OnGroupSetup(groupSetup(2)), onGroupSetup(groupSetup(2)),
Test(setupSleepingTask(2, true, 10ms)) Test(setupSleepingTask(2, true, 10ms))
}, },
Group { Group {
OnGroupSetup(groupSetup(3)), onGroupSetup(groupSetup(3)),
Test(setupDynamicTask(3, TaskAction::StopWithError)) Test(setupDynamicTask(3, TaskAction::StopWithError))
}, },
Group { Group {
OnGroupSetup(groupSetup(4)), onGroupSetup(groupSetup(4)),
Test(setupTask(4)) Test(setupTask(4))
} }
}, },
Group { Group {
OnGroupSetup(groupSetup(5)), onGroupSetup(groupSetup(5)),
Test(setupTask(5)) Test(setupTask(5))
} }
}; };
@@ -972,7 +972,7 @@ void tst_Tasking::testTree_data()
Storage(storage), Storage(storage),
Group { Group {
Storage(TreeStorage<CustomStorage>()), Storage(TreeStorage<CustomStorage>()),
OnGroupSetup(groupSetup(1)), onGroupSetup(groupSetup(1)),
Group { Group {
parallel, parallel,
Test(setupTask(1)) Test(setupTask(1))
@@ -980,7 +980,7 @@ void tst_Tasking::testTree_data()
}, },
Group { Group {
Storage(TreeStorage<CustomStorage>()), Storage(TreeStorage<CustomStorage>()),
OnGroupSetup(groupSetup(2)), onGroupSetup(groupSetup(2)),
Group { Group {
parallel, parallel,
Test(setupTask(2)) Test(setupTask(2))
@@ -988,7 +988,7 @@ void tst_Tasking::testTree_data()
}, },
Group { Group {
Storage(TreeStorage<CustomStorage>()), Storage(TreeStorage<CustomStorage>()),
OnGroupSetup(groupSetup(3)), onGroupSetup(groupSetup(3)),
Group { Group {
parallel, parallel,
Test(setupTask(3)) Test(setupTask(3))
@@ -996,7 +996,7 @@ void tst_Tasking::testTree_data()
}, },
Group { Group {
Storage(TreeStorage<CustomStorage>()), Storage(TreeStorage<CustomStorage>()),
OnGroupSetup(groupSetup(4)), onGroupSetup(groupSetup(4)),
Group { Group {
parallel, parallel,
Test(setupTask(4)) Test(setupTask(4))
@@ -1022,27 +1022,27 @@ void tst_Tasking::testTree_data()
Storage(storage), Storage(storage),
Group { Group {
Storage(TreeStorage<CustomStorage>()), Storage(TreeStorage<CustomStorage>()),
OnGroupSetup(groupSetup(1)), onGroupSetup(groupSetup(1)),
Group { Test(setupTask(1)) } Group { Test(setupTask(1)) }
}, },
Group { Group {
Storage(TreeStorage<CustomStorage>()), Storage(TreeStorage<CustomStorage>()),
OnGroupSetup(groupSetup(2)), onGroupSetup(groupSetup(2)),
Group { Test(setupTask(2)) } Group { Test(setupTask(2)) }
}, },
Group { Group {
Storage(TreeStorage<CustomStorage>()), Storage(TreeStorage<CustomStorage>()),
OnGroupSetup(groupSetup(3)), onGroupSetup(groupSetup(3)),
Group { Test(setupDynamicTask(3, TaskAction::StopWithDone)) } Group { Test(setupDynamicTask(3, TaskAction::StopWithDone)) }
}, },
Group { Group {
Storage(TreeStorage<CustomStorage>()), Storage(TreeStorage<CustomStorage>()),
OnGroupSetup(groupSetup(4)), onGroupSetup(groupSetup(4)),
Group { Test(setupTask(4)) } Group { Test(setupTask(4)) }
}, },
Group { Group {
Storage(TreeStorage<CustomStorage>()), Storage(TreeStorage<CustomStorage>()),
OnGroupSetup(groupSetup(5)), onGroupSetup(groupSetup(5)),
Group { Test(setupTask(5)) } Group { Test(setupTask(5)) }
} }
}; };
@@ -1068,27 +1068,27 @@ void tst_Tasking::testTree_data()
Storage(storage), Storage(storage),
Group { Group {
Storage(TreeStorage<CustomStorage>()), Storage(TreeStorage<CustomStorage>()),
OnGroupSetup(groupSetup(1)), onGroupSetup(groupSetup(1)),
Group { Test(setupTask(1)) } Group { Test(setupTask(1)) }
}, },
Group { Group {
Storage(TreeStorage<CustomStorage>()), Storage(TreeStorage<CustomStorage>()),
OnGroupSetup(groupSetup(2)), onGroupSetup(groupSetup(2)),
Group { Test(setupTask(2)) } Group { Test(setupTask(2)) }
}, },
Group { Group {
Storage(TreeStorage<CustomStorage>()), Storage(TreeStorage<CustomStorage>()),
OnGroupSetup(groupSetup(3)), onGroupSetup(groupSetup(3)),
Group { Test(setupDynamicTask(3, TaskAction::StopWithError)) } Group { Test(setupDynamicTask(3, TaskAction::StopWithError)) }
}, },
Group { Group {
Storage(TreeStorage<CustomStorage>()), Storage(TreeStorage<CustomStorage>()),
OnGroupSetup(groupSetup(4)), onGroupSetup(groupSetup(4)),
Group { Test(setupTask(4)) } Group { Test(setupTask(4)) }
}, },
Group { Group {
Storage(TreeStorage<CustomStorage>()), Storage(TreeStorage<CustomStorage>()),
OnGroupSetup(groupSetup(5)), onGroupSetup(groupSetup(5)),
Group { Test(setupTask(5)) } Group { Test(setupTask(5)) }
} }
}; };
@@ -1188,7 +1188,7 @@ void tst_Tasking::testTree_data()
Sync(setupSync(3)), Sync(setupSync(3)),
Test(setupTask(4)), Test(setupTask(4)),
Sync(setupSync(5)), Sync(setupSync(5)),
OnGroupDone(groupDone(0)) onGroupDone(groupDone(0))
}; };
const Log log { const Log log {
{1, Handler::Sync}, {1, Handler::Sync},
@@ -1209,7 +1209,7 @@ void tst_Tasking::testTree_data()
Sync(setupSyncWithReturn(3, false)), Sync(setupSyncWithReturn(3, false)),
Test(setupTask(4)), Test(setupTask(4)),
Sync(setupSync(5)), Sync(setupSync(5)),
OnGroupError(groupError(0)) onGroupError(groupError(0))
}; };
const Log log { const Log log {
{1, Handler::Sync}, {1, Handler::Sync},
@@ -1232,7 +1232,7 @@ void tst_Tasking::testTree_data()
sequential, sequential,
AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 1)), AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 1)),
Group { Group {
OnGroupSetup(groupSetup(2)), onGroupSetup(groupSetup(2)),
WaitForBarrierTask(barrier), WaitForBarrierTask(barrier),
Test(setupTask(2)), Test(setupTask(2)),
Test(setupTask(3)) Test(setupTask(3))
@@ -1255,7 +1255,7 @@ void tst_Tasking::testTree_data()
parallel, parallel,
AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 1)), AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 1)),
Group { Group {
OnGroupSetup(groupSetup(2)), onGroupSetup(groupSetup(2)),
WaitForBarrierTask(barrier), WaitForBarrierTask(barrier),
Test(setupTask(2)), Test(setupTask(2)),
Test(setupTask(3)) Test(setupTask(3))
@@ -1284,7 +1284,7 @@ void tst_Tasking::testTree_data()
Storage(barrier), Storage(barrier),
parallel, parallel,
Group { Group {
OnGroupSetup(groupSetup(2)), onGroupSetup(groupSetup(2)),
WaitForBarrierTask(barrier), WaitForBarrierTask(barrier),
Test(setupTask(2)), Test(setupTask(2)),
Test(setupTask(3)) Test(setupTask(3))
@@ -1308,12 +1308,12 @@ void tst_Tasking::testTree_data()
parallel, parallel,
AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 1)), AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 1)),
Group { Group {
OnGroupSetup(groupSetup(2)), onGroupSetup(groupSetup(2)),
WaitForBarrierTask(barrier), WaitForBarrierTask(barrier),
Test(setupTask(4)) Test(setupTask(4))
}, },
Group { Group {
OnGroupSetup(groupSetup(3)), onGroupSetup(groupSetup(3)),
WaitForBarrierTask(barrier), WaitForBarrierTask(barrier),
Test(setupTask(5)) Test(setupTask(5))
} }
@@ -1341,7 +1341,7 @@ void tst_Tasking::testTree_data()
Group { Group {
Group { Group {
parallel, parallel,
OnGroupSetup(groupSetup(1)), onGroupSetup(groupSetup(1)),
WaitForBarrierTask(barrier), WaitForBarrierTask(barrier),
WaitForBarrierTask(barrier2) WaitForBarrierTask(barrier2)
}, },
@@ -1383,7 +1383,7 @@ void tst_Tasking::testTree_data()
AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 1)), AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 1)),
AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 2)), AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 2)),
Group { Group {
OnGroupSetup(groupSetup(2)), onGroupSetup(groupSetup(2)),
WaitForBarrierTask(barrier), WaitForBarrierTask(barrier),
Test(setupTask(2)), Test(setupTask(2)),
Test(setupTask(3)) Test(setupTask(3))
@@ -1409,7 +1409,7 @@ void tst_Tasking::testTree_data()
AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 0)), AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 0)),
AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 0)), AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 0)),
Group { Group {
OnGroupSetup(groupSetup(2)), onGroupSetup(groupSetup(2)),
WaitForBarrierTask(barrier), WaitForBarrierTask(barrier),
Test(setupTask(2)), Test(setupTask(2)),
Test(setupTask(3)) Test(setupTask(3))
@@ -1440,7 +1440,7 @@ void tst_Tasking::testTree_data()
Storage(barrier), Storage(barrier),
parallel, parallel,
Group { Group {
OnGroupSetup(groupSetup(2)), onGroupSetup(groupSetup(2)),
WaitForBarrierTask(barrier), WaitForBarrierTask(barrier),
Test(setupTask(2)), Test(setupTask(2)),
Test(setupTask(3)) Test(setupTask(3))
@@ -1468,12 +1468,12 @@ void tst_Tasking::testTree_data()
AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 0)), AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 0)),
AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 0)), AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 0)),
Group { Group {
OnGroupSetup(groupSetup(2)), onGroupSetup(groupSetup(2)),
WaitForBarrierTask(barrier), WaitForBarrierTask(barrier),
Test(setupTask(4)) Test(setupTask(4))
}, },
Group { Group {
OnGroupSetup(groupSetup(3)), onGroupSetup(groupSetup(3)),
WaitForBarrierTask(barrier), WaitForBarrierTask(barrier),
Test(setupTask(5)) Test(setupTask(5))
} }

8
tests/auto/utils/async/tst_async.cpp
View File

@@ -503,13 +503,13 @@ void tst_Async::mapReduce_data()
const DoneHandler &doneHandler) { const DoneHandler &doneHandler) {
return Group { return Group {
executeMode, executeMode,
OnGroupSetup(initTree), onGroupSetup(initTree),
AsyncTask<int>(std::bind(setupHandler, _1, 1), handleAsync), AsyncTask<int>(std::bind(setupHandler, _1, 1), handleAsync),
AsyncTask<int>(std::bind(setupHandler, _1, 2), handleAsync), AsyncTask<int>(std::bind(setupHandler, _1, 2), handleAsync),
AsyncTask<int>(std::bind(setupHandler, _1, 3), handleAsync), AsyncTask<int>(std::bind(setupHandler, _1, 3), handleAsync),
AsyncTask<int>(std::bind(setupHandler, _1, 4), handleAsync), AsyncTask<int>(std::bind(setupHandler, _1, 4), handleAsync),
AsyncTask<int>(std::bind(setupHandler, _1, 5), handleAsync), AsyncTask<int>(std::bind(setupHandler, _1, 5), handleAsync),
OnGroupDone(doneHandler) onGroupDone(doneHandler)
}; };
}; };
@@ -539,7 +539,7 @@ void tst_Async::mapReduce_data()
}; };
const Group simpleRoot = { const Group simpleRoot = {
sequential, sequential,
OnGroupSetup([] { s_sum = 0; }), onGroupSetup([] { s_sum = 0; }),
AsyncTask<int>(std::bind(setupSimpleAsync, _1, 1), handleSimpleAsync), AsyncTask<int>(std::bind(setupSimpleAsync, _1, 1), handleSimpleAsync),
AsyncTask<int>(std::bind(setupSimpleAsync, _1, 2), handleSimpleAsync), AsyncTask<int>(std::bind(setupSimpleAsync, _1, 2), handleSimpleAsync),
AsyncTask<int>(std::bind(setupSimpleAsync, _1, 3), handleSimpleAsync) AsyncTask<int>(std::bind(setupSimpleAsync, _1, 3), handleSimpleAsync)
@@ -554,7 +554,7 @@ void tst_Async::mapReduce_data()
}; };
const Group stringRoot = { const Group stringRoot = {
parallel, parallel,
OnGroupSetup([] { s_sum = 90.0; }), onGroupSetup([] { s_sum = 90.0; }),
AsyncTask<int>(std::bind(setupStringAsync, _1, "blubb"), handleStringAsync), AsyncTask<int>(std::bind(setupStringAsync, _1, "blubb"), handleStringAsync),
AsyncTask<int>(std::bind(setupStringAsync, _1, "foo"), handleStringAsync), AsyncTask<int>(std::bind(setupStringAsync, _1, "foo"), handleStringAsync),
AsyncTask<int>(std::bind(setupStringAsync, _1, "blah"), handleStringAsync) AsyncTask<int>(std::bind(setupStringAsync, _1, "blah"), handleStringAsync)

24
tests/manual/tasktree/main.cpp
View File

@@ -172,16 +172,16 @@ int main(int argc, char *argv[])
const Group root { const Group root {
rootGroup->executeMode(), rootGroup->executeMode(),
Workflow(rootGroup->workflowPolicy()), Workflow(rootGroup->workflowPolicy()),
OnGroupSetup([rootGroup] { rootGroup->setState(State::Running); }), onGroupSetup([rootGroup] { rootGroup->setState(State::Running); }),
OnGroupDone([rootGroup] { rootGroup->setState(State::Done); }), onGroupDone([rootGroup] { rootGroup->setState(State::Done); }),
OnGroupError([rootGroup] { rootGroup->setState(State::Error); }), onGroupError([rootGroup] { rootGroup->setState(State::Error); }),
Group { Group {
groupTask_1->executeMode(), groupTask_1->executeMode(),
Workflow(groupTask_1->workflowPolicy()), Workflow(groupTask_1->workflowPolicy()),
OnGroupSetup([groupTask_1] { groupTask_1->setState(State::Running); }), onGroupSetup([groupTask_1] { groupTask_1->setState(State::Running); }),
OnGroupDone([groupTask_1] { groupTask_1->setState(State::Done); }), onGroupDone([groupTask_1] { groupTask_1->setState(State::Done); }),
OnGroupError([groupTask_1] { groupTask_1->setState(State::Error); }), onGroupError([groupTask_1] { groupTask_1->setState(State::Error); }),
taskItem(task_1_1), taskItem(task_1_1),
taskItem(task_1_2), taskItem(task_1_2),
@@ -192,18 +192,18 @@ int main(int argc, char *argv[])
Group { Group {
groupTask_4->executeMode(), groupTask_4->executeMode(),
Workflow(groupTask_4->workflowPolicy()), Workflow(groupTask_4->workflowPolicy()),
OnGroupSetup([groupTask_4] { groupTask_4->setState(State::Running); }), onGroupSetup([groupTask_4] { groupTask_4->setState(State::Running); }),
OnGroupDone([groupTask_4] { groupTask_4->setState(State::Done); }), onGroupDone([groupTask_4] { groupTask_4->setState(State::Done); }),
OnGroupError([groupTask_4] { groupTask_4->setState(State::Error); }), onGroupError([groupTask_4] { groupTask_4->setState(State::Error); }),
taskItem(task_4_1), taskItem(task_4_1),
taskItem(task_4_2), taskItem(task_4_2),
Group { Group {
groupTask_4_3->executeMode(), groupTask_4_3->executeMode(),
Workflow(groupTask_4_3->workflowPolicy()), Workflow(groupTask_4_3->workflowPolicy()),
OnGroupSetup([groupTask_4_3] { groupTask_4_3->setState(State::Running); }), onGroupSetup([groupTask_4_3] { groupTask_4_3->setState(State::Running); }),
OnGroupDone([groupTask_4_3] { groupTask_4_3->setState(State::Done); }), onGroupDone([groupTask_4_3] { groupTask_4_3->setState(State::Done); }),
OnGroupError([groupTask_4_3] { groupTask_4_3->setState(State::Error); }), onGroupError([groupTask_4_3] { groupTask_4_3->setState(State::Error); }),
taskItem(task_4_3_1), taskItem(task_4_3_1),
taskItem(task_4_3_2), taskItem(task_4_3_2),