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

ClassView: Move the GUI related code out of Parser

Browse Source 
Don't create QStandardItem objects inside the non-gui thread,
as it was in case of requestCurrentState() which is always
called in parser's thread. As a result of parsing send a root's
ParserTreeItem::ConstPtr now instead. Store the generated
root inside Manager instead of inside Parser. Remove rootItemLocker
as it's not needed now anymore. Move the implementation of
canFetchMore(), fetchMore() and hasChildren() into Manager class.

Now all the API of Parser class is used only in parser's thread
(with the exception of constructor and destructor).

Task-number: QTCREATORBUG-25317
Change-Id: I2b3c49918bf58266e6bea8acf65c975e19f7d9cb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Jarek Kobus
2021-02-16 14:01:16 +01:00
parent ab7560bec4
commit a513f25c39
5 changed files with 61 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -111,12 +111,6 @@ public:
//! List for files which has to be parsed
QSet<QString> fileList;
//! Root item read write lock
QReadWriteLock rootItemLocker;
//! Parsed root item
ParserTreeItem::ConstPtr rootItem;
//! Flat mode
bool flatMode = false;
};
@@ -151,39 +145,6 @@ Parser::~Parser()
delete d;
}
/*!
Checks \a item for lazy data population of a QStandardItemModel.
*/
bool Parser::canFetchMore(QStandardItem *item, bool skipRoot) const
{
ParserTreeItem::ConstPtr ptr = findItemByRoot(item, skipRoot);
if (ptr.isNull())
return false;
return ptr->canFetchMore(item);
}
/*!
Checks \a item for lazy data population of a QStandardItemModel.
\a skipRoot skips the root item.
*/
void Parser::fetchMore(QStandardItem *item, bool skipRoot) const
{
ParserTreeItem::ConstPtr ptr = findItemByRoot(item, skipRoot);
if (ptr.isNull())
return;
ptr->fetchMore(item);
}
bool Parser::hasChildren(QStandardItem *item) const
{
ParserTreeItem::ConstPtr ptr = findItemByRoot(item);
if (ptr.isNull())
return false;
return ptr->childCount() != 0;
}
/*!
Switches to flat mode (without subprojects) if \a flat returns \c true.
*/
@@ -206,45 +167,6 @@ void Parser::aboutToShutdown()
d->timer.stop();
}
/*!
Returns the internal tree item for \a item. \a skipRoot skips the root
item.
*/
ParserTreeItem::ConstPtr Parser::findItemByRoot(const QStandardItem *item, bool skipRoot) const
{
if (!item)
return ParserTreeItem::ConstPtr();
// go item by item to the root
QList<const QStandardItem *> uiList;
const QStandardItem *cur = item;
while (cur) {
uiList.append(cur);
cur = cur->parent();
}
if (skipRoot && uiList.count() > 0)
uiList.removeLast();
ParserTreeItem::ConstPtr internal;
{
QReadLocker locker(&d->rootItemLocker);
internal = d->rootItem;
}
while (uiList.count() > 0) {
cur = uiList.last();
uiList.removeLast();
const SymbolInformation &inf = Internal::symbolInformationFromItem(cur);
internal = internal->child(inf);
if (internal.isNull())
break;
}
return internal;
}
/*!
Parses the class and produces a new tree.
@@ -486,16 +408,7 @@ void Parser::requestCurrentState()
d->timer.stop();
// TODO: we need to have a fresh SessionManager data here, which we could pass to parse()
const ParserTreeItem::ConstPtr newRoot = parse();
{
QWriteLocker locker(&d->rootItemLocker);
d->rootItem = newRoot;
}
QSharedPointer<QStandardItem> std(new QStandardItem());
d->rootItem->convertTo(std.data());
emit treeDataUpdate(std);
emit treeRegenerated(parse());
}
// TODO: don't use Project class in this thread