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

ClassView: Move delaying of update into the main thread

Browse Source 
Minimize the communication with parser's thread.
Don't call getParseDocumentTree() multiple times
when subsequent request for the same document comes
before the timeout.
Don't queue again already queued documentUpdated()
signal (it's emitted form non-gui thread).
Prepare for moving the calls to SessionManager out of the
parser's thread.

Task-number: QTCREATORBUG-25317
Change-Id: I5d4898b5addbb589d415e00c66de5cba7b96d512
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Jarek Kobus
2021-02-18 15:02:54 +01:00
parent aeac17ecf5
commit cb7b3dd817
4 changed files with 90 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/plugins/classview/classviewparser.cpp
View File

@@ -43,7 +43,6 @@
#include <QDebug>
#include <QHash>
#include <QSet>
#include <QTimer>
#include <QElapsedTimer>
enum { debug = false };
@@ -77,15 +76,9 @@ namespace Internal {
class ParserPrivate
{
public:
// Keep timer as a child of Parser in order to move it together with its parent
// into another thread.
ParserPrivate(QObject *parent) : timer(parent) {}
//! Get document from documentList
CPlusPlus::Document::Ptr document(const QString &fileName) const;
QTimer timer;
struct DocumentCache {
unsigned treeRevision = 0;
ParserTreeItem::ConstPtr tree;
@@ -123,12 +116,8 @@ CPlusPlus::Document::Ptr ParserPrivate::document(const QString &fileName) const
Parser::Parser(QObject *parent)
: QObject(parent),
d(new ParserPrivate(this))
d(new ParserPrivate())
{
d->timer.setSingleShot(true);
// timer for emitting changes
connect(&d->timer, &QTimer::timeout, this, &Parser::requestCurrentState);
}
/*!
@@ -304,25 +293,22 @@ ParserTreeItem::ConstPtr Parser::getCachedOrParseDocumentTree(const CPlusPlus::D
}
/*!
Parses the document \a doc if it is in the project files and adds a tree to
Parses the document list \a docs if they are in the project files and adds a tree to
the internal storage.
*/
void Parser::parseDocument(const CPlusPlus::Document::Ptr &doc)
void Parser::updateDocuments(const QList<CPlusPlus::Document::Ptr> &docs)
{
if (doc.isNull())
return;
for (const CPlusPlus::Document::Ptr &doc: docs) {
const QString &name = doc->fileName();
const QString &name = doc->fileName();
// if it is external file (not in any of our projects)
if (!d->fileList.contains(name))
continue;
// if it is external file (not in any of our projects)
if (!d->fileList.contains(name))
return;
getParseDocumentTree(doc);
if (!d->timer.isActive())
d->timer.start(400); //! Delay in msecs before an update
getParseDocumentTree(doc);
}
requestCurrentState();
}
/*!
@@ -393,8 +379,6 @@ void Parser::resetDataToCurrentState()
void Parser::requestCurrentState()
{
d->timer.stop();
// TODO: we need to have a fresh SessionManager data here, which we could pass to parse()
emit treeRegenerated(parse());
}