From 390a227df672a227de4539ad44da46cf773d5810 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Tue, 4 Dec 2018 19:03:48 +0100 Subject: ClangPchManager: Introduce PchTaskQueue With the PchTaskQueue the pipeline is almost complete. Task-number: QTCREATORBUG-21346 Change-Id: I5f05d525db1679eb37dd1d462076c1ed42958099 Reviewed-by: Ivan Donchevskii --- src/tools/clangrefactoringbackend/source/symbolindexertaskqueue.h | 2 +- src/tools/clangrefactoringbackend/source/symbolindexing.h | 2 +- src/tools/clangrefactoringbackend/source/symbolstorage.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/tools/clangrefactoringbackend/source') diff --git a/src/tools/clangrefactoringbackend/source/symbolindexertaskqueue.h b/src/tools/clangrefactoringbackend/source/symbolindexertaskqueue.h index c0379b2c29..7ca3513284 100644 --- a/src/tools/clangrefactoringbackend/source/symbolindexertaskqueue.h +++ b/src/tools/clangrefactoringbackend/source/symbolindexertaskqueue.h @@ -94,7 +94,7 @@ public: void processEntries() { - uint taskCount = m_symbolIndexerScheduler.freeSlots(); + uint taskCount = m_symbolIndexerScheduler.slotUsage().free; auto newEnd = std::prev(m_tasks.end(), std::min(int(taskCount), int(m_tasks.size()))); m_symbolIndexerScheduler.addTasks({std::make_move_iterator(newEnd), diff --git a/src/tools/clangrefactoringbackend/source/symbolindexing.h b/src/tools/clangrefactoringbackend/source/symbolindexing.h index d20142870e..10e1be0358 100644 --- a/src/tools/clangrefactoringbackend/source/symbolindexing.h +++ b/src/tools/clangrefactoringbackend/source/symbolindexing.h @@ -105,7 +105,7 @@ public: m_indexerScheduler.disable(); while (!m_indexerScheduler.futures().empty()) { m_indexerScheduler.syncTasks(); - m_indexerScheduler.freeSlots(); + m_indexerScheduler.slotUsage(); } } diff --git a/src/tools/clangrefactoringbackend/source/symbolstorage.h b/src/tools/clangrefactoringbackend/source/symbolstorage.h index 4aae17c599..02d52bfb50 100644 --- a/src/tools/clangrefactoringbackend/source/symbolstorage.h +++ b/src/tools/clangrefactoringbackend/source/symbolstorage.h @@ -332,7 +332,7 @@ public: m_database }; mutable ReadStatement m_getPrecompiledHeader{ - "SELECT pchPath, pchBuildTime FROM precompiledHeaders WHERE projectPartId = ?", + "SELECT projectPchPath, projectPchBuildTime FROM precompiledHeaders WHERE projectPartId = ?", m_database }; }; -- cgit v1.2.1