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

PerfProfiler: Get rid of LocalPerfRecordWorker

Browse Source 
Use ProcessRunner instead.

Task-number: QTCREATORBUG-29168
Change-Id: Id0ef0590fb807dfc3476742cd69f7cd98b11d2f8
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2025-01-02 15:34:22 +01:00
parent 79542bb6d1
commit 543acde1c8
3 changed files with 24 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
src/plugins/perfprofiler/perfprofilerruncontrol.cpp
View File

@@ -83,64 +83,6 @@ private:
PerfDataReader m_reader;
};
class LocalPerfRecordWorker final : public RunWorker
{
Q_OBJECT
public:
LocalPerfRecordWorker(RunControl *runControl)
: RunWorker(runControl)
{
setId("LocalPerfRecordWorker");
}
void start() final
{
m_process = new Process(this);
runControl()->setProperty("PerfProcess", QVariant::fromValue(m_process.get()));
connect(m_process, &Process::started, this, &RunWorker::reportStarted);
connect(m_process, &Process::done, this, [this] {
// The terminate() below will frequently lead to QProcess::Crashed. We're not interested
// in that. FailedToStart is the only actual failure.
if (m_process->error() == QProcess::FailedToStart) {
const QString msg = Tr::tr("Perf Process Failed to Start");
QMessageBox::warning(Core::ICore::dialogParent(), msg,
Tr::tr("Make sure that you are running a recent Linux kernel "
"and that the \"perf\" utility is available."));
reportFailure(msg);
return;
}
if (!m_process->cleanedStdErr().isEmpty())
appendMessage(m_process->cleanedStdErr(), StdErrFormat);
reportStopped();
});
const Store perfArgs = runControl()->settingsData(PerfProfiler::Constants::PerfSettingsId);
const QString recordArgs = perfArgs[Constants::PerfRecordArgsId].toString();
CommandLine cmd({device()->filePath("perf"), {"record"}});
cmd.addArgs(recordArgs, CommandLine::Raw);
cmd.addArgs({"-o", "-", "--"});
cmd.addCommandLineAsArgs(runControl()->commandLine(), CommandLine::Raw);
m_process->setCommand(cmd);
m_process->setWorkingDirectory(runControl()->workingDirectory());
m_process->setEnvironment(runControl()->environment());
appendMessage("Starting Perf: " + cmd.toUserOutput(), NormalMessageFormat);
m_process->start();
}
void stop() final
{
if (m_process)
m_process->terminate();
}
private:
QPointer<Process> m_process;
};
class PerfProfilerRunner final : public RunWorker
{
public:
@@ -155,20 +97,34 @@ public:
// If the parser is gone, there is no point in going on.
m_perfParserWorker->setEssential(true);
if ((m_perfRecordWorker = runControl->createWorker("PerfRecorder"))) {
if ((m_perfRecordWorker = qobject_cast<ProcessRunner *>(runControl->createWorker("PerfRecorder")))) {
m_perfParserWorker->addStartDependency(m_perfRecordWorker);
addStartDependency(m_perfParserWorker);
} else {
m_perfRecordWorker = new LocalPerfRecordWorker(runControl);
m_perfRecordWorker = new ProcessRunner(runControl);
m_perfRecordWorker->suppressDefaultStdOutHandling();
m_perfRecordWorker->setStartModifier([this, runControl] {
const Store perfArgs = runControl->settingsData(PerfProfiler::Constants::PerfSettingsId);
const QString recordArgs = perfArgs[Constants::PerfRecordArgsId].toString();
CommandLine cmd({device()->filePath("perf"), {"record"}});
cmd.addArgs(recordArgs, CommandLine::Raw);
cmd.addArgs({"-o", "-", "--"});
cmd.addCommandLineAsArgs(runControl->commandLine(), CommandLine::Raw);
m_perfRecordWorker->setCommandLine(cmd);
m_perfRecordWorker->setWorkingDirectory(runControl->workingDirectory());
m_perfRecordWorker->setEnvironment(runControl->environment());
appendMessage("Starting Perf: " + cmd.toUserOutput(), NormalMessageFormat);
});
m_perfRecordWorker->addStartDependency(m_perfParserWorker);
addStartDependency(m_perfRecordWorker);
// In the local case, the parser won't automatically stop when the recorder does. So we need
// to mark the recorder as essential, too.
m_perfRecordWorker->setEssential(true);
}
addStartDependency(m_perfRecordWorker);
m_perfParserWorker->addStopDependency(m_perfRecordWorker);
PerfProfilerTool::instance()->onWorkerCreation(runControl);
@@ -184,7 +140,7 @@ public:
&PerfProfilerTool::onRunControlFinished);
PerfDataReader *reader = m_perfParserWorker->reader();
Process *perfProcess = runControl()->property("PerfProcess").value<Process *>();
Process *perfProcess = m_perfRecordWorker->process();
if (perfProcess) {
connect(perfProcess, &Process::readyReadStandardError, this, [this, perfProcess] {
@@ -202,7 +158,7 @@ public:
private:
PerfParserWorker *m_perfParserWorker = nullptr;
RunWorker *m_perfRecordWorker = nullptr;
ProcessRunner *m_perfRecordWorker = nullptr;
};
// PerfProfilerRunWorkerFactory
@@ -223,5 +179,3 @@ void setupPerfProfilerRunWorker()
}
} // PerfProfiler::Internal
#include "perfprofilerruncontrol.moc"

2
src/plugins/projectexplorer/runcontrol.h
View File

@@ -279,6 +279,8 @@ private:
class PROJECTEXPLORER_EXPORT ProcessRunner final : public RunWorker
{
Q_OBJECT
public:
explicit ProcessRunner(RunControl *runControl);
~ProcessRunner() override;

4
src/plugins/qtapplicationmanager/appmanagerruncontrol.cpp
View File

@@ -47,10 +47,8 @@ static RunWorker *createInferiorRunner(RunControl *runControl, QmlDebugServicesP
worker->setId(AppManager::Constants::DEBUG_LAUNCHER_ID);
worker->setEssential(true);
if (worker->usesPerfChannel()) {
if (worker->usesPerfChannel())
worker->suppressDefaultStdOutHandling();
runControl->setProperty("PerfProcess", QVariant::fromValue(worker->process()));
}
worker->setStartModifier([worker, runControl, qmlServices] {
FilePath controller = runControl->aspectData<AppManagerControllerAspect>()->filePath;