Skip to content

fix: reap zombie children before exit in sig_crash signal handler (BUG-371743) #231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mhduiy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: reap zombie children before exit in sig_crash signal handler (BUG-371743) #231

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/dde-session/impl/sessionmanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

#include <unistd.h>
#include <signal.h>
#include <sys/wait.h>
#include <xcb/xcb.h>

using namespace Dtk::Core;
Expand Down Expand Up @@ -630,7 +631,10 @@ void SessionManager::launchAutostopScripts()
const QFileInfoList &fileInfos = scriptDir.entryInfoList(QDir::Files);
for (auto info : fileInfos) {
qDebug() << "[autostop] script will be launched: " << info.absoluteFilePath();
EXEC_COMMAND("/bin/bash", QStringList() << "-c" << info.absoluteFilePath());
int exitCode = QProcess::execute("/bin/bash", QStringList() << "-c" << info.absoluteFilePath());
if (exitCode != 0) {
qWarning() << "failed to run autostop script:" << info.absoluteFilePath();
}
}
}
}
Expand Down Expand Up @@ -871,6 +875,11 @@ void SessionManager::setDPMSMode(bool on)
[[noreturn]] void sig_crash(int sig) {
Q_UNUSED(sig);
SessionManager::instance()->doLogout();
// exit() 不会调用栈上局部对象（如 EXEC_COMMAND 宏创建的 QProcess）的析构函数，
// 若信号在 waitForFinished(-1) 阻塞期间到达，子进程退出后将因未被回收而成为僵尸进程。
// waitpid 是异步信号安全函数，WNOHANG 保证不阻塞：仅回收已退出的子进程，
// 仍在运行的子进程在 dde-session 退出后会被 reparent 到 init/systemd 回收。
while (waitpid(-1, nullptr, WNOHANG) > 0) { }
exit(-1);
};

Expand Down
Loading