Skip to content

Fix hang in Linux process termination handler #33

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

Merged
merged 1 commit into from
Apr 30, 2025
Merged

Fix hang in Linux process termination handler #33

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
40 changes: 20 additions & 20 deletions Sources/Subprocess/Platforms/Subprocess+Linux.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,26 +281,26 @@ private extension siginfo_t {

private let setup: () = {
signalSource.setEventHandler {
_childProcessContinuations.withLock { continuations in
while true {
var siginfo = siginfo_t()
guard waitid(P_ALL, id_t(0), &siginfo, WEXITED) == 0 else {
return
}
var status: TerminationStatus? = nil
switch siginfo.si_code {
case .init(CLD_EXITED):
status = .exited(siginfo.si_status)
case .init(CLD_KILLED), .init(CLD_DUMPED):
status = .unhandledException(siginfo.si_status)
case .init(CLD_TRAPPED), .init(CLD_STOPPED), .init(CLD_CONTINUED):
// Ignore these signals because they are not related to
// process exiting
break
default:
fatalError("Unexpected exit status: \(siginfo.si_code)")
}
if let status = status {
while true {
var siginfo = siginfo_t()
guard waitid(P_ALL, id_t(0), &siginfo, WEXITED) == 0 || errno == EINTR else {
return
}
var status: TerminationStatus? = nil
switch siginfo.si_code {
case .init(CLD_EXITED):
status = .exited(siginfo.si_status)
case .init(CLD_KILLED), .init(CLD_DUMPED):
status = .unhandledException(siginfo.si_status)
case .init(CLD_TRAPPED), .init(CLD_STOPPED), .init(CLD_CONTINUED):
// Ignore these signals because they are not related to
// process exiting
break
default:
fatalError("Unexpected exit status: \(siginfo.si_code)")
}
if let status = status {
_childProcessContinuations.withLock { continuations in
let pid = siginfo.si_pid
if let existing = continuations.removeValue(forKey: pid),
case .continuation(let c) = existing
Expand Down