From 1c37aab5bd26c4dbaefd8828dfedb28afc064aaa Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Wed, 3 May 2023 16:05:33 +0200 Subject: [PATCH] LauncherSocketHandler: Disambiguate Process name Rename Process -> ProcessWithToken. Change-Id: I75920488107f45198590e0b17fa5c9e7679c6192 Reviewed-by: hjk --- .../processlauncher/launchersockethandler.cpp | 28 +++++++++---------- .../processlauncher/launchersockethandler.h | 16 +++++------ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/tools/processlauncher/launchersockethandler.cpp b/src/tools/processlauncher/launchersockethandler.cpp index a0a2733ded1..dae28aa4fbc 100644 --- a/src/tools/processlauncher/launchersockethandler.cpp +++ b/src/tools/processlauncher/launchersockethandler.cpp @@ -14,11 +14,11 @@ namespace Utils { namespace Internal { -class Process : public ProcessHelper +class ProcessWithToken : public ProcessHelper { Q_OBJECT public: - Process(quintptr token, QObject *parent = nullptr) : + ProcessWithToken(quintptr token, QObject *parent = nullptr) : ProcessHelper(parent), m_token(token) { } quintptr token() const { return m_token; } @@ -41,7 +41,7 @@ LauncherSocketHandler::LauncherSocketHandler(QString serverPath, QObject *parent LauncherSocketHandler::~LauncherSocketHandler() { for (auto it = m_processes.cbegin(); it != m_processes.cend(); ++it) { - Process *p = it.value(); + ProcessWithToken *p = it.value(); if (p->state() != QProcess::NotRunning) logWarn(QStringLiteral("Shutting down while process %1 is running").arg(p->program())); ProcessReaper::reap(p); @@ -114,7 +114,7 @@ void LauncherSocketHandler::handleSocketClosed() qApp->quit(); } -void LauncherSocketHandler::handleProcessError(Process *process) +void LauncherSocketHandler::handleProcessError(ProcessWithToken *process) { // In case of FailedToStart we won't receive finished signal, so we send the error // packet and remove the process here and now. For all other errors we should expect @@ -124,7 +124,7 @@ void LauncherSocketHandler::handleProcessError(Process *process) handleProcessFinished(process); } -void LauncherSocketHandler::handleProcessStarted(Process *process) +void LauncherSocketHandler::handleProcessStarted(ProcessWithToken *process) { ProcessStartedPacket packet(process->token()); packet.processId = process->processId(); @@ -132,21 +132,21 @@ void LauncherSocketHandler::handleProcessStarted(Process *process) sendPacket(packet); } -void LauncherSocketHandler::handleReadyReadStandardOutput(Process *process) +void LauncherSocketHandler::handleReadyReadStandardOutput(ProcessWithToken *process) { ReadyReadStandardOutputPacket packet(process->token()); packet.standardChannel = process->readAllStandardOutput(); sendPacket(packet); } -void LauncherSocketHandler::handleReadyReadStandardError(Process *process) +void LauncherSocketHandler::handleReadyReadStandardError(ProcessWithToken *process) { ReadyReadStandardErrorPacket packet(process->token()); packet.standardChannel = process->readAllStandardError(); sendPacket(packet); } -void LauncherSocketHandler::handleProcessFinished(Process *process) +void LauncherSocketHandler::handleProcessFinished(ProcessWithToken *process) { ProcessDonePacket packet(process->token()); packet.exitCode = process->exitCode(); @@ -162,7 +162,7 @@ void LauncherSocketHandler::handleProcessFinished(Process *process) void LauncherSocketHandler::handleStartPacket() { - Process *& process = m_processes[m_packetParser.token()]; + ProcessWithToken *& process = m_processes[m_packetParser.token()]; if (!process) process = setupProcess(m_packetParser.token()); if (process->state() != QProcess::NotRunning) { @@ -197,7 +197,7 @@ void LauncherSocketHandler::handleStartPacket() void LauncherSocketHandler::handleWritePacket() { - Process * const process = m_processes.value(m_packetParser.token()); + ProcessWithToken * const process = m_processes.value(m_packetParser.token()); if (!process) { logWarn("Got write request for unknown process"); return; @@ -214,7 +214,7 @@ void LauncherSocketHandler::handleWritePacket() void LauncherSocketHandler::handleControlPacket() { - Process * const process = m_processes.value(m_packetParser.token()); + ProcessWithToken * const process = m_processes.value(m_packetParser.token()); if (!process) { // This can happen when the process finishes on its own at about the same time the client // sends the request. In this case the process was already deleted. @@ -253,9 +253,9 @@ void LauncherSocketHandler::sendPacket(const LauncherPacket &packet) m_socket->write(packet.serialize()); } -Process *LauncherSocketHandler::setupProcess(quintptr token) +ProcessWithToken *LauncherSocketHandler::setupProcess(quintptr token) { - const auto p = new Process(token, this); + const auto p = new ProcessWithToken(token, this); connect(p, &QProcess::started, this, [this, p] { handleProcessStarted(p); }); connect(p, &QProcess::errorOccurred, this, [this, p] { handleProcessError(p); }); connect(p, &QProcess::finished, this, [this, p] { handleProcessFinished(p); }); @@ -272,7 +272,7 @@ void LauncherSocketHandler::removeProcess(quintptr token) if (it == m_processes.constEnd()) return; - Process *process = it.value(); + ProcessWithToken *process = it.value(); m_processes.erase(it); ProcessReaper::reap(process, process->reaperTimeout()); } diff --git a/src/tools/processlauncher/launchersockethandler.h b/src/tools/processlauncher/launchersockethandler.h index e3ec8a65b8f..d4146ad5f86 100644 --- a/src/tools/processlauncher/launchersockethandler.h +++ b/src/tools/processlauncher/launchersockethandler.h @@ -15,7 +15,7 @@ QT_END_NAMESPACE namespace Utils { namespace Internal { -class Process; +class ProcessWithToken; class LauncherSocketHandler : public QObject { @@ -31,11 +31,11 @@ private: void handleSocketError(); void handleSocketClosed(); - void handleProcessStarted(Process *process); - void handleProcessError(Process *process); - void handleProcessFinished(Process *process); - void handleReadyReadStandardOutput(Process *process); - void handleReadyReadStandardError(Process *process); + void handleProcessStarted(ProcessWithToken *process); + void handleProcessError(ProcessWithToken *process); + void handleProcessFinished(ProcessWithToken *process); + void handleReadyReadStandardOutput(ProcessWithToken *process); + void handleReadyReadStandardError(ProcessWithToken *process); void handleStartPacket(); void handleWritePacket(); @@ -44,13 +44,13 @@ private: void sendPacket(const LauncherPacket &packet); - Process *setupProcess(quintptr token); + ProcessWithToken *setupProcess(quintptr token); void removeProcess(quintptr token); const QString m_serverPath; QLocalSocket * const m_socket; PacketParser m_packetParser; - QHash m_processes; + QHash m_processes; }; } // namespace Internal