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

AutoTest: Avoid fetching WorkingCopy from multiple threads

Browse Source 
Instead fetch it once before starting asynchronous processing and
accept that current state of the WorkingCopy might be not completely
up to date. This avoids a crash that might happen when the code model
tries to update the WorkingCopy while the test code parser fetches
information of the WorkingCopy.

Change-Id: I2a893bc8814090361305657ed3c3d772c7bf07d5
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Christian Stenger
2016-06-20 07:03:55 +02:00
parent cfc724e709
commit 72e6dd2ab1
11 changed files with 108 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/autotest/itestparser.h
View File

@@ -30,7 +30,7 @@
#include <coreplugin/id.h>
#include <cplusplus/CppDocument.h>
#include <cpptools/cppmodelmanager.h>
#include <cpptools/cppworkingcopy.h>
#include <qmljs/qmljsdocument.h>
namespace Autotest {
@@ -64,6 +64,7 @@ public:
virtual void init(const QStringList &filesToParse) = 0;
virtual bool processDocument(QFutureInterface<TestParseResultPtr> futureInterface,
const QString &fileName) = 0;
virtual void release() = 0;
void setId(const Core::Id &id) { m_id = id; }
Core::Id id() const { return m_id; }
@@ -74,22 +75,15 @@ private:
class CppParser : public ITestParser
{
public:
void init(const QStringList &filesToParse) override
{
Q_UNUSED(filesToParse);
m_cppSnapshot = CppTools::CppModelManager::instance()->snapshot();
}
static bool selectedForBuilding(const QString &fileName)
{
QList<CppTools::ProjectPart::Ptr> projParts =
CppTools::CppModelManager::instance()->projectPart(fileName);
return projParts.size() && projParts.at(0)->selectedForBuilding;
}
CppParser();
void init(const QStringList &filesToParse) override;
static bool selectedForBuilding(const QString &fileName);
static QByteArray getFileContent(const QString &filePath);
void release() override;
protected:
CPlusPlus::Snapshot m_cppSnapshot;
CppTools::WorkingCopy m_workingCopy;
};
} // namespace Internal