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

Cmake: Read the build.ninja file only once

Browse Source 
The first getCmakeCXXFlags that reads the build.ninja file
stores the contents in the inout parameter cachedBuildNinja.
Further calls to getCMakeCXXFlags just use this cached value.

This prevents excessive locking of this file while constructing
the code model information.

Change-Id: I81e1431194bed6913c69abb2d954068c999a5c1b
Task-number: QTCREATORBUG-14639
Reviewed-by: Tom Tanner
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Daniel Teske
2015-07-20 12:32:54 +02:00
parent 42d8672626
commit 13c2c40636
2 changed files with 41 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View File

@@ -177,7 +177,7 @@ void CMakeProject::changeBuildDirectory(CMakeBuildConfiguration *bc, const QStri
parseCMakeLists(); parseCMakeLists();
} }
QStringList CMakeProject::getCXXFlagsFor(const CMakeBuildTarget &buildTarget) QStringList CMakeProject::getCXXFlagsFor(const CMakeBuildTarget &buildTarget, QByteArray *cachedBuildNinja)
{ {
QString makeCommand = QDir::fromNativeSeparators(buildTarget.makeCommand); QString makeCommand = QDir::fromNativeSeparators(buildTarget.makeCommand);
int startIndex = makeCommand.indexOf(QLatin1Char('\"')); int startIndex = makeCommand.indexOf(QLatin1Char('\"'));
@@ -206,32 +206,43 @@ QStringList CMakeProject::getCXXFlagsFor(const CMakeBuildTarget &buildTarget)
// found // found
// Get "all" target's working directory // Get "all" target's working directory
if (!buildTargets().empty()) { if (!buildTargets().empty()) {
QString buildNinjaFile = QDir::fromNativeSeparators(buildTargets().at(0).workingDirectory); if (cachedBuildNinja->isNull()) {
buildNinjaFile += QLatin1String("/build.ninja"); QString buildNinjaFile = QDir::fromNativeSeparators(buildTargets().at(0).workingDirectory);
QFile buildNinja(buildNinjaFile); buildNinjaFile += QLatin1String("/build.ninja");
if (buildNinja.exists()) { QFile buildNinja(buildNinjaFile);
buildNinja.open(QIODevice::ReadOnly | QIODevice::Text); if (buildNinja.exists()) {
QTextStream stream(&buildNinja); buildNinja.open(QIODevice::ReadOnly | QIODevice::Text);
bool targetFound = false; *cachedBuildNinja = buildNinja.readAll();
bool cxxFound = false; buildNinja.close();
QString targetSearchPattern = QString::fromLatin1("target %1").arg(buildTarget.title); } else {
*cachedBuildNinja = QByteArray();
while (!stream.atEnd()) {
// 1. Look for a block that refers to the current target
// 2. Look for a build rule which invokes CXX_COMPILER
// 3. Return the FLAGS definition
QString line = stream.readLine().trimmed();
if (line.startsWith(QLatin1String("#"))) {
if (!line.startsWith(QLatin1String("# Object build statements for"))) continue;
targetFound = line.endsWith(targetSearchPattern);
} else if (targetFound && line.startsWith(QLatin1String("build"))) {
cxxFound = line.indexOf(QLatin1String("CXX_COMPILER")) != -1;
} else if (cxxFound && line.startsWith(QLatin1String("FLAGS ="))) {
// Skip past =
return line.mid(7).trimmed().split(QLatin1Char(' '), QString::SkipEmptyParts);
}
} }
} }
if (cachedBuildNinja->isEmpty())
return QStringList();
QTextStream stream(cachedBuildNinja);
bool targetFound = false;
bool cxxFound = false;
QString targetSearchPattern = QString::fromLatin1("target %1").arg(buildTarget.title);
while (!stream.atEnd()) {
// 1. Look for a block that refers to the current target
// 2. Look for a build rule which invokes CXX_COMPILER
// 3. Return the FLAGS definition
QString line = stream.readLine().trimmed();
if (line.startsWith(QLatin1String("#"))) {
if (!line.startsWith(QLatin1String("# Object build statements for"))) continue;
targetFound = line.endsWith(targetSearchPattern);
} else if (targetFound && line.startsWith(QLatin1String("build"))) {
cxxFound = line.indexOf(QLatin1String("CXX_COMPILER")) != -1;
} else if (cxxFound && line.startsWith(QLatin1String("FLAGS ="))) {
// Skip past =
return line.mid(7).trimmed().split(QLatin1Char(' '), QString::SkipEmptyParts);
}
}
} }
return QStringList(); return QStringList();
} }
@@ -338,13 +349,15 @@ bool CMakeProject::parseCMakeLists()
ppBuilder.setQtVersion(activeQtVersion); ppBuilder.setQtVersion(activeQtVersion);
QByteArray cachedBuildNinja;
foreach (const CMakeBuildTarget &cbt, m_buildTargets) { foreach (const CMakeBuildTarget &cbt, m_buildTargets) {
// This explicitly adds -I. to the include paths // This explicitly adds -I. to the include paths
QStringList includePaths = cbt.includeFiles; QStringList includePaths = cbt.includeFiles;
includePaths += projectDirectory().toString(); includePaths += projectDirectory().toString();
ppBuilder.setIncludePaths(includePaths); ppBuilder.setIncludePaths(includePaths);
ppBuilder.setCFlags(getCXXFlagsFor(cbt)); QStringList cxxflags = getCXXFlagsFor(cbt, &cachedBuildNinja);
ppBuilder.setCxxFlags(getCXXFlagsFor(cbt)); ppBuilder.setCFlags(cxxflags);
ppBuilder.setCxxFlags(cxxflags);
ppBuilder.setDefines(cbt.defines); ppBuilder.setDefines(cbt.defines);
ppBuilder.setDisplayName(cbt.title); ppBuilder.setDisplayName(cbt.title);

2
src/plugins/cmakeprojectmanager/cmakeproject.h
View File

@@ -139,7 +139,7 @@ private:
QString uiHeaderFile(const QString &uiFile); QString uiHeaderFile(const QString &uiFile);
void updateRunConfigurations(ProjectExplorer::Target *t); void updateRunConfigurations(ProjectExplorer::Target *t);
void updateApplicationAndDeploymentTargets(); void updateApplicationAndDeploymentTargets();
QStringList getCXXFlagsFor(const CMakeBuildTarget &buildTarget); QStringList getCXXFlagsFor(const CMakeBuildTarget &buildTarget, QByteArray *cachedBuildNinja);
Internal::CMakeManager *m_manager; Internal::CMakeManager *m_manager;
ProjectExplorer::Target *m_activeTarget; ProjectExplorer::Target *m_activeTarget;