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

RemoteLinux: Remove target-specific perf support

Browse Source 
The base target-agnostic implementation is good enough to handle the
case.

Change-Id: Ib4615de59c1d5defd297a885ca2ca13ff9e0d3e6
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
hjk
2017-09-05 09:38:10 +02:00
parent 35bdf8e3b8
commit 7ee3e137bc
3 changed files with 0 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/plugins/remotelinux/remotelinuxanalyzesupport.cpp
View File

@@ -89,62 +89,4 @@ void RemoteLinuxQmlProfilerSupport::start()
SimpleTargetRunner::start();
}
// RemoteLinuxPerfSupport
RemoteLinuxPerfSupport::RemoteLinuxPerfSupport(RunControl *runControl)
: RunWorker(runControl)
{
setDisplayName("RemoteLinuxPerfSupport");
RunConfiguration *runConfiguration = runControl->runConfiguration();
QTC_ASSERT(runConfiguration, return);
IRunConfigurationAspect *perfAspect =
runConfiguration->extraAspect("Analyzer.Perf.Settings");
QTC_ASSERT(perfAspect, return);
m_perfRecordArguments =
perfAspect->currentSettings()->property("perfRecordArguments").toStringList()
.join(' ');
auto toolRunner = runControl->createWorker(runControl->runMode());
toolRunner->addStartDependency(this);
// connect(&m_outputGatherer, &QmlDebug::QmlOutputParser::waitingForConnectionOnPort,
// this, &RemoteLinuxPerfSupport::remoteIsRunning);
// addDependency(FifoCreatorWorkerId);
}
void RemoteLinuxPerfSupport::start()
{
// m_remoteFifo = targetRunner()->fifo();
if (m_remoteFifo.isEmpty()) {
reportFailure(tr("FIFO for profiling data could not be created."));
return;
}
// ApplicationLauncher *runner = targetRunner()->applicationLauncher();
auto r = runnable().as<StandardRunnable>();
r.commandLineArguments = "-c 'perf record -o - " + m_perfRecordArguments
+ " -- " + r.executable + " "
+ r.commandLineArguments + " > " + m_remoteFifo
+ "'";
r.executable = "sh";
connect(&m_outputGatherer, SIGNAL(remoteStdout(QByteArray)),
runControl(), SIGNAL(analyzePerfOutput(QByteArray)));
connect(&m_outputGatherer, SIGNAL(finished(bool)),
runControl(), SIGNAL(perfFinished()));
StandardRunnable outputRunner;
outputRunner.executable = "sh";
outputRunner.commandLineArguments = QString("-c 'cat %1 && rm -r `dirname %1`'").arg(m_remoteFifo);
m_outputGatherer.start(outputRunner, device());
// remoteIsRunning();
// runControl()->notifyRemoteSetupDone(d->qmlPort);
// runner->start(r, device());
}
} // namespace RemoteLinux

16
src/plugins/remotelinux/remotelinuxanalyzesupport.h
View File

@@ -48,20 +48,4 @@ private:
};
class REMOTELINUX_EXPORT RemoteLinuxPerfSupport : public ProjectExplorer::RunWorker
{
Q_OBJECT
public:
RemoteLinuxPerfSupport(ProjectExplorer::RunControl *runControl);
private:
void start() override;
QString m_remoteFifo;
QString m_perfRecordArguments;
ProjectExplorer::ApplicationLauncher m_outputGatherer;
};
} // namespace RemoteLinux

1
src/plugins/remotelinux/remotelinuxplugin.cpp
View File

@@ -63,7 +63,6 @@ bool RemoteLinuxPlugin::initialize(const QStringList &arguments,
RunControl::registerWorker<SimpleTargetRunner>(NORMAL_RUN_MODE, constraint);
RunControl::registerWorker<LinuxDeviceDebugSupport>(DEBUG_RUN_MODE, constraint);
RunControl::registerWorker<RemoteLinuxQmlProfilerSupport>(QML_PROFILER_RUN_MODE, constraint);
//RunControl::registerWorker<RemoteLinuxPerfSupport>(PERFPROFILER_RUN_MODE, constraint);
addAutoReleasedObject(new GenericLinuxDeviceConfigurationFactory);
addAutoReleasedObject(new RemoteLinuxRunConfigurationFactory);