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

QmlProfiler: Replace QStringList with QString in event data

Browse Source 
We never have multi-string event data and dragging around the list
everywhere just adds noise.

Change-Id: I4c73543464abea01d342e3f0a296ed1b05ee2a88
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
This commit is contained in:
Ulf Hermann
2014-06-13 16:33:30 +02:00
parent c7c4be9cb2
commit b0d79542b8
11 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libs/qmldebug/qmlprofilertraceclient.cpp
View File

@@ -47,7 +47,7 @@ public:
QmlProfilerTraceClient *q; QmlProfilerTraceClient *q;
qint64 inProgressRanges; qint64 inProgressRanges;
QStack<qint64> rangeStartTimes[MaximumRangeType]; QStack<qint64> rangeStartTimes[MaximumRangeType];
QStack<QStringList> rangeDatas[MaximumRangeType]; QStack<QString> rangeDatas[MaximumRangeType];
QStack<QmlEventLocation> rangeLocations[MaximumRangeType]; QStack<QmlEventLocation> rangeLocations[MaximumRangeType];
QStack<BindingType> bindingTypes; QStack<BindingType> bindingTypes;
int rangeCount[MaximumRangeType]; int rangeCount[MaximumRangeType];
@@ -175,7 +175,7 @@ void QmlProfilerTraceClient::messageReceived(const QByteArray &data)
stream >> threadId; stream >> threadId;
else else
threadId = 0; threadId = 0;
emit rangedEvent(Event, MaximumRangeType, AnimationFrame, time, 0, QStringList(), emit rangedEvent(Event, MaximumRangeType, AnimationFrame, time, 0, QString(),
QmlDebug::QmlEventLocation(), frameRate, animationCount, threadId,0,0); QmlDebug::QmlEventLocation(), frameRate, animationCount, threadId,0,0);
d->maximumTime = qMax(time, d->maximumTime); d->maximumTime = qMax(time, d->maximumTime);
} else if (event == StartTrace) { } else if (event == StartTrace) {
@@ -199,7 +199,7 @@ void QmlProfilerTraceClient::messageReceived(const QByteArray &data)
while (count<5) while (count<5)
params[count++] = 0; params[count++] = 0;
emit rangedEvent(SceneGraphFrame, QmlDebug::MaximumRangeType, sgEventType,time, 0, emit rangedEvent(SceneGraphFrame, QmlDebug::MaximumRangeType, sgEventType,time, 0,
QStringList(), QmlDebug::QmlEventLocation(), params[0], params[1], QString(), QmlDebug::QmlEventLocation(), params[0], params[1],
params[2], params[3], params[4]); params[2], params[3], params[4]);
} else if (messageType == PixmapCacheEvent) { } else if (messageType == PixmapCacheEvent) {
int pixEvTy, width = 0, height = 0, refcount = 0; int pixEvTy, width = 0, height = 0, refcount = 0;
@@ -212,7 +212,7 @@ void QmlProfilerTraceClient::messageReceived(const QByteArray &data)
refcount = 1; refcount = 1;
} }
emit rangedEvent(QmlDebug::PixmapCacheEvent, QmlDebug::MaximumRangeType, pixEvTy, time, 0, emit rangedEvent(QmlDebug::PixmapCacheEvent, QmlDebug::MaximumRangeType, pixEvTy, time, 0,
QStringList(), QmlDebug::QmlEventLocation(pixUrl,0,0), width, height, QString(), QmlDebug::QmlEventLocation(pixUrl,0,0), width, height,
refcount, 0, 0); refcount, 0, 0);
d->maximumTime = qMax(time, d->maximumTime); d->maximumTime = qMax(time, d->maximumTime);
} else if (messageType == MemoryAllocation) { } else if (messageType == MemoryAllocation) {
@@ -220,7 +220,7 @@ void QmlProfilerTraceClient::messageReceived(const QByteArray &data)
qint64 delta; qint64 delta;
stream >> type >> delta; stream >> type >> delta;
emit rangedEvent(QmlDebug::MemoryAllocation, QmlDebug::MaximumRangeType, type, time, 0, emit rangedEvent(QmlDebug::MemoryAllocation, QmlDebug::MaximumRangeType, type, time, 0,
QStringList(), QmlDebug::QmlEventLocation(), delta, 0, 0, 0, 0); QString(), QmlDebug::QmlEventLocation(), delta, 0, 0, 0, 0);
d->maximumTime = qMax(time, d->maximumTime); d->maximumTime = qMax(time, d->maximumTime);
} else { } else {
int range; int range;
@@ -252,8 +252,8 @@ void QmlProfilerTraceClient::messageReceived(const QByteArray &data)
int count = d->rangeCount[range]; int count = d->rangeCount[range];
if (count > 0) { if (count > 0) {
while (d->rangeDatas[range].count() < count) while (d->rangeDatas[range].count() < count)
d->rangeDatas[range].push(QStringList()); d->rangeDatas[range].push(QString());
d->rangeDatas[range][count-1] << data; d->rangeDatas[range][count-1] = data;
} }
} else if (messageType == RangeLocation) { } else if (messageType == RangeLocation) {
@@ -274,7 +274,7 @@ void QmlProfilerTraceClient::messageReceived(const QByteArray &data)
d->inProgressRanges &= ~(static_cast<qint64>(1) << range); d->inProgressRanges &= ~(static_cast<qint64>(1) << range);
d->maximumTime = qMax(time, d->maximumTime); d->maximumTime = qMax(time, d->maximumTime);
QStringList data = d->rangeDatas[range].count() ? d->rangeDatas[range].pop() : QStringList(); QString data = d->rangeDatas[range].count() ? d->rangeDatas[range].pop() : QString();
QmlEventLocation location = d->rangeLocations[range].count() ? d->rangeLocations[range].pop() : QmlEventLocation(); QmlEventLocation location = d->rangeLocations[range].count() ? d->rangeLocations[range].pop() : QmlEventLocation();
qint64 startTime = d->rangeStartTimes[range].pop(); qint64 startTime = d->rangeStartTimes[range].pop();

2
src/libs/qmldebug/qmlprofilertraceclient.h
View File

@@ -68,7 +68,7 @@ signals:
void traceFinished( qint64 time ); void traceFinished( qint64 time );
void traceStarted( qint64 time ); void traceStarted( qint64 time );
void rangedEvent(QmlDebug::Message, QmlDebug::RangeType, int detailType, qint64 startTime, void rangedEvent(QmlDebug::Message, QmlDebug::RangeType, int detailType, qint64 startTime,
qint64 length, const QStringList &data, qint64 length, const QString &data,
const QmlDebug::QmlEventLocation &location, qint64 param1, qint64 param2, const QmlDebug::QmlEventLocation &location, qint64 param1, qint64 param2,
qint64 param3, qint64 param4, qint64 param5); qint64 param3, qint64 param4, qint64 param5);
void recordingChanged(bool arg); void recordingChanged(bool arg);

4
src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
View File

@@ -176,11 +176,11 @@ void QmlProfilerClientManager::connectClientSignals()
this, SLOT(qmlComplete(qint64))); this, SLOT(qmlComplete(qint64)));
connect(d->qmlclientplugin.data(), connect(d->qmlclientplugin.data(),
SIGNAL(rangedEvent(QmlDebug::Message,QmlDebug::RangeType,int,qint64,qint64, SIGNAL(rangedEvent(QmlDebug::Message,QmlDebug::RangeType,int,qint64,qint64,
QStringList,QmlDebug::QmlEventLocation,qint64,qint64,qint64, QString,QmlDebug::QmlEventLocation,qint64,qint64,qint64,
qint64,qint64)), qint64,qint64)),
d->modelManager, d->modelManager,
SLOT(addQmlEvent(QmlDebug::Message,QmlDebug::RangeType,int,qint64,qint64, SLOT(addQmlEvent(QmlDebug::Message,QmlDebug::RangeType,int,qint64,qint64,
QStringList,QmlDebug::QmlEventLocation,qint64,qint64,qint64,qint64, QString,QmlDebug::QmlEventLocation,qint64,qint64,qint64,qint64,
qint64))); qint64)));
connect(d->qmlclientplugin.data(), SIGNAL(traceFinished(qint64)), connect(d->qmlclientplugin.data(), SIGNAL(traceFinished(qint64)),
d->modelManager->traceTime(), SLOT(setEndTime(qint64))); d->modelManager->traceTime(), SLOT(setEndTime(qint64)));

9
src/plugins/qmlprofiler/qmlprofilerdatamodel.cpp
View File

@@ -88,7 +88,8 @@ QString getInitialDetails(const QmlProfilerDataModel::QmlEventData &event)
if (event.data.isEmpty()) if (event.data.isEmpty())
details = QmlProfilerDataModel::tr("Source code not available."); details = QmlProfilerDataModel::tr("Source code not available.");
else { else {
details = event.data.join(QLatin1String(" ")).replace(QLatin1Char('\n'),QLatin1Char(' ')).simplified(); details = event.data;
details.replace(QLatin1Char('\n'),QLatin1Char(' ')).simplified();
if (details.isEmpty()) { if (details.isEmpty()) {
details = QmlProfilerDataModel::tr("anonymous function"); details = QmlProfilerDataModel::tr("anonymous function");
} else { } else {
@@ -163,7 +164,7 @@ void QmlProfilerDataModel::complete()
QmlEventData *event = &d->eventList[i]; QmlEventData *event = &d->eventList[i];
event->location = getLocation(*event); event->location = getLocation(*event);
event->displayName = getDisplayName(*event); event->displayName = getDisplayName(*event);
event->data = QStringList() << getInitialDetails(*event); event->data = getInitialDetails(*event);
// //
// request further details from files // request further details from files
@@ -191,7 +192,7 @@ void QmlProfilerDataModel::complete()
void QmlProfilerDataModel::addQmlEvent(QmlDebug::Message message, QmlDebug::RangeType rangeType, void QmlProfilerDataModel::addQmlEvent(QmlDebug::Message message, QmlDebug::RangeType rangeType,
int detailType, qint64 startTime, int detailType, qint64 startTime,
qint64 duration, const QStringList &data, qint64 duration, const QString &data,
const QmlDebug::QmlEventLocation &location, const QmlDebug::QmlEventLocation &location,
qint64 ndata1, qint64 ndata2, qint64 ndata3, qint64 ndata1, qint64 ndata2, qint64 ndata3,
qint64 ndata4, qint64 ndata5) qint64 ndata4, qint64 ndata5)
@@ -239,7 +240,7 @@ void QmlProfilerDataModel::detailsChanged(int requestId, const QString &newStrin
QTC_ASSERT(requestId < d->eventList.count(), return); QTC_ASSERT(requestId < d->eventList.count(), return);
QmlEventData *event = &d->eventList[requestId]; QmlEventData *event = &d->eventList[requestId];
event->data = QStringList(newString); event->data = newString;
} }
} }

4
src/plugins/qmlprofiler/qmlprofilerdatamodel.h
View File

@@ -46,7 +46,7 @@ public:
int detailType; // can be EventType, BindingType, PixmapEventType or SceneGraphFrameType int detailType; // can be EventType, BindingType, PixmapEventType or SceneGraphFrameType
qint64 startTime; qint64 startTime;
qint64 duration; qint64 duration;
QStringList data; QString data;
QmlDebug::QmlEventLocation location; QmlDebug::QmlEventLocation location;
qint64 numericData1; qint64 numericData1;
qint64 numericData2; qint64 numericData2;
@@ -63,7 +63,7 @@ public:
virtual bool isEmpty() const; virtual bool isEmpty() const;
virtual void complete(); virtual void complete();
void addQmlEvent(QmlDebug::Message message, QmlDebug::RangeType rangeType, int bindingType, void addQmlEvent(QmlDebug::Message message, QmlDebug::RangeType rangeType, int bindingType,
qint64 startTime, qint64 duration, const QStringList &data, qint64 startTime, qint64 duration, const QString &data,
const QmlDebug::QmlEventLocation &location, qint64 ndata1, qint64 ndata2, const QmlDebug::QmlEventLocation &location, qint64 ndata1, qint64 ndata2,
qint64 ndata3, qint64 ndata4, qint64 ndata5); qint64 ndata3, qint64 ndata4, qint64 ndata5);
static QString getHashString(const QmlProfilerDataModel::QmlEventData &event); static QString getHashString(const QmlProfilerDataModel::QmlEventData &event);

8
src/plugins/qmlprofiler/qmlprofilereventsmodelproxy.cpp
View File

@@ -159,7 +159,7 @@ void QmlProfilerEventsModelProxy::loadData(qint64 rangeStart, qint64 rangeEnd)
QmlEventStats stats = { QmlEventStats stats = {
event->displayName, event->displayName,
hash, hash,
event->data.join(QLatin1String(" ")), event->data,
event->location, event->location,
event->message, event->message,
event->rangeType, event->rangeType,
@@ -354,7 +354,7 @@ void QmlProfilerEventParentsModelProxy::loadData()
0, 0,
0, 0,
0, 0,
QStringList() << tr("Main Program"), tr("Main Program"),
QmlDebug::QmlEventLocation(rootEventName, 0, 0), QmlDebug::QmlEventLocation(rootEventName, 0, 0),
0,0,0,0,0 // numericData fields 0,0,0,0,0 // numericData fields
}; };
@@ -413,7 +413,7 @@ void QmlProfilerEventParentsModelProxy::loadData()
parent->rangeType = parentEvent->rangeType; parent->rangeType = parentEvent->rangeType;
parent->duration = event.duration; parent->duration = event.duration;
parent->calls = 1; parent->calls = 1;
parent->details = parentEvent->data.join(QLatin1String("")); parent->details = parentEvent->data;
parent->isBindingLoop = eventsInBindingLoop.contains(parentHash); parent->isBindingLoop = eventsInBindingLoop.contains(parentHash);
} }
@@ -486,7 +486,7 @@ void QmlProfilerEventChildrenModelProxy::loadData()
child->rangeType = event.rangeType; child->rangeType = event.rangeType;
child->duration = event.duration; child->duration = event.duration;
child->calls = 1; child->calls = 1;
child->details = event.data.join(QLatin1String("")); child->details = event.data;
child->isBindingLoop = eventsInBindingLoop.contains(parentHash); child->isBindingLoop = eventsInBindingLoop.contains(parentHash);
} }

6
src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp
View File

@@ -254,7 +254,7 @@ void QmlProfilerModelManager::addQmlEvent(QmlDebug::Message message,
int detailType, int detailType,
qint64 startTime, qint64 startTime,
qint64 length, qint64 length,
const QStringList &data, const QString &data,
const QmlDebug::QmlEventLocation &location, const QmlDebug::QmlEventLocation &location,
qint64 ndata1, qint64 ndata1,
qint64 ndata2, qint64 ndata2,
@@ -356,10 +356,10 @@ void QmlProfilerModelManager::load()
QmlProfilerFileReader reader; QmlProfilerFileReader reader;
connect(&reader, SIGNAL(error(QString)), this, SIGNAL(error(QString))); connect(&reader, SIGNAL(error(QString)), this, SIGNAL(error(QString)));
connect(&reader, SIGNAL(rangedEvent(QmlDebug::Message,QmlDebug::RangeType,int,qint64,qint64, connect(&reader, SIGNAL(rangedEvent(QmlDebug::Message,QmlDebug::RangeType,int,qint64,qint64,
QStringList,QmlDebug::QmlEventLocation, QString,QmlDebug::QmlEventLocation,
qint64, qint64, qint64, qint64, qint64)), qint64, qint64, qint64, qint64, qint64)),
this, SLOT(addQmlEvent(QmlDebug::Message,QmlDebug::RangeType,int,qint64,qint64, this, SLOT(addQmlEvent(QmlDebug::Message,QmlDebug::RangeType,int,qint64,qint64,
QStringList,QmlDebug::QmlEventLocation, QString,QmlDebug::QmlEventLocation,
qint64, qint64, qint64, qint64, qint64))); qint64, qint64, qint64, qint64, qint64)));
connect(&reader, SIGNAL(traceStartTime(qint64)), traceTime(), SLOT(setStartTime(qint64))); connect(&reader, SIGNAL(traceStartTime(qint64)), traceTime(), SLOT(setStartTime(qint64)));
connect(&reader, SIGNAL(traceEndTime(qint64)), traceTime(), SLOT(setEndTime(qint64))); connect(&reader, SIGNAL(traceEndTime(qint64)), traceTime(), SLOT(setEndTime(qint64)));

2
src/plugins/qmlprofiler/qmlprofilermodelmanager.h
View File

@@ -140,7 +140,7 @@ public slots:
void prepareForWriting(); void prepareForWriting();
void addQmlEvent(QmlDebug::Message message, QmlDebug::RangeType rangeType, int bindingType, void addQmlEvent(QmlDebug::Message message, QmlDebug::RangeType rangeType, int bindingType,
qint64 startTime, qint64 length, const QStringList &data, qint64 startTime, qint64 length, const QString &data,
const QmlDebug::QmlEventLocation &location, const QmlDebug::QmlEventLocation &location,
qint64 ndata1, qint64 ndata2, qint64 ndata3, qint64 ndata4, qint64 ndata5); qint64 ndata1, qint64 ndata2, qint64 ndata3, qint64 ndata4, qint64 ndata5);
void addV8Event(int depth, const QString &function,const QString &filename, int lineNumber, void addV8Event(int depth, const QString &function,const QString &filename, int lineNumber,

2
src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp
View File

@@ -117,7 +117,7 @@ void RangeTimelineModel::loadData()
if (i == eventIdsByHash.cend()) { if (i == eventIdsByHash.cend()) {
QmlRangeEventData rangeEventData = { QmlRangeEventData rangeEventData = {
event.displayName, event.displayName,
event.data.join(QLatin1String(" ")), event.data,
event.location, event.location,
lastEventId++ // event id lastEventId++ // event id
}; };

4
src/plugins/qmlprofiler/qmlprofilertracefile.cpp
View File

@@ -388,7 +388,7 @@ void QmlProfilerFileReader::processQmlEvents()
QmlEvent &event = m_qmlEvents[eventIndex]; QmlEvent &event = m_qmlEvents[eventIndex];
emit rangedEvent(event.message, event.rangeType, event.detailType, range.startTime, emit rangedEvent(event.message, event.rangeType, event.detailType, range.startTime,
range.duration, QStringList(event.details), range.duration, event.details,
QmlEventLocation(event.filename, event.line, event.column), QmlEventLocation(event.filename, event.line, event.column),
range.numericData1,range.numericData2, range.numericData3, range.numericData1,range.numericData2, range.numericData3,
range.numericData4, range.numericData5); range.numericData4, range.numericData5);
@@ -428,7 +428,7 @@ void QmlProfilerFileWriter::setQmlEvents(const QVector<QmlProfilerDataModel::Qml
QmlEvent e = { QmlEvent e = {
event.displayName, event.displayName,
event.location.filename, event.location.filename,
event.data.join(_("")), event.data,
event.message, event.message,
event.rangeType, event.rangeType,
event.detailType, event.detailType,

2
src/plugins/qmlprofiler/qmlprofilertracefile.h
View File

@@ -87,7 +87,7 @@ signals:
void traceEndTime(qint64 traceStartTime); void traceEndTime(qint64 traceStartTime);
void rangedEvent(QmlDebug::Message message, QmlDebug::RangeType rangeType, int detailType, void rangedEvent(QmlDebug::Message message, QmlDebug::RangeType rangeType, int detailType,
qint64 startTime, qint64 length, const QStringList &data, qint64 startTime, qint64 length, const QString &data,
const QmlDebug::QmlEventLocation &location, const QmlDebug::QmlEventLocation &location,
qint64 param1, qint64 param2, qint64 param3, qint64 param4, qint64 param5); qint64 param1, qint64 param2, qint64 param3, qint64 param4, qint64 param5);
void error(const QString &error); void error(const QString &error);