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

Valgrind: Support MemcheckTool re-running

Browse Source 
Disable re-running for CallgrindTool only for now.

Change-Id: I8b2392dda9b707641cd4938fe9d2e62f53cfd69f
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2025-01-15 09:05:33 +01:00
parent 2a16fac8b6
commit 86d43d3043
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,6 +30,7 @@ CallgrindToolRunner::CallgrindToolRunner(RunControl *runControl)
: ValgrindToolRunner(runControl) : ValgrindToolRunner(runControl)
{ {
setId("CallgrindToolRunner"); setId("CallgrindToolRunner");
runControl->setSupportsReRunning(false);
connect(&m_runner, &ValgrindProcess::valgrindStarted, this, [this](qint64 pid) { connect(&m_runner, &ValgrindProcess::valgrindStarted, this, [this](qint64 pid) {
m_pid = pid; m_pid = pid;

14
src/plugins/valgrind/memchecktool.cpp
View File

@@ -945,16 +945,20 @@ void MemcheckTool::setupRunner(MemcheckToolRunner *runTool)
this, &MemcheckTool::internalParserError); this, &MemcheckTool::internalParserError);
connect(runControl, &RunControl::stopped, connect(runControl, &RunControl::stopped,
this, &MemcheckTool::engineFinished); this, &MemcheckTool::engineFinished);
connect(runControl, &RunControl::aboutToStart, this, [this] {
m_stopAction->disconnect();
connect(m_stopAction, &QAction::triggered, runControl, &RunControl::initiateStop);
m_toolBusy = true; m_toolBusy = true;
updateRunActions(); updateRunActions();
setBusyCursor(true); setBusyCursor(true);
clearErrorView(); clearErrorView();
m_loadExternalLogFile->setDisabled(true); m_loadExternalLogFile->setDisabled(true);
Debugger::showPermanentStatusMessage(Tr::tr("Starting Memory Analyzer..."));
});
connect(runControl, &RunControl::started, this, [] {
Debugger::showPermanentStatusMessage(Tr::tr("Memory Analyzer running..."));
});
m_stopAction->disconnect();
connect(m_stopAction, &QAction::triggered, runControl, &RunControl::initiateStop);
const FilePath dir = runControl->project()->projectDirectory(); const FilePath dir = runControl->project()->projectDirectory();
const QString name = runControl->commandLine().executable().fileName(); const QString name = runControl->commandLine().executable().fileName();

1
src/plugins/valgrind/valgrindengine.cpp
View File

@@ -29,7 +29,6 @@ ValgrindToolRunner::ValgrindToolRunner(RunControl *runControl)
: RunWorker(runControl) : RunWorker(runControl)
{ {
runControl->setIcon(ProjectExplorer::Icons::ANALYZER_START_SMALL_TOOLBAR); runControl->setIcon(ProjectExplorer::Icons::ANALYZER_START_SMALL_TOOLBAR);
runControl->setSupportsReRunning(false);
m_settings.fromMap(runControl->settingsData(ANALYZER_VALGRIND_SETTINGS)); m_settings.fromMap(runControl->settingsData(ANALYZER_VALGRIND_SETTINGS));