Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-24 10:52:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kinit: tweak the processes termination

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-12-05 19:54:32 +02:00
parent a320630b94
commit 54690e0d55
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
kinit/klauncher_adaptor.cpp
View file

@ -37,7 +37,12 @@
static const int s_eventstime = 250; static const int s_eventstime = 250;
static const int s_sleeptime = 50; static const int s_sleeptime = 50;
// NOTE: keep in sync with:
// kde-workspace/kwin/effects/startupfeedback/startupfeedback.cpp
// kde-workspace/kcontrol/launch/kcmlaunch.cpp
static const qint64 s_servicetimeout = 10000; // 10sec static const qint64 s_servicetimeout = 10000; // 10sec
// klauncher is the last process to quit in a session so 5sec for each process is more than enough
static const qint64 s_processtimeout = 5000; // 5sec
static inline bool isPIDAlive(const pid_t pid) static inline bool isPIDAlive(const pid_t pid)
{ {
@ -66,7 +71,11 @@ KLauncherAdaptor::~KLauncherAdaptor()
QProcess* process = m_processes.takeLast(); QProcess* process = m_processes.takeLast();
disconnect(process, 0, this, 0); disconnect(process, 0, this, 0);
process->terminate(); process->terminate();
process->waitForFinished(); if (!process->waitForFinished(s_processtimeout)) {
kWarning() << "process still running" << process->pid();
// SIGKILL is non-ignorable
process->kill();
}
} }
} }