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

QmlProfiler: manage server-side start tracing message

Browse Source 
also
QmlProfiler: refactor eventlist state

If unexpected data is received, assuming server stopped profiling.
Also, introducing a eventlist state instead of relying on
signals sent around.  This is part of a coming bigger patch
where the profiler client is refactored.

Change-Id: Ibed9007903956daf03cc0fcb90f77b5ad2d3cf90
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
This commit is contained in:
Christiaan Janssen
2012-02-13 15:26:57 +01:00
parent de100a4add
commit 585e651310
15 changed files with 246 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/qmlprofiler/qml/Label.qml
View File

@@ -81,12 +81,18 @@ Item {
Connections {
target: qmlEventList
onReloadDetailLabels: getDescriptions();
onDataReady: getDescriptions();
onDataClear: {
descriptions = [];
eventIds = [];
extdescriptions = [];
updateHeight();
onStateChanged: {
// Empty
if (qmlEventList.getCurrentStateFromQml() == 0) {
descriptions = [];
eventIds = [];
extdescriptions = [];
updateHeight();
} else
// Done
if (qmlEventList.getCurrentStateFromQml() == 3) {
getDescriptions();
}
}
}

28
src/plugins/qmlprofiler/qml/MainView.qml
View File

@@ -111,23 +111,29 @@ Rectangle {
root.progress = 0;
}
}
onProcessingData: {
root.dataAvailable = false;
}
onPostProcessing: {
root.progress = 0.9; // jump to 90%
}
onDataReady: {
if (eventCount > 0) {
onStateChanged: {
switch (qmlEventList.getCurrentStateFromQml()) {
case 0: {
root.clearAll();
break;
}
case 1: {
root.dataAvailable = false;
break;
}
case 2: {
root.progress = 0.9; // jump to 90%
break;
}
case 3: {
view.clearData();
progress = 1.0;
dataAvailable = true;
view.visible = true;
view.requestPaint();
zoomControl.setRange(qmlEventList.traceStartTime(), qmlEventList.traceStartTime() + qmlEventList.traceDuration()/10);
break;
}
}
}
}

5
src/plugins/qmlprofiler/qml/Overview.qml
View File

@@ -77,8 +77,9 @@ Canvas2D {
Connections {
target: qmlEventList
onDataReady: {
if (qmlEventList.count() > 0) {
onStateChanged: {
// State is "done"
if (qmlEventList.getCurrentStateFromQml() == 3) {
dataAvailable = true;
requestRedraw();
}

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

@@ -217,15 +217,15 @@ bool QmlProfilerEngine::start()
void QmlProfilerEngine::stop()
{
// keep the flag for the next restart
d->m_fetchDataFromStart = d->m_fetchingData;
if (d->m_fetchingData) {
if (d->m_running)
d->m_delayedDelete = true;
// will result in dataReceived() call
emit stopRecording();
d->m_fetchDataFromStart = true;
} else {
finishProcess();
d->m_fetchDataFromStart = false;
}
}
@@ -242,8 +242,9 @@ void QmlProfilerEngine::stopped()
d->m_running = false;
d->m_runningTimer.stop();
AnalyzerManager::stopTool(); // FIXME: Needed?
AnalyzerManager::stopTool();
emit finished();
emit recordingChanged(d->m_fetchDataFromStart);
}
void QmlProfilerEngine::setFetchingData(bool b)
@@ -269,6 +270,7 @@ void QmlProfilerEngine::finishProcess()
if (d->m_runner)
d->m_runner->stop();
emit finished();
emit recordingChanged(d->m_fetchDataFromStart);
}
}
@@ -299,6 +301,7 @@ void QmlProfilerEngine::wrongSetupMessageBox(const QString &errorMessage)
d->m_runningTimer.stop();
AnalyzerManager::stopTool();
emit finished();
emit recordingChanged(d->m_fetchDataFromStart);
}
void QmlProfilerEngine::wrongSetupMessageBoxFinished(int button)

1
src/plugins/qmlprofiler/qmlprofilerengine.h
View File

@@ -54,6 +54,7 @@ signals:
void processRunning(int port);
void stopRecording();
void timeUpdate();
void recordingChanged(bool recording);
public slots:
bool start();

27
src/plugins/qmlprofiler/qmlprofilereventview.cpp
View File

@@ -123,9 +123,9 @@ QmlProfilerEventsWidget::QmlProfilerEventsWidget(QmlJsDebugClient::QmlProfilerEv
groupLayout->addWidget(splitterVertical);
setLayout(groupLayout);
m_eventStatistics = model;
if (model) {
connect(model,SIGNAL(dataReady()),m_eventChildren,SLOT(clear()));
connect(model,SIGNAL(dataReady()),m_eventParents,SLOT(clear()));
connect(model, SIGNAL(stateChanged()), this, SLOT(eventListStateChanged()));
}
m_globalStatsEnabled = true;
@@ -135,6 +135,16 @@ QmlProfilerEventsWidget::~QmlProfilerEventsWidget()
{
}
void QmlProfilerEventsWidget::eventListStateChanged()
{
if (m_eventStatistics) {
QmlProfilerEventList::State newState = m_eventStatistics->currentState();
if (newState == QmlProfilerEventList::Empty) {
clear();
}
}
}
void QmlProfilerEventsWidget::switchToV8View()
{
setObjectName("QmlProfilerV8ProfileView");
@@ -278,16 +288,25 @@ QmlProfilerEventsMainView::~QmlProfilerEventsMainView()
void QmlProfilerEventsMainView::setEventStatisticsModel( QmlProfilerEventList *model )
{
if (d->m_eventStatistics) {
disconnect(d->m_eventStatistics,SIGNAL(dataReady()),this,SLOT(buildModel()));
disconnect(d->m_eventStatistics,SIGNAL(stateChanged()),this,SLOT(eventListStateChanged()));
disconnect(d->m_eventStatistics,SIGNAL(detailsChanged(int,QString)),this,SLOT(changeDetailsForEvent(int,QString)));
}
d->m_eventStatistics = model;
if (model) {
connect(d->m_eventStatistics,SIGNAL(dataReady()),this,SLOT(buildModel()));
connect(d->m_eventStatistics,SIGNAL(stateChanged()),this,SLOT(eventListStateChanged()));
connect(d->m_eventStatistics,SIGNAL(detailsChanged(int,QString)),this,SLOT(changeDetailsForEvent(int,QString)));
}
}
void QmlProfilerEventsMainView::eventListStateChanged()
{
if (d->m_eventStatistics) {
QmlProfilerEventList::State newState = d->m_eventStatistics->currentState();
if (newState == QmlProfilerEventList::Done)
buildModel();
}
}
void QmlProfilerEventsMainView::setFieldViewable(Fields field, bool show)
{
if (field < MaxFields) {

5
src/plugins/qmlprofiler/qmlprofilereventview.h
View File

@@ -84,6 +84,9 @@ public slots:
void updateSelectedEvent(int eventId) const;
void selectBySourceLocation(const QString &filename, int line, int column);
private slots:
void eventListStateChanged();
protected:
void contextMenuEvent(QContextMenuEvent *ev);
@@ -91,6 +94,7 @@ private:
QmlProfilerEventsMainView *m_eventTree;
QmlProfilerEventsParentsAndChildrenView *m_eventChildren;
QmlProfilerEventsParentsAndChildrenView *m_eventParents;
QmlJsDebugClient::QmlProfilerEventList *m_eventStatistics;
bool m_globalStatsEnabled;
};
@@ -153,6 +157,7 @@ signals:
void showEventInTimeline(int eventId);
public slots:
void eventListStateChanged();
void clear();
void jumpToItem(const QModelIndex &index);
void selectEvent(int eventId);

38
src/plugins/qmlprofiler/qmlprofilertool.cpp
View File

@@ -368,6 +368,7 @@ IAnalyzerEngine *QmlProfilerTool::createEngine(const AnalyzerStartParameters &sp
connect(engine, SIGNAL(finished()), this, SLOT(disconnectClient()));
connect(engine, SIGNAL(finished()), this, SLOT(updateTimers()));
connect(engine, SIGNAL(stopRecording()), this, SLOT(stopRecording()));
connect(engine, SIGNAL(recordingChanged(bool)), this, SLOT(setRecording(bool)));
connect(engine, SIGNAL(timeUpdate()), this, SLOT(updateTimers()));
connect(d->m_traceWindow, SIGNAL(viewUpdated()), engine, SLOT(dataReceived()));
connect(this, SIGNAL(connectionFailed()), engine, SLOT(finishProcess()));
@@ -456,9 +457,9 @@ QWidget *QmlProfilerTool::createWidgets()
connect(d->m_traceWindow, SIGNAL(gotoSourceLocation(QString,int,int)),this, SLOT(gotoSourceLocation(QString,int,int)));
connect(d->m_traceWindow, SIGNAL(contextMenuRequested(QPoint)), this, SLOT(showContextMenu(QPoint)));
connect(d->m_traceWindow->getEventList(), SIGNAL(error(QString)), this, SLOT(showErrorDialog(QString)));
connect(d->m_traceWindow->getEventList(), SIGNAL(dataReady()), this, SLOT(showSaveOption()));
connect(d->m_traceWindow->getEventList(), SIGNAL(dataReady()), this, SLOT(updateTimers()));
connect(d->m_traceWindow->getEventList(), SIGNAL(stateChanged()), this, SLOT(eventListStateChanged()));
connect(d->m_traceWindow, SIGNAL(profilerStateChanged(bool,bool)), this, SLOT(profilerStateChanged(bool,bool)));
connect(d->m_traceWindow, SIGNAL(recordingChanged(bool)), this, SLOT(setRecording(bool)));
d->m_eventsView = new QmlProfilerEventsWidget(d->m_traceWindow->getEventList(), mw);
connect(d->m_eventsView, SIGNAL(gotoSourceLocation(QString,int,int)), this, SLOT(gotoSourceLocation(QString,int,int)));
@@ -500,11 +501,11 @@ QWidget *QmlProfilerTool::createWidgets()
layout->setSpacing(0);
d->m_recordButton = new QToolButton(toolbarWidget);
// icon and tooltip set in setRecording(), called later
d->m_recordButton->setCheckable(true);
connect(d->m_recordButton,SIGNAL(toggled(bool)), this, SLOT(setRecording(bool)));
connect(d->m_recordButton,SIGNAL(clicked(bool)), this, SLOT(recordingButtonChanged(bool)));
d->m_recordButton->setChecked(true);
setRecording(d->m_recordingEnabled);
layout->addWidget(d->m_recordButton);
d->m_clearButton = new QToolButton(toolbarWidget);
@@ -583,20 +584,25 @@ void QmlProfilerTool::stopRecording()
emit cancelRun();
}
void QmlProfilerTool::setRecording(bool recording)
void QmlProfilerTool::recordingButtonChanged(bool recording)
{
d->m_recordingEnabled = recording;
// update record button
d->m_recordButton->setToolTip( d->m_recordingEnabled ? tr("Disable profiling") : tr("Enable profiling"));
d->m_recordButton->setIcon(QIcon(d->m_recordingEnabled ? QLatin1String(":/qmlprofiler/recordOn.png") :
QLatin1String(":/qmlprofiler/recordOff.png")));
if (recording)
startRecording();
else
stopRecording();
setRecording(recording);
}
void QmlProfilerTool::setRecording(bool recording)
{
// update record button
d->m_recordingEnabled = recording;
d->m_recordButton->setToolTip( recording ? tr("Disable profiling") : tr("Enable profiling"));
d->m_recordButton->setIcon(QIcon(recording ? QLatin1String(":/qmlprofiler/recordOn.png") :
QLatin1String(":/qmlprofiler/recordOff.png")));
d->m_recordButton->setChecked(recording);
updateTimers();
}
@@ -886,3 +892,11 @@ void QmlProfilerTool::retryMessageBoxFinished(int result)
}
}
}
void QmlProfilerTool::eventListStateChanged()
{
if (d->m_traceWindow->getEventList()->currentState() == QmlProfilerEventList::Done) {
showSaveOption();
updateTimers();
}
}

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

@@ -78,6 +78,7 @@ public slots:
void startRecording();
void stopRecording();
void recordingButtonChanged(bool recording);
void setRecording(bool recording);
void setAppIsRunning();
@@ -106,6 +107,7 @@ private slots:
void showLoadDialog();
void showErrorDialog(const QString &error);
void retryMessageBoxFinished(int result);
void eventListStateChanged();
private:
void connectToClient();

64
src/plugins/qmlprofiler/tracewindow.cpp
View File

@@ -138,7 +138,7 @@ TraceWindow::TraceWindow(QWidget *parent)
connect(this, SIGNAL(traceFinished(qint64)), m_eventList, SLOT(setTraceEndTime(qint64)));
connect(this, SIGNAL(traceStarted(qint64)), m_eventList, SLOT(setTraceStartTime(qint64)));
connect(this, SIGNAL(frameEvent(qint64,int,int)), m_eventList, SLOT(addFrameEvent(qint64,int,int)));
connect(this,SIGNAL(viewUpdated()), m_eventList, SLOT(complete()));
connect(m_eventList, SIGNAL(stateChanged()), this, SLOT(eventListStateChanged()));
m_mainView->rootContext()->setContextProperty("qmlEventList", m_eventList);
m_overview->rootContext()->setContextProperty("qmlEventList", m_eventList);
@@ -319,10 +319,11 @@ void TraceWindow::connectClientSignals()
connect(m_plugin.data(), SIGNAL(range(int,qint64,qint64,QStringList,QmlJsDebugClient::QmlEventLocation)),
this, SIGNAL(range(int,qint64,qint64,QStringList,QmlJsDebugClient::QmlEventLocation)));
connect(m_plugin.data(), SIGNAL(traceFinished(qint64)), this, SIGNAL(traceFinished(qint64)));
connect(m_plugin.data(), SIGNAL(traceStarted(qint64)), this, SIGNAL(traceStarted(qint64)));
connect(m_plugin.data(), SIGNAL(traceStarted(qint64)), this, SLOT(manageTraceStart(qint64)));
connect(m_plugin.data(), SIGNAL(frame(qint64,int,int)), this, SIGNAL(frameEvent(qint64,int,int)));
connect(m_plugin.data(), SIGNAL(enabledChanged()), this, SLOT(updateProfilerState()));
connect(m_plugin.data(), SIGNAL(enabledChanged()), m_plugin.data(), SLOT(sendRecordingStatus()));
connect(m_plugin.data(), SIGNAL(recordingChanged(bool)), this, SIGNAL(recordingChanged(bool)));
}
if (m_v8plugin) {
connect(m_v8plugin.data(), SIGNAL(complete()), this, SLOT(v8Complete()));
@@ -339,9 +340,10 @@ void TraceWindow::disconnectClientSignals()
disconnect(m_plugin.data(), SIGNAL(range(int,qint64,qint64,QStringList,QmlJsDebugClient::QmlEventLocation)),
this, SIGNAL(range(int,qint64,qint64,QStringList,QmlJsDebugClient::QmlEventLocation)));
disconnect(m_plugin.data(), SIGNAL(traceFinished(qint64)), this, SIGNAL(traceFinished(qint64)));
disconnect(m_plugin.data(), SIGNAL(traceStarted(qint64)), this, SIGNAL(traceStarted(qint64)));
disconnect(m_plugin.data(), SIGNAL(traceStarted(qint64)), this, SLOT(manageTraceStart(qint64)));
disconnect(m_plugin.data(), SIGNAL(enabledChanged()), this, SLOT(updateProfilerState()));
disconnect(m_plugin.data(), SIGNAL(enabledChanged()), m_plugin.data(), SLOT(sendRecordingStatus()));
disconnect(m_plugin.data(), SIGNAL(recordingChanged(bool)), this, SIGNAL(recordingChanged(bool)));
}
if (m_v8plugin) {
disconnect(m_v8plugin.data(), SIGNAL(complete()), this, SLOT(v8Complete()));
@@ -378,6 +380,15 @@ void TraceWindow::updateTimer()
m_profiledTime = m_mainView->rootObject()->property("elapsedTime").toDouble();
}
void TraceWindow::correctTimer()
{
// once the data is post-processed, use the eventlist time instead of the qml timer
m_profiledTime = (m_eventList->traceEndTime() - m_eventList->traceStartTime()) / 1.0e9;
if (m_profiledTime < 0)
m_profiledTime = 0;
emit viewUpdated();
}
double TraceWindow::profiledTime() const
{
return m_profiledTime;
@@ -463,11 +474,11 @@ bool TraceWindow::isRecording() const
void TraceWindow::qmlComplete()
{
m_qmlDataReady = true;
if (!m_v8plugin || m_v8plugin.data()->status() != QDeclarativeDebugClient::Enabled || m_v8DataReady) {
emit viewUpdated();
// once complete is sent, reset the flag
m_eventList->complete();
// once complete is sent, reset the flags
m_qmlDataReady = false;
m_v8DataReady = false;
}
}
@@ -475,9 +486,10 @@ void TraceWindow::v8Complete()
{
m_v8DataReady = true;
if (!m_plugin || m_plugin.data()->status() != QDeclarativeDebugClient::Enabled || m_qmlDataReady) {
emit viewUpdated();
// once complete is sent, reset the flag
m_eventList->complete();
// once complete is sent, reset the flags
m_v8DataReady = false;
m_qmlDataReady = false;
}
}
@@ -591,5 +603,41 @@ void TraceWindow::updateVerticalScroll(int newPosition)
m_mainView->verticalScrollBar()->setValue(newPosition);
}
void TraceWindow::eventListStateChanged()
{
switch (m_eventList->currentState()) {
case QmlProfilerEventList::Empty :
clearDisplay();
break;
case QmlProfilerEventList::AcquiringData :
firstDataReceived();
break;
case QmlProfilerEventList::ProcessingData :
// nothing to be done
break;
case QmlProfilerEventList::Done :
correctTimer();
break;
default:
break;
}
}
void TraceWindow::manageTraceStart(qint64 traceStart)
{
// new trace started
clearDisplay();
emit traceStarted(traceStart);
}
void TraceWindow::firstDataReceived()
{
if (m_plugin && m_plugin.data()->isRecording()) {
// serverside recording disabled
m_plugin.data()->setRecordingFromServer(false);
}
}
} // namespace Internal
} // namespace QmlProfiler

11
src/plugins/qmlprofiler/tracewindow.h
View File

@@ -110,9 +110,12 @@ public:
double profiledTime() const;
public slots:
void clearDisplay();
void selectNextEvent(int eventId);
private slots:
void updateCursorPosition();
void updateTimer();
void clearDisplay();
void updateToolbar();
void toggleRangeMode(bool);
void toggleLockMode(bool);
@@ -124,10 +127,13 @@ public slots:
void qmlComplete();
void v8Complete();
void selectNextEvent(int eventId);
void updateProfilerState();
void updateToolTip(const QString &text);
void updateVerticalScroll(int newPosition);
void eventListStateChanged();
void manageTraceStart(qint64 traceStart);
void firstDataReceived();
void correctTimer();
signals:
void viewUpdated();
@@ -139,6 +145,7 @@ signals:
void traceFinished(qint64);
void traceStarted(qint64);
void frameEvent(qint64, int, int);
void recordingChanged(bool);
void internalClearDisplay();
void jumpToPrev();