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

Valgrind: Add toolargs to command, not to a string list

Browse Source 
Removes arg splitting/re-combination roundtrips.

Change-Id: I4bc19d3b65f4c685140cea0e190191587f5124e6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
2023-05-23 18:49:32 +02:00
parent 0d22680c7c
commit 5689f0c60e
5 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/valgrind/callgrindengine.cpp
View File

@@ -61,34 +61,32 @@ CallgrindToolRunner::~CallgrindToolRunner()
cleanupTempFile();
}
QStringList CallgrindToolRunner::toolArguments() const
void CallgrindToolRunner::addToolArguments(CommandLine &cmd) const
{
QStringList arguments = {"--tool=callgrind"};
cmd << "--tool=callgrind";
if (m_settings.enableCacheSim())
arguments << "--cache-sim=yes";
cmd << "--cache-sim=yes";
if (m_settings.enableBranchSim())
arguments << "--branch-sim=yes";
cmd << "--branch-sim=yes";
if (m_settings.collectBusEvents())
arguments << "--collect-bus=yes";
cmd << "--collect-bus=yes";
if (m_settings.collectSystime())
arguments << "--collect-systime=yes";
cmd << "--collect-systime=yes";
if (m_markAsPaused)
arguments << "--instr-atstart=no";
cmd << "--instr-atstart=no";
// add extra arguments
if (!m_argumentForToggleCollect.isEmpty())
arguments << m_argumentForToggleCollect;
cmd << m_argumentForToggleCollect;
arguments << "--callgrind-out-file=" + m_valgrindOutputFile.path();
cmd << "--callgrind-out-file=" + m_valgrindOutputFile.path();
arguments << ProcessArgs::splitArgs(m_settings.callgrindArguments(), HostOsInfo::hostOs());
return arguments;
cmd.addArgs(m_settings.callgrindArguments(), CommandLine::Raw);
}
QString CallgrindToolRunner::progressTitle() const