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

CMake: Do not create file system node in main thread

Browse Source 
The file system scanning was already in a thread, but creating a tree
from the flat list of file nodes was still done in the main thread.
Creating the tree looks for and creates folder nodes as needed for each
file node, which is not that big of a deal but still takes 1/3 of a
second for the Qt Creator source tree.

Task-number: QTCREATORBUG-25783
Change-Id: I28948ed3ff5233f6fc4b86e93da94d882b81e231
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Eike Ziller
2021-06-16 11:33:35 +02:00
parent fd6ec7da25
commit 9109a6895e
13 changed files with 191 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/plugins/cmakeprojectmanager/projecttreehelper.cpp
View File

@@ -175,7 +175,7 @@ CMakeTargetNode *createTargetNode(const QHash<Utils::FilePath, ProjectNode *> &c
void addHeaderNodes(ProjectNode *root,
QSet<Utils::FilePath> &seenHeaders,
const QList<const FileNode *> &allFiles)
const QList<FileNode *> &allFiles)
{
QTC_ASSERT(root, return );
@@ -206,11 +206,28 @@ void addHeaderNodes(ProjectNode *root,
root->addNode(std::move(headerNode));
}
void addFileSystemNodes(ProjectNode *root, const QList<const FileNode *> &allFiles)
template<typename Result>
static std::unique_ptr<Result> cloneFolderNode(FolderNode *node)
{
auto folderNode = std::make_unique<Result>(node->filePath());
folderNode->setDisplayName(node->displayName());
for (Node *node : node->nodes()) {
if (FileNode *fn = node->asFileNode()) {
folderNode->addNode(std::unique_ptr<FileNode>(fn->clone()));
} else if (FolderNode *fn = node->asFolderNode()) {
folderNode->addNode(cloneFolderNode<FolderNode>(fn));
} else {
QTC_CHECK(false);
}
}
return folderNode;
}
void addFileSystemNodes(ProjectNode *root, const std::shared_ptr<FolderNode> &folderNode)
{
QTC_ASSERT(root, return );
auto fileSystemNode = std::make_unique<VirtualFolderNode>(root->filePath());
auto fileSystemNode = cloneFolderNode<VirtualFolderNode>(folderNode.get());
// just before special nodes like "CMake Modules"
fileSystemNode->setPriority(Node::DefaultPriority - 6);
fileSystemNode->setDisplayName(
@@ -218,19 +235,12 @@ void addFileSystemNodes(ProjectNode *root, const QList<const FileNode *> &allFil
"<File System>"));
fileSystemNode->setIcon(DirectoryIcon(ProjectExplorer::Constants::FILEOVERLAY_UNKNOWN));
for (const FileNode *fn : allFiles) {
if (!fn->filePath().isChildOf(root->filePath()))
continue;
std::unique_ptr<FileNode> node(fn->clone());
node->setEnabled(false);
fileSystemNode->addNestedNode(std::move(node));
}
if (!fileSystemNode->isEmpty()) {
// make file system nodes less probable to be selected when syncing with the current document
fileSystemNode->forEachGenericNode(
[](Node *n) { n->setPriority(n->priority() + Node::DefaultProjectFilePriority + 1); });
fileSystemNode->forEachGenericNode([](Node *n) {
n->setPriority(n->priority() + Node::DefaultProjectFilePriority + 1);
n->setEnabled(false);
});
root->addNode(std::move(fileSystemNode));
}
}