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

ProcessInterface: Add sendControlSignal() method

Browse Source 
It substitutes terminate, kill, interrupt and kickoffProcess
methods.

Task-number: QTCREATORBUG-27358
Change-Id: I9e952c2f4c1a7e76339366566f2c804a3df30347
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2022-04-11 19:45:04 +02:00
parent 25be242c6f
commit 7c8b5648fe
5 changed files with 80 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/libs/utils/terminalprocess.cpp
View File

@@ -435,25 +435,29 @@ void TerminalImpl::cleanupAfterStartFailure(const QString &errorMessage)
d->m_tempFile = nullptr;
}
void TerminalImpl::kickoffProcess()
void TerminalImpl::sendControlSignal(ControlSignal controlSignal)
{
#ifdef Q_OS_WIN
// Not used.
#else
if (d->m_stubSocket && d->m_stubSocket->isWritable()) {
d->m_stubSocket->write("c", 1);
d->m_stubSocket->flush();
switch (controlSignal) {
case Utils::ControlSignal::Terminate:
case Utils::ControlSignal::Kill:
stopProcess();
break;
case Utils::ControlSignal::Interrupt:
sendCommand('i');
break;
case Utils::ControlSignal::KickOff:
sendCommand('c');
break;
}
#endif
}
void TerminalImpl::interrupt()
void TerminalImpl::sendCommand(char c)
{
#ifdef Q_OS_WIN
// Not used.
Q_UNUSED(c)
#else
if (d->m_stubSocket && d->m_stubSocket->isWritable()) {
d->m_stubSocket->write("i", 1);
d->m_stubSocket->write(&c, 1);
d->m_stubSocket->flush();
}
#endif
@@ -467,10 +471,7 @@ void TerminalImpl::killProcess()
cleanupInferior();
}
#else
if (d->m_stubSocket && d->m_stubSocket->isWritable()) {
d->m_stubSocket->write("k", 1);
d->m_stubSocket->flush();
}
sendCommand('k');
#endif
d->m_processId = 0;
}
@@ -484,10 +485,7 @@ void TerminalImpl::killStub()
cleanupStub();
}
#else
if (d->m_stubSocket && d->m_stubSocket->isWritable()) {
d->m_stubSocket->write("s", 1);
d->m_stubSocket->flush();
}
sendCommand('s');
stubServerShutdown();
#endif
}