Use Utils::FutureSynchronizer instead of QFutureSynchronizer

Change-Id: Iecfa676f58e5ca82be7c9c94233dcc8d3654c2d7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

src/plugins/clangcodemodel/clangeditordocumentprocessor.h

@@ -31,9 +31,9 @@
 #include <cpptools/builtineditordocumentprocessor.h>
 #include <cpptools/semantichighlighter.h>
 
+#include <utils/futuresynchronizer.h>
 #include <utils/id.h>
 
-#include <QFutureSynchronizer>
 #include <QFutureWatcher>
 #include <QTimer>
 
@@ -146,7 +146,7 @@ private:
     QVector<ClangBackEnd::TokenInfoContainer> m_tokenInfos;
     CppTools::SemanticHighlighter m_semanticHighlighter;
     CppTools::BuiltinEditorDocumentProcessor m_builtinProcessor;
-    QFutureSynchronizer<void> m_parserSynchronizer;
+    Utils::FutureSynchronizer m_parserSynchronizer;
 };
 
 } // namespace Internal

src/plugins/clangcodemodel/clangmodelmanagersupport.cpp

@@ -327,7 +327,7 @@ void ClangModelManagerSupport::updateLanguageClient(ProjectExplorer::Project *pr
     auto future = Utils::runAsync(&Internal::generateCompilationDB, projectInfo,
                                   CompilationDbPurpose::CodeModel);
     generatorWatcher->setFuture(future);
-    m_generatorSynchronizer.addFuture(QFuture<void>(future));
+    m_generatorSynchronizer.addFuture(future);
 }
 
 ClangdClient *ClangModelManagerSupport::clientForProject(

src/plugins/clangcodemodel/clangmodelmanagersupport.h

@@ -30,9 +30,9 @@
 
 #include <cpptools/cppmodelmanagersupport.h>
 
+#include <utils/futuresynchronizer.h>
 #include <utils/id.h>
 
-#include <QFutureSynchronizer>
 #include <QObject>
 
 #include <memory>
@@ -135,7 +135,7 @@ private:
     std::unique_ptr<CppTools::RefactoringEngineInterface> m_refactoringEngine;
 
     QHash<ProjectExplorer::Project *, ClangProjectSettings *> m_projectSettings;
-    QFutureSynchronizer<void> m_generatorSynchronizer;
+    Utils::FutureSynchronizer m_generatorSynchronizer;
 };
 
 class ClangModelManagerSupportProvider : public CppTools::ModelManagerSupportProvider

src/plugins/cmakeprojectmanager/cmakebuildsystem.h

@@ -33,10 +33,9 @@
 #include <projectexplorer/buildsystem.h>
 
 #include <utils/fileutils.h>
+#include <utils/futuresynchronizer.h>
 #include <utils/temporarydirectory.h>
 
-#include <QFutureSynchronizer>
-
 namespace ProjectExplorer { class ExtraCompiler; }
 
 namespace CppTools {
@@ -184,7 +183,7 @@ private:
     // CTest integration
     QString m_ctestPath;
     QList<ProjectExplorer::TestCaseInfo> m_testNames;
-    QFutureSynchronizer<QByteArray> m_futureSynchronizer;
+    Utils::FutureSynchronizer m_futureSynchronizer;
 };
 
 } // namespace Internal

src/plugins/cppeditor/cpptypehierarchy.cpp

@@ -182,18 +182,6 @@ CppTypeHierarchyWidget::CppTypeHierarchyWidget()
     m_synchronizer.setCancelOnWait(true);
 }
 
-void CppTypeHierarchyWidget::updateSynchronizer()
-{
-    const QList<QFuture<void>> futures = m_synchronizer.futures();
-
-    m_synchronizer.clearFutures();
-
-    for (const QFuture<void> &future : futures) {
-        if (!future.isFinished())
-            m_synchronizer.addFuture(future);
-    }
-}
-
 void CppTypeHierarchyWidget::perform()
 {
     if (m_future.isRunning())
@@ -201,8 +189,6 @@ void CppTypeHierarchyWidget::perform()
 
     m_showOldClass = false;
 
-    updateSynchronizer();
-
     auto editor = qobject_cast<CppEditor *>(Core::EditorManager::currentEditor());
     if (!editor) {
         showNoTypeHierarchyLabel();
@@ -219,7 +205,7 @@ void CppTypeHierarchyWidget::perform()
 
     m_future = CppElementEvaluator::asyncExecute(widget);
     m_futureWatcher.setFuture(QFuture<void>(m_future));
-    m_synchronizer.addFuture(QFuture<void>(m_future));
+    m_synchronizer.addFuture(m_future);
 
     Core::ProgressManager::addTask(m_future, tr("Evaluating Type Hierarchy"), "TypeHierarchy");
 }
@@ -231,20 +217,18 @@ void CppTypeHierarchyWidget::performFromExpression(const QString &expression, co
 
     m_showOldClass = true;
 
-    updateSynchronizer();
-
     showProgress();
 
     m_future = CppElementEvaluator::asyncExecute(expression, fileName);
     m_futureWatcher.setFuture(QFuture<void>(m_future));
-    m_synchronizer.addFuture(QFuture<void>(m_future));
+    m_synchronizer.addFuture(m_future);
 
     Core::ProgressManager::addTask(m_future, tr("Evaluating Type Hierarchy"), "TypeHierarchy");
 }
 
 void CppTypeHierarchyWidget::displayHierarchy()
 {
-    updateSynchronizer();
+    m_synchronizer.flushFinishedFutures();
     hideProgress();
     clearTypeHierarchy();
 

src/plugins/cppeditor/cpptypehierarchy.h

@@ -26,10 +26,10 @@
 #pragma once
 
 #include <coreplugin/inavigationwidgetfactory.h>
+#include <utils/futuresynchronizer.h>
 
 #include <QFuture>
 #include <QFutureWatcher>
-#include <QFutureSynchronizer>
 #include <QList>
 #include <QSharedPointer>
 #include <QStackedWidget>
@@ -94,7 +94,6 @@ private:
     void clearTypeHierarchy();
     void onItemActivated(const QModelIndex &index);
     void onItemDoubleClicked(const QModelIndex &index);
-    void updateSynchronizer();
 
     CppEditorWidget *m_cppEditor = nullptr;
     Utils::NavigationTreeView *m_treeView = nullptr;
@@ -106,7 +105,7 @@ private:
     QLabel *m_infoLabel = nullptr;
     QFuture<QSharedPointer<CppTools::CppElement>> m_future;
     QFutureWatcher<void> m_futureWatcher;
-    QFutureSynchronizer<void> m_synchronizer;
+    Utils::FutureSynchronizer m_synchronizer;
     Utils::ProgressIndicator *m_progressIndicator = nullptr;
     QString m_oldClass;
     bool m_showOldClass = false;

src/plugins/cpptools/builtinindexingsupport.cpp

@@ -356,18 +356,6 @@ QFuture<void> BuiltinIndexingSupport::refreshSourceFiles(
     params.sourceFiles = sourceFiles;
 
     QFuture<void> result = Utils::runAsync(mgr->sharedThreadPool(), parse, params);
-
-    if (m_synchronizer.futures().size() > 10) {
-        QList<QFuture<void> > futures = m_synchronizer.futures();
-
-        m_synchronizer.clearFutures();
-
-        foreach (const QFuture<void> &future, futures) {
-            if (!(future.isFinished() || future.isCanceled()))
-                m_synchronizer.addFuture(future);
-        }
-    }
-
     m_synchronizer.addFuture(result);
 
     if (mode == CppModelManager::ForcedProgressNotification || sourceFiles.count() > 1) {

src/plugins/cpptools/builtinindexingsupport.h

@@ -28,7 +28,7 @@
 #include "cppindexingsupport.h"
 #include "cppmodelmanager.h"
 
-#include <QFutureSynchronizer>
+#include <utils/futuresynchronizer.h>
 
 namespace CppTools {
 namespace Internal {
@@ -47,7 +47,7 @@ public:
     static bool isFindErrorsIndexingActive();
 
 private:
-    QFutureSynchronizer<void> m_synchronizer;
+    Utils::FutureSynchronizer m_synchronizer;
 };
 
 } // namespace Internal

src/plugins/git/gitclient.h

@@ -33,8 +33,8 @@
 #include <vcsbase/vcsbaseclient.h>
 
 #include <utils/fileutils.h>
+#include <utils/futuresynchronizer.h>
 
-#include <QFutureSynchronizer>
 #include <QObject>
 #include <QString>
 #include <QStringList>
@@ -425,7 +425,7 @@ private:
     QString m_diffCommit;
     QStringList m_updatedSubmodules;
     bool m_disableEditor = false;
-    QFutureSynchronizer<void> m_synchronizer; // for commit updates
+    Utils::FutureSynchronizer m_synchronizer; // for commit updates
 };
 
 class GitRemote : public Core::IVersionControl::RepoUrl

src/plugins/ios/createsimulatordialog.cpp

@@ -62,14 +62,14 @@ CreateSimulatorDialog::CreateSimulatorDialog(QWidget *parent) :
     });
 
     m_futureSync.setCancelOnWait(true);
-    m_futureSync.addFuture(QFuture<void>(Utils::onResultReady(SimulatorControl::updateDeviceTypes(), this,
-                                                &CreateSimulatorDialog::populateDeviceTypes)));
+    m_futureSync.addFuture(Utils::onResultReady(SimulatorControl::updateDeviceTypes(), this,
+                                                &CreateSimulatorDialog::populateDeviceTypes));
 
     QFuture<QList<RuntimeInfo>> runtimesfuture = SimulatorControl::updateRuntimes();
     Utils::onResultReady(runtimesfuture, this, [this](const QList<RuntimeInfo> &runtimes) {
         m_runtimes = runtimes;
     });
-    m_futureSync.addFuture(QFuture<void>(runtimesfuture));
+    m_futureSync.addFuture(runtimesfuture);
     populateRuntimes(DeviceTypeInfo());
 }
 

src/plugins/ios/createsimulatordialog.h

@@ -26,7 +26,8 @@
 #pragma once
 
 #include <QDialog>
-#include <QFutureSynchronizer>
+
+#include <utils/futuresynchronizer.h>
 
 namespace Ios {
 namespace Internal {
@@ -57,7 +58,7 @@ private:
     void populateRuntimes(const DeviceTypeInfo &deviceType);
 
 private:
-    QFutureSynchronizer<void> m_futureSync;
+    Utils::FutureSynchronizer m_futureSync;
     Ui::CreateSimulatorDialog *m_ui = nullptr;
     SimulatorControl *m_simControl = nullptr;
     QList<RuntimeInfo> m_runtimes;

src/plugins/ios/simulatorinfomodel.cpp

@@ -126,13 +126,12 @@ QModelIndex SimulatorInfoModel::parent(const QModelIndex &) const
 
 void SimulatorInfoModel::requestSimulatorInfo()
 {
-    if (!m_fetchFuture.futures().isEmpty() && !m_fetchFuture.futures().at(0).isFinished())
+    m_fetchFuture.flushFinishedFutures();
+    if (!m_fetchFuture.isEmpty())
         return; // Ignore the request if the last request is still pending.
 
-    m_fetchFuture.clearFutures();
-    m_fetchFuture.addFuture(QFuture<void>(Utils::onResultReady(
-                                          SimulatorControl::updateAvailableSimulators(),
-                                          this, &SimulatorInfoModel::populateSimulators)));
+    m_fetchFuture.addFuture(Utils::onResultReady(SimulatorControl::updateAvailableSimulators(),
+                                                 this, &SimulatorInfoModel::populateSimulators));
 }
 
 void SimulatorInfoModel::populateSimulators(const SimulatorInfoList &simulatorList)

src/plugins/ios/simulatorinfomodel.h

@@ -27,8 +27,10 @@
 
 #include "simulatorcontrol.h"
 
+#include <utils/futuresynchronizer.h>
+
 #include <QAbstractListModel>
-#include <QFutureSynchronizer>
+
 
 namespace Ios {
 namespace Internal {
@@ -55,7 +57,7 @@ private:
     void populateSimulators(const SimulatorInfoList &simulatorList);
 
 private:
-    QFutureSynchronizer<void> m_fetchFuture;
+    Utils::FutureSynchronizer m_fetchFuture;
     SimulatorInfoList m_simList;
 };
 

src/plugins/qmljseditor/qmljssemantichighlighter.cpp

@@ -568,7 +568,7 @@ void SemanticHighlighter::rerun(const QmlJSTools::SemanticInfo &semanticInfo)
     auto future = Utils::runAsync(QThread::LowestPriority, &SemanticHighlighter::run,
                                   this, semanticInfo);
     m_watcher.setFuture(future);
-    m_futureSynchronizer.addFuture(QFuture<void>(future));
+    m_futureSynchronizer.addFuture(future);
 }
 
 void SemanticHighlighter::cancel()

src/plugins/qmljseditor/qmljssemantichighlighter.h

@@ -27,7 +27,7 @@
 
 #include <qmljseditor/qmljseditor_global.h>
 #include <texteditor/semantichighlighter.h>
-#include <QFutureSynchronizer>
+#include <utils/futuresynchronizer.h>
 #include <QFutureWatcher>
 #include <QTextLayout>
 #include <QVector>
@@ -90,7 +90,7 @@ private:
     QHash<int, QTextCharFormat> m_formats;
     QHash<int, QTextCharFormat> m_extraFormats;
     QVector<QTextLayout::FormatRange> m_diagnosticRanges;
-    QFutureSynchronizer<void> m_futureSynchronizer;
+    Utils::FutureSynchronizer m_futureSynchronizer;
 };
 
 } // namespace QmlJSEditor

src/tools/clangbackend/source/clangjobs.cpp

@@ -29,10 +29,10 @@
 #include "clangiasyncjob.h"
 
 #include <QDebug>
-#include <QFutureSynchronizer>
 #include <QLoggingCategory>
 
 #include <utils/algorithm.h>
+#include <utils/futuresynchronizer.h>
 #include <utils/qtcassert.h>
 
 namespace ClangBackEnd {
@@ -63,7 +63,7 @@ Jobs::~Jobs()
     foreach (IAsyncJob *asyncJob, m_running.keys())
         asyncJob->preventFinalization();
 
-    QFutureSynchronizer<void> waitForFinishedJobs;
+    Utils::FutureSynchronizer waitForFinishedJobs;
     foreach (const RunningJob &runningJob, m_running.values())
         waitForFinishedJobs.addFuture(runningJob.future);
 
@@ -114,7 +114,7 @@ JobRequests Jobs::stop()
     queue().clear();
 
     // Wait until currently running jobs finish.
-    QFutureSynchronizer<void> waitForFinishedJobs;
+    Utils::FutureSynchronizer waitForFinishedJobs;
     foreach (const RunningJob &runningJob, m_running.values())
         waitForFinishedJobs.addFuture(runningJob.future);