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

ClangTools: Generalize run control for multiple runners

Browse Source 
No functional change at this point.

Change-Id: I537f9d8c9eed0b48056918809358a0a179b42eaa
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Nikolai Kosjar
2019-08-01 14:50:59 +02:00
parent d471b6df90
commit c9c214057e
4 changed files with 57 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/clangtools/clangtoolruncontrol.h
View File

@@ -33,6 +33,7 @@
#include <utils/temporarydirectory.h>
#include <QFutureInterface>
#include <QSet>
#include <QStringList>
namespace ClangTools {
@@ -40,7 +41,6 @@ namespace Internal {
class ClangTool;
class ClangToolRunner;
class Diagnostic;
class ProjectBuilder;
struct AnalyzeUnit {
@@ -52,6 +52,14 @@ struct AnalyzeUnit {
};
using AnalyzeUnits = QList<AnalyzeUnit>;
using RunnerCreator = std::function<ClangToolRunner*()>;
struct QueueItem {
AnalyzeUnit unit;
RunnerCreator runnerCreator;
};
using QueueItems = QList<QueueItem>;
class ClangToolRunControl : public ProjectExplorer::RunWorker
{
Q_OBJECT
@@ -68,7 +76,7 @@ public:
protected:
void init();
virtual ClangToolRunner *createRunner() = 0;
virtual QList<RunnerCreator> runnerCreators() = 0;
void onRunnerFinishedWithSuccess(const QString &filePath);
void onRunnerFinishedWithFailure(const QString &errorMessage, const QString &errorDetails);
@@ -103,12 +111,12 @@ private:
Core::Id m_toolChainType;
QFutureInterface<void> m_progress;
AnalyzeUnits m_unitsToProcess;
QueueItems m_queue;
QSet<Utils::FilePath> m_projectFiles;
QSet<ClangToolRunner *> m_runners;
int m_initialFilesToProcessSize = 0;
int m_filesAnalyzed = 0;
int m_filesNotAnalyzed = 0;
int m_initialQueueSize = 0;
QSet<QString> m_filesAnalyzed;
QSet<QString> m_filesNotAnalyzed;
bool m_success = false;
};