Valgrind: Announce 'started', not 'stopped' on startup

Also provide a name for the workers.

Change-Id: I323c498db1eeb8225170aae080fdf084aa53e14a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

5 files changed, 5 insertions, 3 deletions

diff --git a/src/plugins/valgrind/callgrindengine.cpp b/src/plugins/valgrind/callgrindengine.cpp
index 9471740f86..500e84a5ac 100644
--- a/src/plugins/valgrind/callgrindengine.cpp
+++ b/src/plugins/valgrind/callgrindengine.cpp
@@ -42,6 +42,7 @@ using namespace Valgrind::Internal;
 CallgrindToolRunner::CallgrindToolRunner(ProjectExplorer::RunControl *runControl)
     : ValgrindToolRunner(runControl)
 {
+    setDisplayName("CallgrindToolRunner");
     connect(&m_runner, &Callgrind::CallgrindRunner::finished,
             this, &CallgrindToolRunner::slotFinished);
     connect(m_runner.parser(), &Callgrind::Parser::parserDataReady,
diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp
index 7137659025..97c19cf601 100644
--- a/src/plugins/valgrind/callgrindtool.cpp
+++ b/src/plugins/valgrind/callgrindtool.cpp
@@ -770,7 +770,7 @@ ValgrindToolRunner *CallgrindTool::createRunTool(RunControl *runControl)
     connect(this, &CallgrindTool::resetRequested, toolRunner, &CallgrindToolRunner::reset);
     connect(this, &CallgrindTool::pauseToggled, toolRunner, &CallgrindToolRunner::setPaused);
 
-    connect(m_stopAction, &QAction::triggered, toolRunner, [toolRunner] { toolRunner->stop(); });
+    connect(m_stopAction, &QAction::triggered, toolRunner, [runControl] { runControl->stop(); });
 
     // initialize run control
     toolRunner->setPaused(m_pauseAction->isChecked());
diff --git a/src/plugins/valgrind/memcheckengine.cpp b/src/plugins/valgrind/memcheckengine.cpp
index 0f629c51f5..18f2543d34 100644
--- a/src/plugins/valgrind/memcheckengine.cpp
+++ b/src/plugins/valgrind/memcheckengine.cpp
@@ -54,6 +54,7 @@ namespace Internal {
 MemcheckToolRunner::MemcheckToolRunner(RunControl *runControl)
     : ValgrindToolRunner(runControl)
 {
+    setDisplayName("MemcheckToolRunner");
     connect(&m_parser, &XmlProtocol::ThreadedParser::error,
             this, &MemcheckToolRunner::parserError);
     connect(&m_parser, &XmlProtocol::ThreadedParser::suppressionCount,
diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp
index f452a845df..09b98c4152 100644
--- a/src/plugins/valgrind/memchecktool.cpp
+++ b/src/plugins/valgrind/memchecktool.cpp
@@ -576,7 +576,7 @@ RunWorker *MemcheckTool::createRunWorker(RunControl *runControl)
             this, [this, runTool] { engineStarting(runTool); });
     connect(runTool, &MemcheckToolRunner::parserError, this, &MemcheckTool::parserError);
     connect(runTool, &MemcheckToolRunner::internalParserError, this, &MemcheckTool::internalParserError);
-    connect(runControl, &RunControl::finished, this, &MemcheckTool::engineFinished);
+    connect(runTool, &MemcheckToolRunner::stopped, this, &MemcheckTool::engineFinished);
 
     connect(m_stopAction, &QAction::triggered, runControl, &RunControl::stop);
 
diff --git a/src/plugins/valgrind/valgrindengine.cpp b/src/plugins/valgrind/valgrindengine.cpp
index c2df034ecf..8fe8d4e2a7 100644
--- a/src/plugins/valgrind/valgrindengine.cpp
+++ b/src/plugins/valgrind/valgrindengine.cpp
@@ -160,7 +160,7 @@ void ValgrindToolRunner::runnerFinished()
     disconnect(runner(), &ValgrindRunner::finished,
                this, &ValgrindToolRunner::runnerFinished);
 
-    reportStarted();
+    reportStopped();
 }
 
 void ValgrindToolRunner::receiveProcessOutput(const QString &output, OutputFormat format)