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

Tasking::WaitForBarrier: Rename it into WaitForBarrierTask

Browse Source 
Rename BarrierAdapter into BarrierTaskAdapter.

Task-number: QTCREATORBUG-29102
Change-Id: I003b09fd71af1bde870f761d365a8cea1858862a
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2023-05-03 14:45:54 +02:00
parent 161228d275
commit 82bc4870b3
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libs/utils/barrier.h
View File

@@ -34,16 +34,16 @@ private:
int m_current = -1; int m_current = -1;
}; };
class QTCREATOR_UTILS_EXPORT BarrierAdapter : public Tasking::TaskAdapter<Barrier> class QTCREATOR_UTILS_EXPORT BarrierTaskAdapter : public Tasking::TaskAdapter<Barrier>
{ {
public: public:
BarrierAdapter() { connect(task(), &Barrier::done, this, &TaskInterface::done); } BarrierTaskAdapter() { connect(task(), &Barrier::done, this, &TaskInterface::done); }
void start() final { task()->start(); } void start() final { task()->start(); }
}; };
} // namespace Utils } // namespace Utils
QTC_DECLARE_CUSTOM_TASK(BarrierTask, Utils::BarrierAdapter); QTC_DECLARE_CUSTOM_TASK(BarrierTask, Utils::BarrierTaskAdapter);
namespace Utils::Tasking { namespace Utils::Tasking {
@@ -70,11 +70,11 @@ using MultiBarrier = TreeStorage<SharedBarrier<Limit>>;
// alias template deduction only available with C++20. // alias template deduction only available with C++20.
using SingleBarrier = MultiBarrier<1>; using SingleBarrier = MultiBarrier<1>;
class QTCREATOR_UTILS_EXPORT WaitForBarrier : public BarrierTask class QTCREATOR_UTILS_EXPORT WaitForBarrierTask : public BarrierTask
{ {
public: public:
template <int Limit> template <int Limit>
WaitForBarrier(const MultiBarrier<Limit> &sharedBarrier) WaitForBarrierTask(const MultiBarrier<Limit> &sharedBarrier)
: BarrierTask([sharedBarrier](Barrier &barrier) { : BarrierTask([sharedBarrier](Barrier &barrier) {
SharedBarrier<Limit> *activeBarrier = sharedBarrier.activeStorage(); SharedBarrier<Limit> *activeBarrier = sharedBarrier.activeStorage();
if (!activeBarrier) { if (!activeBarrier) {

2
src/libs/utils/filestreamer.cpp
View File

@@ -349,7 +349,7 @@ static Group interDeviceTransferTask(const FilePath &source, const FilePath &des
Storage(storage), Storage(storage),
Writer(setupWriter), Writer(setupWriter),
Group { Group {
WaitForBarrier(writerReadyBarrier), WaitForBarrierTask(writerReadyBarrier),
Reader(setupReader, finalizeReader, finalizeReader) Reader(setupReader, finalizeReader, finalizeReader)
} }
}; };

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

@@ -1216,7 +1216,7 @@ void tst_TaskTree::testTree_data()
AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 1)), AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 1)),
Group { Group {
OnGroupSetup(groupSetup(2)), OnGroupSetup(groupSetup(2)),
WaitForBarrier(barrier), WaitForBarrierTask(barrier),
Test(setupTask(2)), Test(setupTask(2)),
Test(setupTask(3)) Test(setupTask(3))
} }
@@ -1239,7 +1239,7 @@ void tst_TaskTree::testTree_data()
AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 1)), AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 1)),
Group { Group {
OnGroupSetup(groupSetup(2)), OnGroupSetup(groupSetup(2)),
WaitForBarrier(barrier), WaitForBarrierTask(barrier),
Test(setupTask(2)), Test(setupTask(2)),
Test(setupTask(3)) Test(setupTask(3))
} }
@@ -1268,7 +1268,7 @@ void tst_TaskTree::testTree_data()
parallel, parallel,
Group { Group {
OnGroupSetup(groupSetup(2)), OnGroupSetup(groupSetup(2)),
WaitForBarrier(barrier), WaitForBarrierTask(barrier),
Test(setupTask(2)), Test(setupTask(2)),
Test(setupTask(3)) Test(setupTask(3))
}, },
@@ -1292,12 +1292,12 @@ void tst_TaskTree::testTree_data()
AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 1)), AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 1)),
Group { Group {
OnGroupSetup(groupSetup(2)), OnGroupSetup(groupSetup(2)),
WaitForBarrier(barrier), WaitForBarrierTask(barrier),
Test(setupTask(4)) Test(setupTask(4))
}, },
Group { Group {
OnGroupSetup(groupSetup(3)), OnGroupSetup(groupSetup(3)),
WaitForBarrier(barrier), WaitForBarrierTask(barrier),
Test(setupTask(5)) Test(setupTask(5))
} }
}; };
@@ -1325,8 +1325,8 @@ void tst_TaskTree::testTree_data()
Group { Group {
parallel, parallel,
OnGroupSetup(groupSetup(1)), OnGroupSetup(groupSetup(1)),
WaitForBarrier(barrier), WaitForBarrierTask(barrier),
WaitForBarrier(barrier2) WaitForBarrierTask(barrier2)
}, },
Test(setupTask(2)) Test(setupTask(2))
}, },
@@ -1367,7 +1367,7 @@ void tst_TaskTree::testTree_data()
AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 2)), AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 2)),
Group { Group {
OnGroupSetup(groupSetup(2)), OnGroupSetup(groupSetup(2)),
WaitForBarrier(barrier), WaitForBarrierTask(barrier),
Test(setupTask(2)), Test(setupTask(2)),
Test(setupTask(3)) Test(setupTask(3))
} }
@@ -1393,7 +1393,7 @@ void tst_TaskTree::testTree_data()
AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 0)), AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 0)),
Group { Group {
OnGroupSetup(groupSetup(2)), OnGroupSetup(groupSetup(2)),
WaitForBarrier(barrier), WaitForBarrierTask(barrier),
Test(setupTask(2)), Test(setupTask(2)),
Test(setupTask(3)) Test(setupTask(3))
} }
@@ -1424,7 +1424,7 @@ void tst_TaskTree::testTree_data()
parallel, parallel,
Group { Group {
OnGroupSetup(groupSetup(2)), OnGroupSetup(groupSetup(2)),
WaitForBarrier(barrier), WaitForBarrierTask(barrier),
Test(setupTask(2)), Test(setupTask(2)),
Test(setupTask(3)) Test(setupTask(3))
}, },
@@ -1452,12 +1452,12 @@ void tst_TaskTree::testTree_data()
AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 0)), AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 0)),
Group { Group {
OnGroupSetup(groupSetup(2)), OnGroupSetup(groupSetup(2)),
WaitForBarrier(barrier), WaitForBarrierTask(barrier),
Test(setupTask(4)) Test(setupTask(4))
}, },
Group { Group {
OnGroupSetup(groupSetup(3)), OnGroupSetup(groupSetup(3)),
WaitForBarrier(barrier), WaitForBarrierTask(barrier),
Test(setupTask(5)) Test(setupTask(5))
} }
}; };