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

QtVersion: Optimize qtCorePaths() method for speed

Browse Source 
This fix reduces the amount of paths returned from the dirEntries
calls.

Additionally it reduces the amount of calls to FilePath::isReadableFile
which for files in e.g. a docker container is quite expensive.

Change-Id: Ie1314e7257ea870de7823a019d9561f0873e0afd
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Marcus Tillmanns
2022-09-27 09:27:54 +02:00
parent e9045c4962
commit b7ac02ab90
1 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/plugins/qtsupport/baseqtversion.cpp
View File

@@ -2004,32 +2004,52 @@ FilePaths QtVersionPrivate::qtCorePaths()
const QString versionString = m_data.qtVersionString; const QString versionString = m_data.qtVersionString;
const QDir::Filters filters = QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot; const QDir::Filters filters = QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot;
static const QStringList nameFilters{"QtCore*.framework",
"libQtCore*",
"libQt5Core*",
"libQt6Core*",
"QtCore*",
"Qt5Core*",
"Qt6Core*"};
const FilePaths entries = m_data.libraryPath.dirEntries(filters) const FilePaths entries = m_data.libraryPath.dirEntries({nameFilters, filters})
+ m_data.binPath.dirEntries(filters); + m_data.binPath.dirEntries(filters);
FilePaths staticLibs; FilePaths staticLibs;
FilePaths dynamicLibs; FilePaths dynamicLibs;
auto isDynamicLib = [&versionString](const QString &file) {
return file.endsWith(".dll") || file.endsWith(QString::fromLatin1(".so.") + versionString)
|| file.endsWith(".so")
#if defined(Q_OS_OPENBSD)
|| file.contains(QRegularExpression("\\.so\\.[0-9]+\\.[0-9]+$")) // QTCREATORBUG-23818
#endif
|| file.endsWith(QLatin1Char('.') + versionString + ".dylib");
};
auto isStaticLib = [](const QString &file) {
return file.endsWith(".a") || file.endsWith(".lib");
};
auto isFramework = [](const QString &file) {
return file.startsWith("QtCore") && file.endsWith(".framework");
};
auto isQtCore = [](const QString &file) {
return file.startsWith("libQtCore") || file.startsWith("QtCore")
|| file.startsWith("libQt5Core") || file.startsWith("Qt5Core")
|| file.startsWith("libQt6Core") || file.startsWith("Qt6Core");
};
for (const FilePath &entry : entries) { for (const FilePath &entry : entries) {
const QString file = entry.fileName(); const QString file = entry.fileName();
if (file.startsWith("QtCore") && file.endsWith(".framework") && entry.isReadableDir()) { if (isFramework(file) && entry.isReadableDir()) {
// handle Framework
dynamicLibs.append(entry.pathAppended(file.left(file.lastIndexOf('.')))); dynamicLibs.append(entry.pathAppended(file.left(file.lastIndexOf('.'))));
} else if (file.startsWith("libQtCore") || file.startsWith("QtCore") } else if (isQtCore(file)) {
|| file.startsWith("libQt5Core") || file.startsWith("Qt5Core") if (isDynamicLib(file) && entry.isReadableFile())
|| file.startsWith("libQt6Core") || file.startsWith("Qt6Core")) { dynamicLibs.append(entry);
if (entry.isReadableFile()) { else if (isStaticLib(file) && entry.isReadableFile())
if (file.endsWith(".a") || file.endsWith(".lib")) staticLibs.append(entry);
staticLibs.append(entry);
else if (file.endsWith(".dll")
|| file.endsWith(QString::fromLatin1(".so.") + versionString)
|| file.endsWith(".so")
#if defined(Q_OS_OPENBSD)
|| file.contains(QRegularExpression("\\.so\\.[0-9]+\\.[0-9]+$")) // QTCREATORBUG-23818
#endif
|| file.endsWith(QLatin1Char('.') + versionString + ".dylib"))
dynamicLibs.append(entry);
}
} }
} }
// Only handle static libs if we cannot find dynamic ones: // Only handle static libs if we cannot find dynamic ones: