From 4e6d09d8e1e9ba776ee20000d5a39b46ce2c25af Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@qt.io>
Date: Tue, 11 Sep 2018 17:02:45 +0200
Subject: Clang: Reuse thread based pipeline for pch creation

The pch creation so far used signal and slots but there was no explicit
pipeline. This patch is introducing the same architecture like the
refactoring plugin. It is filtering out older project parts from the
pipeline.

Change-Id: Iaa6bd2ca1272231b97ebe1f5f7b2ce8e43bc590c
Task-number: QTCREATORBUG-21111
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
---
 .../source/symbolindexing.h                        | 34 ++++++++++++++++++----
 1 file changed, 28 insertions(+), 6 deletions(-)

(limited to 'src/tools/clangrefactoringbackend/source/symbolindexing.h')

diff --git a/src/tools/clangrefactoringbackend/source/symbolindexing.h b/src/tools/clangrefactoringbackend/source/symbolindexing.h
index 8f7821bddb..918edb626a 100644
--- a/src/tools/clangrefactoringbackend/source/symbolindexing.h
+++ b/src/tools/clangrefactoringbackend/source/symbolindexing.h
@@ -30,9 +30,9 @@
 #include "storagesqlitestatementfactory.h"
 #include "symbolindexer.h"
 #include "symbolscollector.h"
-#include "symbolscollectormanager.h"
+#include "processormanager.h"
 #include "symbolindexertaskqueue.h"
-#include "symbolindexertaskscheduler.h"
+#include "taskscheduler.h"
 #include "symbolstorage.h"
 
 #include <refactoringdatabaseinitializer.h>
@@ -48,19 +48,40 @@
 
 namespace ClangBackEnd {
 
+class SymbolsCollectorManager;
+
+class SymbolsCollectorManager final : public ClangBackEnd::ProcessorManager<SymbolsCollector>
+{
+public:
+    using Processor = SymbolsCollector;
+    SymbolsCollectorManager(const ClangBackEnd::GeneratedFiles &generatedFiles,
+                            Sqlite::Database &database)
+        : ProcessorManager(generatedFiles),
+          m_database(database)
+    {}
+
+protected:
+    std::unique_ptr<SymbolsCollector> createProcessor() const
+    {
+        return  std::make_unique<SymbolsCollector>(m_database);
+    }
+
+private:
+    Sqlite::Database &m_database;
+};
+
 class SymbolIndexing final : public SymbolIndexingInterface
 {
 public:
     using StatementFactory = ClangBackEnd::StorageSqliteStatementFactory<Sqlite::Database>;
     using Storage = ClangBackEnd::SymbolStorage<StatementFactory>;
-
     SymbolIndexing(Sqlite::Database &database,
                    FilePathCachingInterface &filePathCache,
                    const GeneratedFiles &generatedFiles)
         : m_filePathCache(filePathCache),
           m_statementFactory(database),
-          m_collectorManger(database, generatedFiles),
-          m_indexerScheduler(m_collectorManger, m_symbolStorage, database, m_indexerQueue, std::thread::hardware_concurrency())
+          m_collectorManger(generatedFiles, database),
+          m_indexerScheduler(m_collectorManger, m_indexerQueue, std::thread::hardware_concurrency())
     {
     }
 
@@ -86,12 +107,13 @@ public:
     void updateProjectParts(V2::ProjectPartContainers &&projectParts) override;
 
 private:
+    using SymbolIndexerTaskScheduler = TaskScheduler<SymbolsCollectorManager, SymbolIndexerTask::Callable>;
     FilePathCachingInterface &m_filePathCache;
     StatementFactory m_statementFactory;
     Storage m_symbolStorage{m_statementFactory};
     ClangPathWatcher<QFileSystemWatcher, QTimer> m_sourceWatcher{m_filePathCache};
     FileStatusCache m_fileStatusCache{m_filePathCache};
-    SymbolsCollectorManager<SymbolsCollector> m_collectorManger;
+    SymbolsCollectorManager m_collectorManger;
     SymbolIndexerTaskScheduler m_indexerScheduler;
     SymbolIndexerTaskQueue m_indexerQueue{m_indexerScheduler};
     SymbolIndexer m_indexer{m_indexerQueue,
-- 
cgit v1.2.1