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

ProcessLauncher: Flush Done signal when waiting for started

Browse Source 
After changing the protocol so that error signal is no more
sent we need to flush the buffered Done signal when
awaiting for Started signal.

Change-Id: I274bfa375db05627348684f11be535d79c62b42b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Jarek Kobus
2022-04-22 12:53:19 +02:00
parent 6599a67737
commit 2533a4cfd6
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/utils/launchersocket.cpp
View File

@@ -116,7 +116,6 @@ bool CallerHandle::flushFor(SignalType signalType)
{ {
QTC_ASSERT(isCalledFromCallersThread(), return {}); QTC_ASSERT(isCalledFromCallersThread(), return {});
QList<LauncherSignal *> oldSignals; QList<LauncherSignal *> oldSignals;
QList<SignalType> flushedSignals;
{ {
QMutexLocker locker(&m_mutex); QMutexLocker locker(&m_mutex);
const QList<SignalType> storedSignals = const QList<SignalType> storedSignals =
@@ -124,18 +123,21 @@ bool CallerHandle::flushFor(SignalType signalType)
return launcherSignal->signalType(); return launcherSignal->signalType();
}); });
// If we are flushing for Started, flush Started only // If we are flushing for ReadyRead or Done - flush all.
const bool flushAll = (signalType != SignalType::Started); // If we are flushing for Started:
// - if Started was buffered - flush Started only.
// - otherwise if Done signal was buffered - flush all.
const bool flushAll = (signalType != SignalType::Started)
|| (!storedSignals.contains(SignalType::Started)
&& storedSignals.contains(SignalType::Done));
if (flushAll) { if (flushAll) {
oldSignals = m_signals; oldSignals = m_signals;
m_signals = {}; m_signals = {};
flushedSignals = storedSignals;
} else { } else {
auto matchingIndex = storedSignals.lastIndexOf(signalType); auto matchingIndex = storedSignals.lastIndexOf(signalType);
if (matchingIndex >= 0) { if (matchingIndex >= 0) {
oldSignals = m_signals.mid(0, matchingIndex + 1); oldSignals = m_signals.mid(0, matchingIndex + 1);
m_signals = m_signals.mid(matchingIndex + 1); m_signals = m_signals.mid(matchingIndex + 1);
flushedSignals = storedSignals.mid(0, matchingIndex + 1);
} }
} }
} }