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

Tracing: Move event storage out of trace manager

Browse Source 
This is a step toward making the trace manager non-virtual. It should
just juggle the storages for types and events, and manage the threads to
access them. It doesn't need to know what exactly it stores.

Change-Id: I45093c60d8ae921e68aeb09bd48d24d5877ce306
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Ulf Hermann
2018-05-07 13:26:05 +02:00
parent e6d583913e
commit 916883e70f
17 changed files with 218 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/qmlprofiler/qmlprofilertraceclient.cpp
View File

@@ -75,7 +75,7 @@ public:
bool updateFeatures(quint8 feature);
int resolveType(const QmlTypedEvent &type);
int resolveStackTop();
void forwardEvents(const QmlEvent &last);
void forwardEvents(QmlEvent &&last);
void processCurrentEvent();
void finalize();
@@ -143,17 +143,17 @@ int QmlProfilerTraceClientPrivate::resolveStackTop()
&& pendingMessages.head().timestamp() < typedEvent.event.timestamp()) {
forwardEvents(pendingMessages.dequeue());
}
forwardEvents(typedEvent.event);
forwardEvents(QmlEvent(typedEvent.event));
return typeIndex;
}
void QmlProfilerTraceClientPrivate::forwardEvents(const QmlEvent &last)
void QmlProfilerTraceClientPrivate::forwardEvents(QmlEvent &&last)
{
while (!pendingDebugMessages.isEmpty()
&& pendingDebugMessages.front().timestamp() <= last.timestamp()) {
modelManager->addEvent(pendingDebugMessages.dequeue());
modelManager->appendEvent(pendingDebugMessages.dequeue());
}
modelManager->addEvent(last);
modelManager->appendEvent(std::move(last));
}
void QmlProfilerTraceClientPrivate::processCurrentEvent()
@@ -176,7 +176,7 @@ void QmlProfilerTraceClientPrivate::processCurrentEvent()
currentEvent.event.setTypeIndex(typeIndex);
while (!pendingMessages.isEmpty())
forwardEvents(pendingMessages.dequeue());
forwardEvents(currentEvent.event);
forwardEvents(QmlEvent(currentEvent.event));
rangesInProgress.pop();
break;
}
@@ -196,7 +196,7 @@ void QmlProfilerTraceClientPrivate::processCurrentEvent()
int typeIndex = resolveType(currentEvent);
currentEvent.event.setTypeIndex(typeIndex);
if (rangesInProgress.isEmpty())
forwardEvents(currentEvent.event);
forwardEvents(QmlEvent(currentEvent.event));
else
pendingMessages.enqueue(currentEvent.event);
break;
@@ -214,7 +214,7 @@ void QmlProfilerTraceClientPrivate::finalize()
}
QTC_CHECK(pendingMessages.isEmpty());
while (!pendingDebugMessages.isEmpty())
modelManager->addEvent(pendingDebugMessages.dequeue());
modelManager->appendEvent(pendingDebugMessages.dequeue());
}
void QmlProfilerTraceClientPrivate::sendRecordingStatus(int engineId)