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

QmlProfiler: Move event handling into model manager

Browse Source 
This is the logical place to do it. Adding the event first to the QML
model and then passing it back to the manager in order to have it
dispatched to the other models is somewhat backwards.

Change-Id: I64b1cb38f97331b62d83fa5ae49b9b2690810d40
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Ulf Hermann
2016-12-28 16:39:57 +01:00
parent 00d424eadb
commit 5dd25c42cb
14 changed files with 142 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/plugins/qmlprofiler/tests/memoryusagemodel_test.cpp
View File

@@ -40,60 +40,61 @@ void MemoryUsageModelTest::initTestCase()
qint64 timestamp = 0;
heapPageTypeId = manager.qmlModel()->addEventType(
QmlEventType(MemoryAllocation, MaximumRangeType, HeapPage));
smallItemTypeId = manager.qmlModel()->addEventType(
QmlEventType(MemoryAllocation, MaximumRangeType, SmallItem));
largeItemTypeId = manager.qmlModel()->addEventType(
QmlEventType(MemoryAllocation, MaximumRangeType, LargeItem));
heapPageTypeId = manager.numLoadedEventTypes();
manager.addEventType(QmlEventType(MemoryAllocation, MaximumRangeType, HeapPage));
smallItemTypeId = manager.numLoadedEventTypes();
manager.addEventType(QmlEventType(MemoryAllocation, MaximumRangeType, SmallItem));
largeItemTypeId = manager.numLoadedEventTypes();
manager.addEventType(QmlEventType(MemoryAllocation, MaximumRangeType, LargeItem));
auto addMemoryEvents = [&]() {
QmlEvent event;
event.setTimestamp(++timestamp);
event.setTypeIndex(heapPageTypeId);
event.setNumbers({2048});
manager.qmlModel()->addEvent(event);
manager.qmlModel()->addEvent(event); // allocate two of them and make the model summarize
manager.addEvent(event);
manager.addEvent(event); // allocate two of them and make the model summarize
event.setTimestamp(++timestamp);
event.setTypeIndex(smallItemTypeId);
event.setNumbers({32});
manager.qmlModel()->addEvent(event);
manager.addEvent(event);
event.setTimestamp(++timestamp);
event.setTypeIndex(largeItemTypeId);
event.setNumbers({1024});
manager.qmlModel()->addEvent(event);
manager.addEvent(event);
event.setTimestamp(++timestamp);
event.setTypeIndex(smallItemTypeId);
event.setNumbers({-32});
manager.qmlModel()->addEvent(event);
manager.addEvent(event);
};
addMemoryEvents();
rangeTypeId = manager.qmlModel()->addEventType(
QmlEventType(MaximumMessage, Javascript, -1,
QmlEventLocation(QString("somefile.js"), 10, 20),
QString("funcfunc")));
rangeTypeId = manager.numLoadedEventTypes();
manager.addEventType(QmlEventType(MaximumMessage, Javascript, -1,
QmlEventLocation(QString("somefile.js"), 10, 20),
QString("funcfunc")));
QmlEvent event;
event.setRangeStage(RangeStart);
event.setTimestamp(++timestamp);
event.setTypeIndex(rangeTypeId);
manager.qmlModel()->addEvent(event);
manager.addEvent(event);
addMemoryEvents();
addMemoryEvents(); // twice to also trigger summary in first row
event.setRangeStage(RangeEnd);
event.setTimestamp(++timestamp);
manager.qmlModel()->addEvent(event);
manager.addEvent(event);
event.setTimestamp(++timestamp);
event.setTypeIndex(largeItemTypeId);
event.setNumbers({-1024});
manager.qmlModel()->addEvent(event);
manager.addEvent(event);
manager.acquiringDone();
QCOMPARE(manager.state(), QmlProfilerModelManager::Done);