From bfc9a9b3e4ac60010f5eeeafdc90dc56ca1d3236 Mon Sep 17 00:00:00 2001 From: xlei1030 Date: Mon, 14 Mar 2022 17:47:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9appspawn=20?= =?UTF-8?q?=E5=83=B5=E5=B0=B8=E8=BF=9B=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xlei1030 --- src/appspawn_server.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/appspawn_server.cpp b/src/appspawn_server.cpp index d8a0cfb7..d15bf658 100755 --- a/src/appspawn_server.cpp +++ b/src/appspawn_server.cpp @@ -195,7 +195,6 @@ void AppSpawnServer::HandleSignal() sigset_t mask; sigemptyset(&mask); sigaddset(&mask, SIGCHLD); - sigaddset(&mask, SIGHUP); sigprocmask(SIG_BLOCK, &mask, nullptr); int signalFd = signalfd(-1, &mask, SFD_CLOEXEC); if (signalFd < 0) { @@ -260,7 +259,6 @@ static void ClearEnvironment(void) sigset_t mask; sigemptyset(&mask); sigaddset(&mask, SIGCHLD); - sigaddset(&mask, SIGTERM); sigprocmask(SIG_UNBLOCK, &mask, nullptr); return; } -- Gitee From 36b576b63bc6b612da23bc69f6db2a1965a7b963 Mon Sep 17 00:00:00 2001 From: xlei1030 Date: Mon, 14 Mar 2022 22:33:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=EF=BC=9A=20=E5=A2=9E=E5=8A=A0pid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xlei1030 --- src/appspawn_server.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/appspawn_server.cpp b/src/appspawn_server.cpp index d15bf658..2cf3992f 100755 --- a/src/appspawn_server.cpp +++ b/src/appspawn_server.cpp @@ -206,6 +206,12 @@ void AppSpawnServer::HandleSignal() if (ret != sizeof(fdsi) || fdsi.ssi_signo != SIGCHLD) { continue; } + pid_t pid; + int status; + while ((pid = waitpid(-1, &status, WNOHANG)) > 0) { + APPSPAWN_LOGE("HandleSignal: %d", pid); + } + std::lock_guard lock(mut_); isChildDie_ = true; childPid_ = fdsi.ssi_pid; -- Gitee