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

Process: Simplify the implementation of runBlocking(Off)

Browse Source 
Extract the common part of handling the timeout into the
handleTimeout lambda.

Change-Id: I3c55c76cbc3d1217322c1b2a7002285bf2e649d3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2024-01-22 13:43:54 +01:00
parent 4d7a86dc5c
commit 886ac041e5
1 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1857,7 +1857,7 @@ void Process::runBlocking(EventLoopMode eventLoopMode)
QDateTime startTime; QDateTime startTime;
static const int blockingThresholdMs = qtcEnvironmentVariableIntValue("QTC_PROCESS_THRESHOLD"); static const int blockingThresholdMs = qtcEnvironmentVariableIntValue("QTC_PROCESS_THRESHOLD");
auto starter = [this, eventLoopMode, &startTime] { const auto handleStart = [this, eventLoopMode, &startTime] {
// Attach a dynamic property with info about blocking type // Attach a dynamic property with info about blocking type
d->storeEventLoopDebugInfo(int(eventLoopMode)); d->storeEventLoopDebugInfo(int(eventLoopMode));
@@ -1869,6 +1869,14 @@ void Process::runBlocking(EventLoopMode eventLoopMode)
d->storeEventLoopDebugInfo({}); d->storeEventLoopDebugInfo({});
}; };
const auto handleTimeout = [this] {
if (state() == QProcess::NotRunning)
return;
stop();
QTC_CHECK(waitForFinished(2000));
d->m_result = ProcessResult::Hang;
};
if (eventLoopMode == EventLoopMode::On) { if (eventLoopMode == EventLoopMode::On) {
#ifdef QT_GUI_LIB #ifdef QT_GUI_LIB
if (isGuiEnabled()) if (isGuiEnabled())
@@ -1878,17 +1886,13 @@ void Process::runBlocking(EventLoopMode eventLoopMode)
// Queue the call to start() so that it's executed after the nested event loop is started, // Queue the call to start() so that it's executed after the nested event loop is started,
// otherwise it fails on Windows with QProcessImpl. See QTCREATORBUG-30066. // otherwise it fails on Windows with QProcessImpl. See QTCREATORBUG-30066.
QMetaObject::invokeMethod(this, starter, Qt::QueuedConnection); QMetaObject::invokeMethod(this, handleStart, Qt::QueuedConnection);
std::function<void(void)> timeoutHandler = {}; std::function<void(void)> timeoutHandler = {};
if (d->m_timeoutInSeconds > 0) { if (d->m_timeoutInSeconds > 0) {
timeoutHandler = [this, &eventLoop, &timeoutHandler] { timeoutHandler = [this, &eventLoop, &timeoutHandler, &handleTimeout] {
if (!d->m_timeOutMessageBoxEnabled || askToKill(d->m_setup.m_commandLine)) { if (!d->m_timeOutMessageBoxEnabled || askToKill(d->m_setup.m_commandLine)) {
if (state() == QProcess::NotRunning) handleTimeout();
return;
stop();
waitForFinished();
d->m_result = ProcessResult::Hang;
return; return;
} }
QTimer::singleShot(d->m_timeoutInSeconds * 1000, &eventLoop, timeoutHandler); QTimer::singleShot(d->m_timeoutInSeconds * 1000, &eventLoop, timeoutHandler);
@@ -1904,19 +1908,9 @@ void Process::runBlocking(EventLoopMode eventLoopMode)
QGuiApplication::restoreOverrideCursor(); QGuiApplication::restoreOverrideCursor();
#endif #endif
} else { } else {
starter(); handleStart();
if (!waitForStarted(d->m_timeoutInSeconds * 1000)) { if (!waitForFinished(d->m_timeoutInSeconds * 1000))
d->m_result = ProcessResult::StartFailed; handleTimeout();
return;
}
if (!waitForFinished(d->m_timeoutInSeconds * 1000)) {
d->m_result = ProcessResult::Hang;
terminate();
if (!waitForFinished(1000)) {
kill();
waitForFinished(1000);
}
}
} }
if (blockingThresholdMs > 0) { if (blockingThresholdMs > 0) {
const int timeDiff = startTime.msecsTo(QDateTime::currentDateTime()); const int timeDiff = startTime.msecsTo(QDateTime::currentDateTime());