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

QmlProfiler: Convert to a RunWorker based setup

Browse Source 
This also re-enables the remote linux case and enables
the recording of a single run of events.

Change-Id: I9ea55017c8e5f2f17e6f32c5453df48093e41931
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2017-05-29 13:14:16 +02:00
parent 2317d06a80
commit 76185b3b09
9 changed files with 90 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp
View File

@@ -64,7 +64,7 @@ namespace QmlProfiler {
// QmlProfilerRunControlPrivate
//
class QmlProfilerRunControl::QmlProfilerRunControlPrivate
class QmlProfilerRunner::QmlProfilerRunnerPrivate
{
public:
QmlProfilerStateManager *m_profilerState = 0;
@@ -75,12 +75,12 @@ public:
// QmlProfilerRunControl
//
QmlProfilerRunControl::QmlProfilerRunControl(RunConfiguration *runConfiguration)
: RunControl(runConfiguration, ProjectExplorer::Constants::QML_PROFILER_RUN_MODE)
, d(new QmlProfilerRunControlPrivate)
QmlProfilerRunner::QmlProfilerRunner(RunControl *runControl)
: RunWorker(runControl)
, d(new QmlProfilerRunnerPrivate)
{
setIcon(ProjectExplorer::Icons::ANALYZER_START_SMALL_TOOLBAR);
setSupportsReRunning(false);
runControl->setIcon(ProjectExplorer::Icons::ANALYZER_START_SMALL_TOOLBAR);
runControl->setSupportsReRunning(false);
// Only wait 4 seconds for the 'Waiting for connection' on application output, then just try to connect
// (application output might be redirected / blocked)
@@ -91,20 +91,20 @@ QmlProfilerRunControl::QmlProfilerRunControl(RunConfiguration *runConfiguration)
});
}
QmlProfilerRunControl::~QmlProfilerRunControl()
QmlProfilerRunner::~QmlProfilerRunner()
{
if (isRunning() && d->m_profilerState)
stop();
if (runControl()->isRunning() && d->m_profilerState)
runControl()->stop();
delete d;
}
void QmlProfilerRunControl::start()
void QmlProfilerRunner::start()
{
reportApplicationStart();
runControl()->reportApplicationStart();
Internal::QmlProfilerTool::instance()->finalizeRunControl(this);
QTC_ASSERT(d->m_profilerState, reportApplicationStop(); return);
QTC_ASSERT(d->m_profilerState, runControl()->reportApplicationStop(); return);
QTC_ASSERT(connection().is<AnalyzerConnection>(), reportApplicationStop(); return);
QTC_ASSERT(connection().is<AnalyzerConnection>(), runControl()->reportApplicationStop(); return);
auto conn = connection().as<AnalyzerConnection>();
if (conn.analyzerPort.isValid())
@@ -113,10 +113,10 @@ void QmlProfilerRunControl::start()
d->m_noDebugOutputTimer.start();
d->m_profilerState->setCurrentState(QmlProfilerStateManager::AppRunning);
emit starting();
emit runControl()->starting();
}
void QmlProfilerRunControl::stop()
void QmlProfilerRunner::stop()
{
QTC_ASSERT(d->m_profilerState, return);
@@ -141,14 +141,14 @@ void QmlProfilerRunControl::stop()
}
}
void QmlProfilerRunControl::notifyRemoteFinished()
void QmlProfilerRunner::notifyRemoteFinished()
{
QTC_ASSERT(d->m_profilerState, return);
switch (d->m_profilerState->currentState()) {
case QmlProfilerStateManager::AppRunning:
d->m_profilerState->setCurrentState(QmlProfilerStateManager::AppDying);
reportApplicationStop();
runControl()->reportApplicationStop();
break;
case QmlProfilerStateManager::Idle:
break;
@@ -160,7 +160,7 @@ void QmlProfilerRunControl::notifyRemoteFinished()
}
}
void QmlProfilerRunControl::cancelProcess()
void QmlProfilerRunner::cancelProcess()
{
QTC_ASSERT(d->m_profilerState, return);
@@ -177,10 +177,10 @@ void QmlProfilerRunControl::cancelProcess()
return;
}
}
reportApplicationStop();
runControl()->reportApplicationStop();
}
void QmlProfilerRunControl::notifyRemoteSetupFailed(const QString &errorMessage)
void QmlProfilerRunner::notifyRemoteSetupFailed(const QString &errorMessage)
{
QMessageBox *infoBox = new QMessageBox(ICore::mainWindow());
infoBox->setIcon(QMessageBox::Critical);
@@ -193,17 +193,17 @@ void QmlProfilerRunControl::notifyRemoteSetupFailed(const QString &errorMessage)
infoBox->setModal(true);
connect(infoBox, &QDialog::finished,
this, &QmlProfilerRunControl::wrongSetupMessageBoxFinished);
this, &QmlProfilerRunner::wrongSetupMessageBoxFinished);
infoBox->show();
// KILL
d->m_profilerState->setCurrentState(QmlProfilerStateManager::AppDying);
d->m_noDebugOutputTimer.stop();
reportApplicationStop();
runControl()->reportApplicationStop();
}
void QmlProfilerRunControl::wrongSetupMessageBoxFinished(int button)
void QmlProfilerRunner::wrongSetupMessageBoxFinished(int button)
{
if (button == QMessageBox::Help) {
HelpManager::handleHelpRequest(QLatin1String("qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html"
@@ -211,7 +211,7 @@ void QmlProfilerRunControl::wrongSetupMessageBoxFinished(int button)
}
}
void QmlProfilerRunControl::notifyRemoteSetupDone(Utils::Port port)
void QmlProfilerRunner::notifyRemoteSetupDone(Utils::Port port)
{
d->m_noDebugOutputTimer.stop();
@@ -223,26 +223,26 @@ void QmlProfilerRunControl::notifyRemoteSetupDone(Utils::Port port)
emit processRunning(port);
}
void QmlProfilerRunControl::registerProfilerStateManager( QmlProfilerStateManager *profilerState )
void QmlProfilerRunner::registerProfilerStateManager( QmlProfilerStateManager *profilerState )
{
// disconnect old
if (d->m_profilerState)
disconnect(d->m_profilerState, &QmlProfilerStateManager::stateChanged,
this, &QmlProfilerRunControl::profilerStateChanged);
this, &QmlProfilerRunner::profilerStateChanged);
d->m_profilerState = profilerState;
// connect
if (d->m_profilerState)
connect(d->m_profilerState, &QmlProfilerStateManager::stateChanged,
this, &QmlProfilerRunControl::profilerStateChanged);
this, &QmlProfilerRunner::profilerStateChanged);
}
void QmlProfilerRunControl::profilerStateChanged()
void QmlProfilerRunner::profilerStateChanged()
{
switch (d->m_profilerState->currentState()) {
case QmlProfilerStateManager::Idle:
reportApplicationStop();
runControl()->reportApplicationStop();
d->m_noDebugOutputTimer.stop();
break;
default: