From 2c5075b4257ea881ffd565ba4bec6056cea86331 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Wed, 2 Oct 2024 07:30:46 +0200 Subject: [PATCH] TaskTree: Remove timeout arg from runBlocking() methods The timeout may be passed via .withTimeout() method. Change-Id: I7235a2c46836b63796024a3801225709e7835aa2 Reviewed-by: hjk --- src/libs/solutions/tasking/tasktree.cpp | 15 +++++---------- src/libs/solutions/tasking/tasktree.h | 6 ++---- src/plugins/remotelinux/filesystemaccess_test.cpp | 7 +++---- tests/auto/utils/async/tst_async.cpp | 11 +++++------ 4 files changed, 15 insertions(+), 24 deletions(-) diff --git a/src/libs/solutions/tasking/tasktree.cpp b/src/libs/solutions/tasking/tasktree.cpp index 37144e9092f..d8ff38eab8e 100644 --- a/src/libs/solutions/tasking/tasktree.cpp +++ b/src/libs/solutions/tasking/tasktree.cpp @@ -3274,9 +3274,6 @@ DoneWith TaskTree::runBlocking(const QFuture &future) /*! Constructs a temporary task tree using the passed \a recipe and runs it blocking. - The optionally provided \a timeout is used to cancel the tree automatically after - \a timeout milliseconds have passed. - Returns DoneWith::Success if the task tree finished successfully; otherwise returns DoneWith::Error. @@ -3285,24 +3282,22 @@ DoneWith TaskTree::runBlocking(const QFuture &future) \sa start() */ -DoneWith TaskTree::runBlocking(const Group &recipe, milliseconds timeout) +DoneWith TaskTree::runBlocking(const Group &recipe) { QPromise dummy; dummy.start(); - return TaskTree::runBlocking(recipe, dummy.future(), timeout); + return TaskTree::runBlocking(recipe, dummy.future()); } /*! - \overload runBlocking(const Group &recipe, milliseconds timeout) + \overload runBlocking(const Group &recipe) The passed \a future is used for listening to the cancel event. When the task tree is canceled, this method cancels the passed \a future. */ -DoneWith TaskTree::runBlocking(const Group &recipe, const QFuture &future, milliseconds timeout) +DoneWith TaskTree::runBlocking(const Group &recipe, const QFuture &future) { - const Group root = timeout == milliseconds::max() ? recipe - : Group { recipe.withTimeout(timeout) }; - TaskTree taskTree(root); + TaskTree taskTree(recipe); return taskTree.runBlocking(future); } diff --git a/src/libs/solutions/tasking/tasktree.h b/src/libs/solutions/tasking/tasktree.h index fac55c35515..907db0ea724 100644 --- a/src/libs/solutions/tasking/tasktree.h +++ b/src/libs/solutions/tasking/tasktree.h @@ -633,10 +633,8 @@ public: // Don't use it in main thread. To be used in non-main threads or in auto tests. DoneWith runBlocking(); DoneWith runBlocking(const QFuture &future); - static DoneWith runBlocking(const Group &recipe, - std::chrono::milliseconds timeout = std::chrono::milliseconds::max()); - static DoneWith runBlocking(const Group &recipe, const QFuture &future, - std::chrono::milliseconds timeout = std::chrono::milliseconds::max()); + static DoneWith runBlocking(const Group &recipe); + static DoneWith runBlocking(const Group &recipe, const QFuture &future); int asyncCount() const; int taskCount() const; diff --git a/src/plugins/remotelinux/filesystemaccess_test.cpp b/src/plugins/remotelinux/filesystemaccess_test.cpp index b9e77f79e93..76230b80904 100644 --- a/src/plugins/remotelinux/filesystemaccess_test.cpp +++ b/src/plugins/remotelinux/filesystemaccess_test.cpp @@ -475,15 +475,14 @@ void FileSystemAccessTest::testFileStreamer() const auto onReaderDone = [result](const FileStreamer &streamer) { *result = streamer.readData(); }; - const Group root { + return Group { FileStreamerTask(onTransferSetup), FileStreamerTask(onReaderSetup, onReaderDone, CallDoneIf::Success) }; - return root; }; // In total: 5 local reads, 3 local writes, 5 remote reads, 3 remote writes - const Group root { + const Group recipe { Group { parallel, localWriter(), @@ -504,7 +503,7 @@ void FileSystemAccessTest::testFileStreamer() }; using namespace std::chrono_literals; - QCOMPARE(TaskTree::runBlocking(root, 10000ms), DoneWith::Success); + QCOMPARE(TaskTree::runBlocking(recipe.withTimeout(10000ms)), DoneWith::Success); QVERIFY(localData); QCOMPARE(*localData, data); diff --git a/tests/auto/utils/async/tst_async.cpp b/tests/auto/utils/async/tst_async.cpp index 1c3f7a19f2d..72394f86456 100644 --- a/tests/auto/utils/async/tst_async.cpp +++ b/tests/auto/utils/async/tst_async.cpp @@ -482,15 +482,14 @@ void tst_Async::taskTree() value = task.result(); }; - const Group root { + const Group recipe { AsyncTask(setupIntAsync, handleIntAsync, CallDoneIf::Success), AsyncTask(setupIntAsync, handleIntAsync, CallDoneIf::Success), AsyncTask(setupIntAsync, handleIntAsync, CallDoneIf::Success), AsyncTask(setupIntAsync, handleIntAsync, CallDoneIf::Success), }; - - QCOMPARE(TaskTree::runBlocking(root, 1000ms), DoneWith::Success); + QCOMPARE(TaskTree::runBlocking(recipe.withTimeout(1000ms)), DoneWith::Success); QCOMPARE(value, 16); } @@ -511,7 +510,7 @@ void tst_Async::mapReduce_data() { using namespace Tasking; - QTest::addColumn("root"); + QTest::addColumn("recipe"); QTest::addColumn("sum"); QTest::addColumn>("results"); @@ -622,11 +621,11 @@ void tst_Async::mapReduce() using namespace Tasking; - QFETCH(Group, root); + QFETCH(Group, recipe); QFETCH(double, sum); QFETCH(QList, results); - QCOMPARE(TaskTree::runBlocking(root, 1000ms), DoneWith::Success); + QCOMPARE(TaskTree::runBlocking(recipe.withTimeout(1000ms)), DoneWith::Success); QCOMPARE(s_results, results); QCOMPARE(s_sum, sum); }