Better IO handling

Signed-off-by: Aditya Ramani <a_ramani@apple.com>

Author: adityaramani

Sources/Integration/ProcessTests.swift

@@ -204,7 +204,7 @@ extension IntegrationSuite {
 
                         let status = try await exec.wait()
                         if status != 0 {
-                            throw IntegrationError.assert(msg: "process \(idx) status for  \(status) != 0")
+                            throw IntegrationError.assert(msg: "process \(idx) status \(status) != 0")
                         }
                         var hasher = SHA256()
                         hasher.update(data: buffer.data)

vminitd/Sources/vminitd/ManagedProcess.swift

@@ -132,7 +132,11 @@ final class ManagedProcess: Sendable {
 extension ManagedProcess {
     func start() throws -> Int32 {
         try self.lock.withLock {
-            log.debug("starting managed process")
+            log.debug(
+                "starting managed process",
+                metadata: [
+                    "id": "\(id)"
+                ])
 
             // Start the underlying process.
             try process.start()
@@ -155,7 +159,8 @@ extension ManagedProcess {
             log.debug(
                 "started managed process",
                 metadata: [
-                    "pid": "\(i)"
+                    "pid": "\(i)",
+                    "id": "\(id)",
                 ])
 
             return i

vminitd/Sources/vminitd/ProcessSupervisor.swift

@@ -64,10 +64,15 @@ actor ProcessSupervisor {
         let exited = Reaper.reap()
         self.log?.debug("finished wait4 of \(exited.count) processes")
 
-        for proc in processes {
-            let pid = proc.pid
-            self.log?.debug("checking for exit of managed process", metadata: ["pid": "\(pid)", "exits": "\(exited)"])
+        self.log?.debug("checking for exit of managed process", metadata: ["exits": "\(exited)", "processes": "\(processes.count)"])
+        let exitedProcesses = self.processes.filter { proc in
+            exited.contains { pid, _ in
+                proc.pid == pid
+            }
+        }
 
+        for proc in exitedProcesses {
+            let pid = proc.pid
             if pid <= 0 {
                 continue
             }
@@ -80,7 +85,6 @@ actor ProcessSupervisor {
                         "status": "\(status)",
                         "count": "\(processes.count - 1)",
                     ])
-
                 proc.setExit(status)
                 self.processes.removeAll(where: { $0.pid == pid })
             }
@@ -95,7 +99,6 @@ actor ProcessSupervisor {
 
         do {
             self.processes.append(process)
-
             return try process.start()
         } catch {
             self.log?.error("process start failed \(error)", metadata: ["process-id": "\(process.id)"])

vminitd/Sources/vminitd/StandardIO.swift

@@ -78,7 +78,7 @@ final class StandardIO: ManagedProcess.IO & Sendable {
                 port: stdinPort,
                 cid: VsockType.hostCID
             )
-            let stdinSocket = try Socket(type: type)
+            let stdinSocket = try Socket(type: type, closeOnDeinit: false)
             try stdinSocket.connect()
             self.stdinSocket = stdinSocket
 
@@ -93,7 +93,8 @@ final class StandardIO: ManagedProcess.IO & Sendable {
                 port: stdoutPort,
                 cid: VsockType.hostCID
             )
-            let stdoutSocket = try Socket(type: type)
+            // These fd's get closed when cleanupRelay is called
+            let stdoutSocket = try Socket(type: type, closeOnDeinit: false)
             try stdoutSocket.connect()
             self.stdoutSocket = stdoutSocket
 
@@ -108,7 +109,7 @@ final class StandardIO: ManagedProcess.IO & Sendable {
                 port: stderrPort,
                 cid: VsockType.hostCID
             )
-            let stderrSocket = try Socket(type: type)
+            let stderrSocket = try Socket(type: type, closeOnDeinit: false)
             try stderrSocket.connect()
             self.stderrSocket = stderrSocket
 

vminitd/Sources/vminitd/TerminalIO.swift

@@ -62,7 +62,7 @@ final class TerminalIO: ManagedProcess.IO & Sendable {
                 port: stdinPort,
                 cid: VsockType.hostCID
             )
-            let stdinSocket = try Socket(type: type)
+            let stdinSocket = try Socket(type: type, closeOnDeinit: false)
             try stdinSocket.connect()
             self.stdinSocket = stdinSocket
 
@@ -77,7 +77,7 @@ final class TerminalIO: ManagedProcess.IO & Sendable {
                 port: stdoutPort,
                 cid: VsockType.hostCID
             )
-            let stdoutSocket = try Socket(type: type)
+            let stdoutSocket = try Socket(type: type, closeOnDeinit: false)
             try stdoutSocket.connect()
             self.stdoutSocket = stdoutSocket