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

QmlProfiler: Rename specific replayEvents to replayQmlEvents

Browse Source 
Some compilers cannot discern the two replayEvents methods.

Change-Id: Ide4a893ff3976cb081fbbceefacafb6226f0a73f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Ulf Hermann
2018-04-19 13:10:49 +02:00
parent 6e4ae817c2
commit 08ca10de81
6 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qmlprofiler/flamegraphmodel.cpp
View File

@@ -165,12 +165,12 @@ void FlameGraphModel::restrictToFeatures(quint64 visibleFeatures)
clear(); clear();
QFutureInterface<void> future; QFutureInterface<void> future;
m_modelManager->replayEvents(m_modelManager->traceStart(), m_modelManager->traceEnd(), m_modelManager->replayQmlEvents(m_modelManager->traceStart(), m_modelManager->traceEnd(),
std::bind(&FlameGraphModel::loadEvent, this, std::bind(&FlameGraphModel::loadEvent, this,
std::placeholders::_1, std::placeholders::_2), std::placeholders::_1, std::placeholders::_2),
std::bind(&FlameGraphModel::beginResetModel, this), std::bind(&FlameGraphModel::beginResetModel, this),
std::bind(&FlameGraphModel::finalize, this), std::bind(&FlameGraphModel::finalize, this),
[this](const QString &message) { [this](const QString &message) {
emit m_modelManager->error(tr("Could not re-read events from temporary trace file: %1") emit m_modelManager->error(tr("Could not re-read events from temporary trace file: %1")
.arg(message)); .arg(message));
endResetModel(); endResetModel();

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

@@ -149,8 +149,8 @@ void QmlProfilerModelManager::replayEvents(qint64 rangeStart, qint64 rangeEnd,
Finalizer finalizer, ErrorHandler errorHandler, Finalizer finalizer, ErrorHandler errorHandler,
QFutureInterface<void> &future) const QFutureInterface<void> &future) const
{ {
replayEvents(rangeStart, rangeEnd, static_cast<QmlEventLoader>(loader), initializer, finalizer, replayQmlEvents(rangeStart, rangeEnd, static_cast<QmlEventLoader>(loader), initializer,
errorHandler, future); finalizer, errorHandler, future);
} }
static bool isStateful(const QmlEventType &type) static bool isStateful(const QmlEventType &type)
@@ -162,10 +162,10 @@ static bool isStateful(const QmlEventType &type)
return message == PixmapCacheEvent || message == MemoryAllocation; return message == PixmapCacheEvent || message == MemoryAllocation;
} }
void QmlProfilerModelManager::replayEvents(qint64 rangeStart, qint64 rangeEnd, void QmlProfilerModelManager::replayQmlEvents(qint64 rangeStart, qint64 rangeEnd,
QmlEventLoader loader, Initializer initializer, QmlEventLoader loader, Initializer initializer,
Finalizer finalizer, ErrorHandler errorHandler, Finalizer finalizer, ErrorHandler errorHandler,
QFutureInterface<void> &future) const QFutureInterface<void> &future) const
{ {
if (initializer) if (initializer)
initializer(); initializer();

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

@@ -64,9 +64,9 @@ public:
void addEventTypes(const QVector<QmlEventType> &types); void addEventTypes(const QVector<QmlEventType> &types);
const QmlEventType &eventType(int typeId) const; const QmlEventType &eventType(int typeId) const;
void replayEvents(qint64 rangeStart, qint64 rangeEnd, QmlEventLoader loader, void replayQmlEvents(qint64 rangeStart, qint64 rangeEnd, QmlEventLoader loader,
Initializer initializer, Finalizer finalizer, Initializer initializer, Finalizer finalizer,
ErrorHandler errorHandler, QFutureInterface<void> &future) const; ErrorHandler errorHandler, QFutureInterface<void> &future) const;
void finalize() override; void finalize() override;

10
src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.cpp
View File

@@ -101,11 +101,11 @@ void QmlProfilerStatisticsModel::restrictToFeatures(quint64 features)
clear(); clear();
QFutureInterface<void> future; QFutureInterface<void> future;
m_modelManager->replayEvents(m_modelManager->traceStart(), m_modelManager->traceEnd(), m_modelManager->replayQmlEvents(m_modelManager->traceStart(), m_modelManager->traceEnd(),
std::bind(&QmlProfilerStatisticsModel::loadEvent, this, std::bind(&QmlProfilerStatisticsModel::loadEvent, this,
std::placeholders::_1, std::placeholders::_2), std::placeholders::_1, std::placeholders::_2),
std::bind(&QmlProfilerStatisticsModel::beginResetModel, this), std::bind(&QmlProfilerStatisticsModel::beginResetModel, this),
[this]() { [this]() {
finalize(); finalize();
notesChanged(QmlProfilerStatisticsModel::s_invalidTypeId); // Reload notes notesChanged(QmlProfilerStatisticsModel::s_invalidTypeId); // Reload notes
}, [this](const QString &message) { }, [this](const QString &message) {

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

@@ -712,7 +712,7 @@ void QmlProfilerTraceFile::saveQtd(QIODevice *device)
QStack<QmlEvent> stack; QStack<QmlEvent> stack;
qint64 lastProgressTimestamp = traceStart(); qint64 lastProgressTimestamp = traceStart();
modelManager()->replayEvents(-1, -1, [&](const QmlEvent &event, const QmlEventType &type) { modelManager()->replayQmlEvents(-1, -1, [&](const QmlEvent &event, const QmlEventType &type) {
if (type.rangeType() != MaximumRangeType && event.rangeStage() == RangeStart) { if (type.rangeType() != MaximumRangeType && event.rangeStage() == RangeStart) {
stack.push(event); stack.push(event);
return; return;
@@ -858,7 +858,7 @@ void QmlProfilerTraceFile::saveQzt(QIODevice *device)
} }
qint64 lastProgressTimestamp = traceStart(); qint64 lastProgressTimestamp = traceStart();
modelManager()->replayEvents(-1, -1, [&](const QmlEvent &event, const QmlEventType &type) { modelManager()->replayQmlEvents(-1, -1, [&](const QmlEvent &event, const QmlEventType &type) {
Q_UNUSED(type); Q_UNUSED(type);
bufferStream << event; bufferStream << event;
// 32MB buffer should be plenty for efficient compression // 32MB buffer should be plenty for efficient compression

2
src/plugins/qmlprofiler/tests/qmlprofilertraceclient_test.cpp
View File

@@ -70,7 +70,7 @@ void QmlProfilerTraceClientTest::testMessageReceived()
traceClient.stateChanged(QmlDebug::QmlDebugClient::NotConnected); traceClient.stateChanged(QmlDebug::QmlDebugClient::NotConnected);
QFutureInterface<void> future; QFutureInterface<void> future;
modelManager.replayEvents(-1, -1, [&](const QmlEvent &event, const QmlEventType &type) { modelManager.replayQmlEvents(-1, -1, [&](const QmlEvent &event, const QmlEventType &type) {
qint64 timestamp; qint64 timestamp;
qint32 message; qint32 message;
qint32 rangeType; qint32 rangeType;