From d09f2c52c65349cb6b7180323eec324152e1c35f Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Tue, 3 Aug 2021 10:30:55 +0200
Subject: [PATCH] Cleanup the finished / unused processes

Change-Id: Ia29e51b7591338cf757ce3a6ddccfcc39fde086b
Reviewed-by: hjk <hjk@qt.io>
---
 .../processlauncher/launchersockethandler.cpp | 21 +++++++++++++++----
 .../processlauncher/launchersockethandler.h   |  1 +
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/tools/processlauncher/launchersockethandler.cpp b/src/tools/processlauncher/launchersockethandler.cpp
index e8dcc4f9785..6c23a2ff348 100644
--- a/src/tools/processlauncher/launchersockethandler.cpp
+++ b/src/tools/processlauncher/launchersockethandler.cpp
@@ -214,6 +214,7 @@ void LauncherSocketHandler::handleProcessFinished()
     packet.stdErr = proc->readAllStandardError();
     packet.stdOut = proc->readAllStandardOutput();
     sendPacket(packet);
+    removeProcess(proc->token());
 }
 
 void LauncherSocketHandler::handleStopFailure()
@@ -221,8 +222,6 @@ void LauncherSocketHandler::handleStopFailure()
     // Process did not react to a kill signal. Rare, but not unheard of.
     // Forget about the associated Process object and report process exit to the client.
     Process * proc = senderProcess();
-    proc->disconnect();
-    m_processes.remove(proc->token());
     ProcessFinishedPacket packet(proc->token());
     packet.error = QProcess::Crashed;
     packet.exitCode = -1;
@@ -263,9 +262,8 @@ void LauncherSocketHandler::handleStopPacket()
         // This can happen if the process finishes on its own at about the same time the client
         // sends the request.
         logDebug("got stop request when process was not running");
-        return;
     }
-    process->cancel();
+    removeProcess(process->token());
 }
 
 void LauncherSocketHandler::handleShutdownPacket()
@@ -302,6 +300,21 @@ Process *LauncherSocketHandler::setupProcess(quintptr token)
     return p;
 }
 
+void LauncherSocketHandler::removeProcess(quintptr token)
+{
+    const auto it = m_processes.find(token);
+    if (it == m_processes.end())
+        return;
+
+    Process *process = it.value();
+    m_processes.erase(it);
+    process->disconnect();
+    if (process->state() != QProcess::NotRunning)
+        process->cancel();
+    else
+        delete process;
+}
+
 Process *LauncherSocketHandler::senderProcess() const
 {
     return static_cast<Process *>(sender());
diff --git a/src/tools/processlauncher/launchersockethandler.h b/src/tools/processlauncher/launchersockethandler.h
index 54a0e3429f2..9dfd44ebefc 100644
--- a/src/tools/processlauncher/launchersockethandler.h
+++ b/src/tools/processlauncher/launchersockethandler.h
@@ -66,6 +66,7 @@ private:
     void sendPacket(const LauncherPacket &packet);
 
     Process *setupProcess(quintptr token);
+    void removeProcess(quintptr token);
     Process *senderProcess() const;
 
     const QString m_serverPath;