Skip to content

Make pid an optional #372

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
Oct 29, 2025
+10 −7
Merged

Make pid an optional #372

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion vminitd/Sources/vminitd/ManagedContainer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ actor ManagedContainer {
private let bundle: ContainerizationOCI.Bundle
private var execs: [String: ManagedProcess] = [:]

var pid: Int32 {
var pid: Int32? {
self.initProcess.pid
}

Expand Down
12 changes: 8 additions & 4 deletions vminitd/Sources/vminitd/ManagedProcess.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ final class ManagedProcess: Sendable {
let io: IO
var waiters: [CheckedContinuation<ExitStatus, Never>] = []
var exitStatus: ExitStatus? = nil
var pid: Int32 = 0
var pid: Int32?
}

private static let ackPid = "AckPid"
Expand All @@ -67,7 +67,7 @@ final class ManagedProcess: Sendable {
private let bundle: ContainerizationOCI.Bundle
private let cgroupManager: Cgroup2Manager?

var pid: Int32 {
var pid: Int32? {
self.state.withLock {
$0.pid
}
Expand Down Expand Up @@ -286,12 +286,16 @@ extension ManagedProcess {

func kill(_ signal: Int32) throws {
try self.state.withLock {
guard let pid = $0.pid else {
throw ContainerizationError(.invalidState, message: "process PID is required")
}

guard $0.exitStatus == nil else {
return
}

self.log.info("sending signal \(signal) to process \($0.pid)")
guard Foundation.kill($0.pid, signal) == 0 else {
self.log.info("sending signal \(signal) to process \(pid)")
guard Foundation.kill(pid, signal) == 0 else {
throw POSIXError.fromErrno()
}
}
Expand Down
3 changes: 1 addition & 2 deletions vminitd/Sources/vminitd/ProcessSupervisor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,7 @@ actor ProcessSupervisor {
}

for proc in exitedProcesses {
let pid = proc.pid
if pid <= 0 {
guard let pid = proc.pid else {
continue
}

Expand Down