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

Clang: Set indexing time stamp by dependent sources

Browse Source 
Instead of using the time stamp from clang we simply set one time stamp
for all dependent sources.

Change-Id: I0adbe59d46c88ddd1ac491a7f7db568bcf2ac540
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Marco Bubke
2019-07-24 16:13:10 +02:00
parent ac22760043
commit cdda564946
8 changed files with 91 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/tools/clangrefactoringbackend/source/symbolindexer.cpp
View File

@@ -92,21 +92,40 @@ void SymbolIndexer::updateProjectParts(ProjectPartContainers &&projectParts)
}
namespace {
void store(SymbolStorageInterface &symbolStorage,
BuildDependenciesStorageInterface &buildDependencyStorage,
Sqlite::TransactionInterface &transactionInterface,
SymbolsCollectorInterface &symbolsCollector)
SymbolsCollectorInterface &symbolsCollector,
const FilePathIds &dependentSources)
{
try {
long long now = std::chrono::duration_cast<std::chrono::seconds>(
std::chrono::system_clock::now().time_since_epoch())
.count();
Sqlite::ImmediateTransaction transaction{transactionInterface};
buildDependencyStorage.insertOrUpdateIndexingTimeStamps(symbolsCollector.fileStatuses());
buildDependencyStorage.insertOrUpdateIndexingTimeStampsWithoutTransaction(dependentSources,
now);
symbolStorage.addSymbolsAndSourceLocations(symbolsCollector.symbols(),
symbolsCollector.sourceLocations());
transaction.commit();
} catch (const Sqlite::StatementIsBusy &) {
store(symbolStorage, buildDependencyStorage, transactionInterface, symbolsCollector);
store(symbolStorage,
buildDependencyStorage,
transactionInterface,
symbolsCollector,
dependentSources);
}
}
FilePathIds toFilePathIds(const SourceTimeStamps &sourceTimeStamps)
{
return Utils::transform<FilePathIds>(sourceTimeStamps, [](SourceTimeStamp sourceTimeStamp) {
return sourceTimeStamp.sourceId;
});
}
} // namespace
void SymbolIndexer::updateProjectPart(ProjectPartContainer &&projectPart)
@@ -124,6 +143,7 @@ void SymbolIndexer::updateProjectPart(ProjectPartContainer &&projectPart)
auto indexing = [projectPart,
sourcePathId,
preIncludeSearchPath = m_environment.preIncludeSearchPath(),
dependentSources = toFilePathIds(dependentTimeStamps),
this](SymbolsCollectorInterface &symbolsCollector) {
auto collect = [&](const FilePath &pchPath) {
using Builder = CommandLineBuilder<ProjectPartContainer, Utils::SmallStringVector>;
@@ -147,17 +167,20 @@ void SymbolIndexer::updateProjectPart(ProjectPartContainer &&projectPart)
store(m_symbolStorage,
m_buildDependencyStorage,
m_transactionInterface,
symbolsCollector);
symbolsCollector,
dependentSources);
} else if (pchPaths.systemPchPath.size() && collect(pchPaths.systemPchPath)) {
store(m_symbolStorage,
m_buildDependencyStorage,
m_transactionInterface,
symbolsCollector);
symbolsCollector,
dependentSources);
} else if (collect({})) {
store(m_symbolStorage,
m_buildDependencyStorage,
m_transactionInterface,
symbolsCollector);
symbolsCollector,
dependentSources);
}
};
@@ -196,6 +219,7 @@ void SymbolIndexer::updateChangedPath(FilePathId filePathId,
auto indexing = [optionalArtefact = std::move(optionalArtefact),
filePathId,
preIncludeSearchPath = m_environment.preIncludeSearchPath(),
dependentSources = toFilePathIds(dependentTimeStamps),
this](SymbolsCollectorInterface &symbolsCollector) {
auto collect = [&](const FilePath &pchPath) {
const ProjectPartArtefact &artefact = *optionalArtefact;
@@ -218,11 +242,23 @@ void SymbolIndexer::updateChangedPath(FilePathId filePathId,
optionalArtefact->projectPartId);
if (pchPaths.projectPchPath.size() && collect(pchPaths.projectPchPath)) {
store(m_symbolStorage, m_buildDependencyStorage, m_transactionInterface, symbolsCollector);
store(m_symbolStorage,
m_buildDependencyStorage,
m_transactionInterface,
symbolsCollector,
dependentSources);
} else if (pchPaths.systemPchPath.size() && collect(pchPaths.systemPchPath)) {
store(m_symbolStorage, m_buildDependencyStorage, m_transactionInterface, symbolsCollector);
store(m_symbolStorage,
m_buildDependencyStorage,
m_transactionInterface,
symbolsCollector,
dependentSources);
} else if (collect({})) {
store(m_symbolStorage, m_buildDependencyStorage, m_transactionInterface, symbolsCollector);
store(m_symbolStorage,
m_buildDependencyStorage,
m_transactionInterface,
symbolsCollector,
dependentSources);
}
};