forked from qt-creator/qt-creator
AutoTest: Guard simultaneous access to header cache
It is accessed from multiple threads at once. Guard with mutex to avoid
crashes.
Amends 64ce2a6f43
Change-Id: I5048e5fcdb27b2492656b302775378829b6da013
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
@@ -37,6 +37,7 @@ namespace Autotest {
|
||||
|
||||
using LookupInfo = QPair<QString, QString>;
|
||||
static QHash<LookupInfo, bool> s_pchLookupCache;
|
||||
Q_GLOBAL_STATIC(QMutex, s_cacheMutex);
|
||||
|
||||
CppParser::CppParser(ITestFramework *framework)
|
||||
: ITestParser(framework)
|
||||
@@ -96,6 +97,7 @@ bool precompiledHeaderContains(const CPlusPlus::Snapshot &snapshot,
|
||||
}
|
||||
return it.value();
|
||||
};
|
||||
QMutexLocker l(s_cacheMutex());
|
||||
return Utils::anyOf(precompiledHeaders, headerContains);
|
||||
}
|
||||
|
||||
@@ -127,6 +129,7 @@ void CppParser::release()
|
||||
{
|
||||
m_cppSnapshot = CPlusPlus::Snapshot();
|
||||
m_workingCopy = CppTools::WorkingCopy();
|
||||
QMutexLocker l(s_cacheMutex());
|
||||
s_pchLookupCache.clear();
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user