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

Terminal: Fix flushing after process has finished

Browse Source 
Fixes: QTCREATORBUG-30733
Change-Id: I4b6274d15efbd1b2e6c8ea4960683a4f6bc8952e
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
Cristian Adam
2024-11-19 16:08:03 +01:00
parent 214fbc1c98
commit 05e0529013
2 changed files with 48 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/libs/3rdparty/libptyqt/conptyprocess.cpp vendored
View File

@@ -988,8 +988,11 @@ bool ConPtyProcess::startProcess(const QString &executable,
GetExitCodeProcess(hEvent, &exitCode);
m_exitCode = exitCode;
// Do not respawn if the object is about to be destructed
if (!m_aboutToDestruct)
emit notifier()->aboutToClose();
if (!m_aboutToDestruct) {
ConptyClosePseudoConsole(m_ptyHandler);
m_ptyHandler = INVALID_HANDLE_VALUE;
emit notifier() -> aboutToClose();
}
m_shellCloseWaitNotifier->setEnabled(false);
}, Qt::QueuedConnection);
@@ -1028,7 +1031,7 @@ bool ConPtyProcess::startProcess(const QString &executable,
bool ConPtyProcess::resize(qint16 cols, qint16 rows)
{
if (m_ptyHandler == nullptr)
if (m_ptyHandler == INVALID_HANDLE_VALUE)
{
return false;
}
@@ -1047,49 +1050,45 @@ bool ConPtyProcess::resize(qint16 cols, qint16 rows)
bool ConPtyProcess::kill()
{
bool exitCode = false;
if (m_ptyHandler != INVALID_HANDLE_VALUE) {
m_aboutToDestruct = true;
// Close ConPTY - this will terminate client process if running
WindowsContext::instance().closePseudoConsole(m_ptyHandler);
// Clean-up the pipes
if (INVALID_HANDLE_VALUE != m_hPipeOut)
CloseHandle(m_hPipeOut);
if (INVALID_HANDLE_VALUE != m_hPipeIn)
CloseHandle(m_hPipeIn);
if (m_readThread) {
m_readThread->requestInterruption();
if (!m_readThread->wait(1000))
m_readThread->terminate();
m_readThread->deleteLater();
m_readThread = nullptr;
}
delete m_shellCloseWaitNotifier;
m_shellCloseWaitNotifier = nullptr;
m_pid = 0;
m_ptyHandler = INVALID_HANDLE_VALUE;
m_hPipeIn = INVALID_HANDLE_VALUE;
m_hPipeOut = INVALID_HANDLE_VALUE;
CloseHandle(m_shellProcessInformation.hThread);
CloseHandle(m_shellProcessInformation.hProcess);
// Cleanup attribute list
if (m_shellStartupInfo.lpAttributeList) {
DeleteProcThreadAttributeList(m_shellStartupInfo.lpAttributeList);
HeapFree(GetProcessHeap(), 0, m_shellStartupInfo.lpAttributeList);
}
exitCode = true;
}
return exitCode;
// Clean-up the pipes
if (INVALID_HANDLE_VALUE != m_hPipeOut)
CloseHandle(m_hPipeOut);
if (INVALID_HANDLE_VALUE != m_hPipeIn)
CloseHandle(m_hPipeIn);
if (m_readThread) {
m_readThread->requestInterruption();
if (!m_readThread->wait(1000))
m_readThread->terminate();
m_readThread->deleteLater();
m_readThread = nullptr;
}
delete m_shellCloseWaitNotifier;
m_shellCloseWaitNotifier = nullptr;
m_pid = 0;
m_ptyHandler = INVALID_HANDLE_VALUE;
m_hPipeIn = INVALID_HANDLE_VALUE;
m_hPipeOut = INVALID_HANDLE_VALUE;
CloseHandle(m_shellProcessInformation.hThread);
CloseHandle(m_shellProcessInformation.hProcess);
// Cleanup attribute list
if (m_shellStartupInfo.lpAttributeList) {
DeleteProcThreadAttributeList(m_shellStartupInfo.lpAttributeList);
HeapFree(GetProcessHeap(), 0, m_shellStartupInfo.lpAttributeList);
}
return true;
}
IPtyProcess::PtyType ConPtyProcess::type()

11
src/libs/utils/qtcprocess.cpp
View File

@@ -435,13 +435,22 @@ public:
static_cast<Pty::PtyInputFlag>(m_inputFlags.toInt()));
}
emit readyRead(m_ptyProcess->readAll(), {});
const QByteArray data = m_ptyProcess->readAll();
if (!data.isEmpty())
emit readyRead(data, {});
});
connect(m_ptyProcess->notifier(), &QIODevice::aboutToClose, this, [this] {
if (m_ptyProcess) {
const ProcessResultData result
= {m_ptyProcess->exitCode(), QProcess::NormalExit, QProcess::UnknownError, {}};
const QByteArray restOfOutput = m_ptyProcess->readAll();
if (!restOfOutput.isEmpty()) {
emit readyRead(restOfOutput, {});
m_ptyProcess->notifier()->disconnect();
}
emit done(result);
return;
}