summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cpptoolstestcase.cpp
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@theqtcompany.com>2015-07-07 15:02:14 +0200
committerNikolai Kosjar <nikolai.kosjar@theqtcompany.com>2015-07-10 14:04:07 +0000
commit442bdbded2b2268efcb3be1a969d432533023366 (patch)
tree9bda03fd90c90de0385bde77d25d32f15cc9856b /src/plugins/cpptools/cpptoolstestcase.cpp
parent91c497b1aebaf4b24ac1e5b884940820c6a0a88c (diff)
downloadqt-creator-442bdbded2b2268efcb3be1a969d432533023366.tar.gz
CppTools: Avoid unnecessary blocking of main thread
Among others, BaseEditorDocumentParser::projectPart() was a blocking operation in case the parser was running. This led to noticeable GUI freezes for the ClangCodeModel since the function was called from the main thread. Rework *EditorDocumentParser to clearly separate the configuration data (input) from the actual object state. Querying/setting configuration or (last) state does not block anymore. update() is supposed to get the necessary configuration and the last state at the beginning and to set the new state at end. Change-Id: Ib4b534fa6ff373c3059826726b3f10ece95acc21 Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
Diffstat (limited to 'src/plugins/cpptools/cpptoolstestcase.cpp')
-rw-r--r--src/plugins/cpptools/cpptoolstestcase.cpp29
1 files changed, 29 insertions, 0 deletions
diff --git a/src/plugins/cpptools/cpptoolstestcase.cpp b/src/plugins/cpptools/cpptoolstestcase.cpp
index 8d2a3684a0..8cd7953320 100644
--- a/src/plugins/cpptools/cpptoolstestcase.cpp
+++ b/src/plugins/cpptools/cpptoolstestcase.cpp
@@ -29,6 +29,10 @@
****************************************************************************/
#include "cpptoolstestcase.h"
+
+#include "baseeditordocumentparser.h"
+#include "baseeditordocumentprocessor.h"
+#include "editordocumenthandle.h"
#include "cppmodelmanager.h"
#include "cppworkingcopy.h"
@@ -140,6 +144,31 @@ bool TestCase::garbageCollectGlobalSnapshot()
return globalSnapshot().isEmpty();
}
+static bool waitForProcessedEditorDocument_internal(CppEditorDocumentHandle *editorDocument,
+ int timeOutInMs)
+{
+ QTC_ASSERT(editorDocument, return false);
+
+ QTime timer;
+ timer.start();
+
+ forever {
+ if (!editorDocument->processor()->isParserRunning())
+ return true;
+ if (timer.elapsed() > timeOutInMs)
+ return false;
+
+ QCoreApplication::processEvents();
+ QThread::msleep(20);
+ }
+}
+
+bool TestCase::waitForProcessedEditorDocument(const QString &filePath, int timeOutInMs)
+{
+ auto *editorDocument = CppModelManager::instance()->cppEditorDocument(filePath);
+ return waitForProcessedEditorDocument_internal(editorDocument, timeOutInMs);
+}
+
bool TestCase::parseFiles(const QSet<QString> &filePaths)
{
CppModelManager::instance()->updateSourceFiles(filePaths).waitForFinished();