ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

logic: Fixed bugs in TaskParse scheduling

Browse Source 
* Added TaskParse as base for TaskParseCxx and TaskParseJava
* Fixed increment and decrement of indexer_count on blackboard not atomic
* Fixed TaskInjectStorage finished before TaskParse started
* Fixed project not cleared when refreshing on now empty project
* Fixed TaskInjectStorage overheating when nothing to do
This commit is contained in:
Eberhard Graether
2016-10-20 23:02:54 +02:00
parent a388932864
commit 06c7a4e159
12 changed files with 147 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/Project.cpp
+6 -6
View File
@@ -245,9 +245,9 @@ bool Project::buildIndex(bool forceRefresh)
return false;
}
m_fileManager.fetchFilePaths(
forceRefresh ? std::vector<FileInfo>() : m_storage->getInfoOnAllFiles()
);
std::vector<FileInfo> fileInfos = m_storage->getInfoOnAllFiles();
m_fileManager.fetchFilePaths(forceRefresh ? std::vector<FileInfo>() : fileInfos);
std::set<FilePath> addedFilePaths = m_fileManager.getAddedFilePaths();
std::set<FilePath> updatedFilePaths = m_fileManager.getUpdatedFilePaths();
@@ -279,7 +279,7 @@ bool Project::buildIndex(bool forceRefresh)
utility::append(filesToParse, addedFilePaths);
utility::append(filesToParse, updatedFilePaths);
if (!filesToClean.size() && !filesToParse.size())
if (!filesToClean.size() && !filesToParse.size() && (!forceRefresh || !fileInfos.size()))
{
MessageStatus("Nothing to refresh, all files are up-to-date.").dispatch();
return false;
@@ -315,7 +315,7 @@ bool Project::buildIndex(bool forceRefresh)
);
}
const int indexerThreadCount = ApplicationSettings::getInstance()->getIndexerThreadCount();
const size_t indexerThreadCount = ApplicationSettings::getInstance()->getIndexerThreadCount();
std::shared_ptr<FileRegister> fileRegister = std::make_shared<FileRegister>(&m_fileManager, indexerThreadCount > 1);
@@ -334,7 +334,7 @@ bool Project::buildIndex(bool forceRefresh)
std::shared_ptr<StorageProvider> storageProvider = std::make_shared<StorageProvider>();
for (int i = 0; i < indexerThreadCount; i++)
for (size_t i = 0; i < indexerThreadCount && i < filesToParse.size(); i++)
{
std::shared_ptr<TaskRepeatWhileSuccess> taskRepeat = std::make_shared<TaskRepeatWhileSuccess>(Task::STATE_SUCCESS);
taskParallelIndexing->addTask(taskRepeat);