PerfProfiler: Re-organize general command line construction

... to avoid unnecessary argument splitting.

Also, make a potentially missing access to the settings
more noticeable to the user.

Task-number: QTCREATORBUG-28701
Change-Id: I7b7f7f5f6a68357dbec064516370bacbf00746dc
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

src/plugins/perfprofiler/perfprofilerruncontrol.cpp

@@ -95,16 +95,15 @@ public:
         : RunWorker(runControl)
     {
         setId("LocalPerfRecordWorker");
-
-        auto perfAspect = runControl->aspect<PerfRunConfigurationAspect>();
-        QTC_ASSERT(perfAspect, return);
-        PerfSettings *settings = static_cast<PerfSettings *>(perfAspect->currentSettings);
-        QTC_ASSERT(settings, return);
-        m_perfRecordArguments = settings->perfRecordArguments();
     }
 
     void start() override
     {
+        auto perfAspect = runControl()->aspect<PerfRunConfigurationAspect>();
+        QTC_ASSERT(perfAspect, reportFailure(); return);
+        PerfSettings *settings = static_cast<PerfSettings *>(perfAspect->currentSettings);
+        QTC_ASSERT(settings, reportFailure(); return);
+
         m_process = new Process(this);
 
         connect(m_process, &Process::started, this, &RunWorker::reportStarted);
@@ -125,7 +124,7 @@ public:
         });
 
         CommandLine cmd({device()->filePath("perf"), {"record"}});
-        cmd.addArgs(m_perfRecordArguments);
+        settings->addPerfRecordArguments(&cmd);
         cmd.addArgs({"-o", "-", "--"});
         cmd.addCommandLineAsArgs(runControl()->commandLine(), CommandLine::Raw);
 
@@ -145,7 +144,6 @@ public:
 
 private:
     QPointer<Process> m_process;
-    QStringList m_perfRecordArguments;
 };
 
 

src/plugins/perfprofiler/perfsettings.cpp

@@ -103,7 +103,7 @@ void PerfSettings::writeGlobalSettings() const
     settings->endGroup();
 }
 
-QStringList PerfSettings::perfRecordArguments() const
+void PerfSettings::addPerfRecordArguments(CommandLine *cmd) const
 {
     QString callgraphArg = callgraphMode.itemValue().toString();
     if (callgraphArg == Constants::PerfCallgraphDwarf)
@@ -118,11 +118,11 @@ QStringList PerfSettings::perfRecordArguments() const
         }
     }
 
-    return QStringList({"-e", events,
+    cmd->addArgs({"-e", events,
                   "--call-graph", callgraphArg,
                   sampleMode.itemValue().toString(),
-                        QString::number(period.value())})
+                  QString::number(period.value())});
-         + ProcessArgs::splitArgs(extraArguments.value(), HostOsInfo::hostOs());
+    cmd->addArgs(extraArguments(), CommandLine::Raw);
 }
 
 void PerfSettings::resetToDefault()

src/plugins/perfprofiler/perfsettings.h

@@ -14,7 +14,6 @@ namespace PerfProfiler {
 class PERFPROFILER_EXPORT PerfSettings final : public ProjectExplorer::ISettingsAspect
 {
     Q_OBJECT
-    Q_PROPERTY(QStringList perfRecordArguments READ perfRecordArguments NOTIFY changed)
 
 public:
     explicit PerfSettings(ProjectExplorer::Target *target = nullptr);
@@ -23,7 +22,7 @@ public:
     void readGlobalSettings();
     void writeGlobalSettings() const;
 
-    QStringList perfRecordArguments() const;
+    void addPerfRecordArguments(Utils::CommandLine *cmd) const;
 
     void resetToDefault();