Valgrind: Support MemcheckTool re-running

Disable re-running for CallgrindTool only for now.

Change-Id: I8b2392dda9b707641cd4938fe9d2e62f53cfd69f
Reviewed-by: hjk <[email protected]>

3 files changed, 12 insertions, 8 deletions

diff --git a/src/plugins/valgrind/callgrindengine.cpp b/src/plugins/valgrind/callgrindengine.cpp
index 66aeaf07efe..9eaa4764725 100644
--- a/src/plugins/valgrind/callgrindengine.cpp
+++ b/src/plugins/valgrind/callgrindengine.cpp
@@ -30,6 +30,7 @@ CallgrindToolRunner::CallgrindToolRunner(RunControl *runControl)
     : ValgrindToolRunner(runControl)
 {
     setId("CallgrindToolRunner");
+    runControl->setSupportsReRunning(false);
 
     connect(&m_runner, &ValgrindProcess::valgrindStarted, this, [this](qint64 pid) {
         m_pid = pid;
diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp
index bbd7e0d0542..ac0406d0fa2 100644
--- a/src/plugins/valgrind/memchecktool.cpp
+++ b/src/plugins/valgrind/memchecktool.cpp
@@ -945,17 +945,21 @@ void MemcheckTool::setupRunner(MemcheckToolRunner *runTool)
             this, &MemcheckTool::internalParserError);
     connect(runControl, &RunControl::stopped,
             this, &MemcheckTool::engineFinished);
+    connect(runControl, &RunControl::aboutToStart, this, [this] {
+        m_toolBusy = true;
+        updateRunActions();
+        setBusyCursor(true);
+        clearErrorView();
+        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);
 
-    m_toolBusy = true;
-    updateRunActions();
-
-    setBusyCursor(true);
-    clearErrorView();
-    m_loadExternalLogFile->setDisabled(true);
-
     const FilePath dir = runControl->project()->projectDirectory();
     const QString name = runControl->commandLine().executable().fileName();
 
diff --git a/src/plugins/valgrind/valgrindengine.cpp b/src/plugins/valgrind/valgrindengine.cpp
index 493af260efd..fe959ebfa0d 100644
--- a/src/plugins/valgrind/valgrindengine.cpp
+++ b/src/plugins/valgrind/valgrindengine.cpp
@@ -29,7 +29,6 @@ ValgrindToolRunner::ValgrindToolRunner(RunControl *runControl)
     : RunWorker(runControl)
 {
     runControl->setIcon(ProjectExplorer::Icons::ANALYZER_START_SMALL_TOOLBAR);
-    runControl->setSupportsReRunning(false);
 
     m_settings.fromMap(runControl->settingsData(ANALYZER_VALGRIND_SETTINGS));