QtcProcess: Make reaper timeout customizable

Add a setter and getter for reaper timeout. This makes it
possible to customize the timeout for the reaper after which it
should call kill() when previous terminate() was unsuccessful.

This setting is also used for QtcProcess::stop().

Change-Id: I653a3ad107ae4173bb8254c85cfc07886bf6a9c6
Reviewed-by: hjk <hjk@qt.io>

1 files changed, 17 insertions, 3 deletions

diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp
index 69cf99325b..b8272f64ce 100644
--- a/src/libs/utils/qtcprocess.cpp
+++ b/src/libs/utils/qtcprocess.cpp
@@ -340,7 +340,7 @@ public:
             emit readyRead({}, m_process->readAllStandardError());
         });
     }
-    ~QProcessImpl() final { ProcessReaper::reap(m_process); }
+    ~QProcessImpl() final { ProcessReaper::reap(m_process, m_setup.m_reaperTimeout); }
 
 private:
     qint64 write(const QByteArray &data) final { return m_process->write(data); }
@@ -1166,6 +1166,16 @@ QVariantHash QtcProcess::extraData() const
     return d->m_setup.m_extraData;
 }
 
+void QtcProcess::setReaperTimeout(int msecs)
+{
+    d->m_setup.m_reaperTimeout = msecs;
+}
+
+int QtcProcess::reaperTimeout() const
+{
+    return d->m_setup.m_reaperTimeout;
+}
+
 void QtcProcess::setRemoteProcessHooks(const DeviceProcessHooks &hooks)
 {
     s_deviceHooks = hooks;
@@ -1501,12 +1511,16 @@ void QtcProcess::close()
     d->clearForRun();
 }
 
-void QtcProcess::stop(int killTimeout)
+/*
+   Calls terminate() directly and after a delay of reaperTimeout() it calls kill()
+   if the process is still running.
+*/
+void QtcProcess::stop()
 {
     if (state() == QProcess::NotRunning)
         return;
 
-    d->sendControlSignal(ControlSignal::Terminate, killTimeout);
+    d->sendControlSignal(ControlSignal::Terminate, d->m_process->m_setup.m_reaperTimeout);
 }
 
 QString QtcProcess::locateBinary(const QString &binary)