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

TerminalProcess: Fix stopping the terminal

Browse Source 
Fixes 30 seconds freeze when stopping the terminal
during debugging (when being interrupted on some
breakpoint).

Fixes also the freeze on closing the preferences
dialog after opening the remote shell via
"Open Remote Shell" and keeping it open.

Fixes: QTCREATORBUG-28365
Change-Id: I15dfd9cba02d03e0ba65878c5285ea8cc96d8aad
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Jarek Kobus
2022-10-19 13:50:23 +02:00
parent c9f39972cd
commit 9d8106e54a
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,6 @@
#include "qtcassert.h"
#include "qtcprocess.h"
#include "terminalcommand.h"
#include "winutils.h"
#include <QCoreApplication>
#include <QLocalServer>
@@ -22,17 +21,19 @@
#ifdef Q_OS_WIN
# include <windows.h>
# include <stdlib.h>
# include <cstring>
#include "winutils.h"
#include <cstring>
#include <stdlib.h>
#include <windows.h>
#else
# include <sys/stat.h>
# include <sys/types.h>
# include <errno.h>
# include <string.h>
# include <unistd.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <errno.h>
#include <string.h>
#include <unistd.h>
#endif
@@ -423,7 +424,9 @@ void TerminalImpl::sendControlSignal(ControlSignal controlSignal)
switch (controlSignal) {
case ControlSignal::Terminate:
case ControlSignal::Kill:
stopProcess();
killProcess();
if (HostOsInfo::isWindowsHost())
killStub();
break;
case ControlSignal::Interrupt:
sendCommand('i');
@@ -468,13 +471,13 @@ void TerminalImpl::killStub()
TerminateProcess(d->m_pid->hProcess, (unsigned)-1);
WaitForSingleObject(d->m_pid->hProcess, INFINITE);
cleanupStub();
emitFinished(-1, QProcess::CrashExit);
#else
sendCommand('s');
stubServerShutdown();
d->m_process.stop();
d->m_process.waitForFinished();
#endif
emitFinished(-1, QProcess::CrashExit);
}
void TerminalImpl::stopProcess()
@@ -519,13 +522,13 @@ QString TerminalImpl::stubServerListen()
if (errno != EEXIST)
return msgCannotCreateTempDir(stubFifoDir, QString::fromLocal8Bit(strerror(errno)));
}
const QString stubServer = stubFifoDir + QLatin1String("/stub-socket");
const QString stubServer = stubFifoDir + QLatin1String("/stub-socket");
if (!d->m_stubServer.listen(stubServer)) {
::rmdir(d->m_stubServerDir.constData());
return QtcProcess::tr("Cannot create socket \"%1\": %2")
.arg(stubServer, d->m_stubServer.errorString());
}
return QString();
return {};
#endif
}

5
src/plugins/debugger/terminal.cpp
View File

@@ -193,11 +193,8 @@ void TerminalRunner::start()
void TerminalRunner::stop()
{
if (m_stubProc && m_stubProc->isRunning()) {
if (m_stubProc && m_stubProc->isRunning())
m_stubProc->stop();
m_stubProc->waitForFinished();
}
reportStopped();
}
void TerminalRunner::stubStarted()