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

Move parts of QmlEvent and QmlEventType to timeline

Browse Source 
Timeline will become a generic trace handling library. It needs some
abstract concept of events and event types.

Move operator== and operator!= for QmlEvent into the test as we don't
use them anywhere else.

Move the operators for QmlEventType to QmlProfilerTraceClient. We want
to get rid of the hash there as soon as we can assume that no
application we want to profile doesn't support server type IDs.

Change-Id: Icde4e3e7634e387171dc1d8bef7bbe8e71684a1a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Ulf Hermann
2018-03-27 17:39:17 +02:00
parent 5c8c208f26
commit 507c2d6b5b
13 changed files with 216 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/qmlprofiler/qmlevent.cpp
View File

@@ -29,20 +29,6 @@
namespace QmlProfiler {
bool operator==(const QmlEvent &event1, const QmlEvent &event2)
{
if (event1.timestamp() != event2.timestamp() || event1.typeIndex() != event2.typeIndex())
return false;
// This is not particularly efficient, but we also don't need to do this very often.
return event1.numbers<QVarLengthArray<qint64>>() == event2.numbers<QVarLengthArray<qint64>>();
}
bool operator!=(const QmlEvent &event1, const QmlEvent &event2)
{
return !(event1 == event2);
}
enum SerializationType {
OneByte = 0,
TwoByte = 1,
@@ -100,8 +86,8 @@ QDataStream &operator>>(QDataStream &stream, QmlEvent &event)
qint8 type;
stream >> type;
event.m_timestamp = readNumber<qint64>(stream, (type >> TimestampOffset) & TypeMask);
event.m_typeIndex = readNumber<qint32>(stream, (type >> TypeIndexOffset) & TypeMask);
event.setTimestamp(readNumber<qint64>(stream, (type >> TimestampOffset) & TypeMask));
event.setTypeIndex(readNumber<qint32>(stream, (type >> TypeIndexOffset) & TypeMask));
event.m_dataLength = readNumber<qint16>(stream, (type >> DataLengthOffset) & TypeMask);
quint8 bytesPerNumber = 1 << ((type >> DataOffset) & TypeMask);
@@ -224,14 +210,14 @@ static inline void writeNumber(QDataStream &stream, Number number, qint8 type)
QDataStream &operator<<(QDataStream &stream, const QmlEvent &event)
{
qint8 type = minimumType(event.m_timestamp) << TimestampOffset;
type |= minimumType(event.m_typeIndex) << TypeIndexOffset;
qint8 type = minimumType(event.timestamp()) << TimestampOffset;
type |= minimumType(event.typeIndex()) << TypeIndexOffset;
type |= minimumType(event.m_dataLength) << DataLengthOffset;
type |= minimumType(event, event.m_dataLength, event.m_dataType) << DataOffset;
stream << type;
writeNumber(stream, event.m_timestamp, (type >> TimestampOffset) & TypeMask);
writeNumber(stream, event.m_typeIndex, (type >> TypeIndexOffset) & TypeMask);
writeNumber(stream, event.timestamp(), (type >> TimestampOffset) & TypeMask);
writeNumber(stream, event.typeIndex(), (type >> TypeIndexOffset) & TypeMask);
writeNumber(stream, event.m_dataLength, (type >> DataLengthOffset) & TypeMask);
switch ((type >> DataOffset) & TypeMask) {