fix comments

Author: realrajaryan

Sources/Containerization/SandboxContext/SandboxContext.pb.swift

@@ -44,7 +44,6 @@ public enum Com_Apple_Containerization_Sandbox_V3_FileSystemEventType: SwiftProt
   case link // = 2
   case unlink // = 3
   case modify // = 4
-  case undefined // = 99
   case UNRECOGNIZED(Int)
 
   public init() {
@@ -58,7 +57,6 @@ public enum Com_Apple_Containerization_Sandbox_V3_FileSystemEventType: SwiftProt
     case 2: self = .link
     case 3: self = .unlink
     case 4: self = .modify
-    case 99: self = .undefined
     default: self = .UNRECOGNIZED(rawValue)
     }
   }
@@ -70,7 +68,6 @@ public enum Com_Apple_Containerization_Sandbox_V3_FileSystemEventType: SwiftProt
     case .link: return 2
     case .unlink: return 3
     case .modify: return 4
-    case .undefined: return 99
     case .UNRECOGNIZED(let i): return i
     }
   }
@@ -82,7 +79,6 @@ public enum Com_Apple_Containerization_Sandbox_V3_FileSystemEventType: SwiftProt
     .link,
     .unlink,
     .modify,
-    .undefined,
   ]
 
 }
@@ -1100,7 +1096,6 @@ extension Com_Apple_Containerization_Sandbox_V3_FileSystemEventType: SwiftProtob
     2: .same(proto: "LINK"),
     3: .same(proto: "UNLINK"),
     4: .same(proto: "MODIFY"),
-    99: .same(proto: "UNDEFINED"),
   ]
 }
 

Sources/Containerization/SandboxContext/SandboxContext.proto

@@ -291,7 +291,6 @@ enum FileSystemEventType {
   LINK = 2;
   UNLINK = 3;
   MODIFY = 4;
-  UNDEFINED = 99;
 }
 
 message NotifyFileSystemEventRequest {

Sources/Containerization/Vminitd.swift

@@ -273,6 +273,8 @@ extension Vminitd: VirtualMachineAgent {
 
 /// Vminitd specific rpcs.
 extension Vminitd {
+    public typealias FileSystemEventRequest = Com_Apple_Containerization_Sandbox_V3_NotifyFileSystemEventRequest
+    public typealias FileSystemEventResponse = Com_Apple_Containerization_Sandbox_V3_NotifyFileSystemEventResponse
     /// Sets up an emulator in the guest.
     public func setupEmulator(binaryPath: String, configuration: Binfmt.Entry) async throws {
         let request = Com_Apple_Containerization_Sandbox_V3_SetupEmulatorRequest.with {
@@ -368,30 +370,44 @@ extension Vminitd {
         try await self.sync()
     }
 
-    /// Send a filesystem event notification to the guest.
+    /// Send filesystem event notifications to the guest
+    public func notifyFileSystemEvents(
+        _ events: [FileSystemEventRequest]
+    ) async throws -> [FileSystemEventResponse] {
+        let requests = AsyncStream<FileSystemEventRequest> { continuation in
+            for event in events {
+                continuation.yield(event)
+            }
+            continuation.finish()
+        }
+
+        let responses = client.notifyFileSystemEvent(requests)
+        var results: [FileSystemEventResponse] = []
+
+        for try await response in responses {
+            results.append(response)
+        }
+
+        guard results.count == events.count else {
+            throw ContainerizationError(.internalError, message: "Expected \(events.count) responses, got \(results.count)")
+        }
+
+        return results
+    }
+
     public func notifyFileSystemEvent(
         path: String,
         eventType: Com_Apple_Containerization_Sandbox_V3_FileSystemEventType,
         containerID: String
-    ) async throws -> Com_Apple_Containerization_Sandbox_V3_NotifyFileSystemEventResponse {
-        let request = Com_Apple_Containerization_Sandbox_V3_NotifyFileSystemEventRequest.with {
+    ) async throws -> FileSystemEventResponse {
+        let request = FileSystemEventRequest.with {
             $0.path = path
             $0.eventType = eventType
             $0.containerID = containerID
         }
 
-        let requests = AsyncStream<Com_Apple_Containerization_Sandbox_V3_NotifyFileSystemEventRequest> { continuation in
-            continuation.yield(request)
-            continuation.finish()
-        }
-
-        let responses = client.notifyFileSystemEvent(requests)
-
-        for try await response in responses {
-            return response
-        }
-
-        throw ContainerizationError(.internalError, message: "No response received from notifyFileSystemEvent")
+        let responses = try await notifyFileSystemEvents([request])
+        return responses[0]
     }
 }
 

Sources/Integration/Suite.swift

@@ -95,19 +95,6 @@ struct IntegrationSuite: AsyncParsableCommand {
             .appendingPathComponent(name)
     }
 
-    // Generate a simple hash from the image reference to ensure unique rootfs filenames
-    private static func hashImageReference(_ reference: String) -> String {
-        let hash =
-            reference.data(using: .utf8)?.withUnsafeBytes { bytes in
-                var hash: Int = 0
-                for byte in bytes {
-                    hash = hash &* 31 &+ Int(byte)
-                }
-                return hash & 0x7FFF_FFFF
-            } ?? 0
-        return String(format: "%08x", hash)
-    }
-
     func bootstrap(reference: String = "ghcr.io/linuxcontainers/alpine:3.20") async throws -> (
         rootfs: Containerization.Mount, vmm: VirtualMachineManager, image: Containerization.Image
     ) {
@@ -137,8 +124,8 @@ struct IntegrationSuite: AsyncParsableCommand {
         let platform = Platform(arch: "arm64", os: "linux", variant: "v8")
 
         let fs: Containerization.Mount = try await {
-            let imageHash = Self.hashImageReference(reference)
-            let fsPath = Self.testDir.appending(component: "rootfs-\(imageHash).ext4")
+            let truncatedHash = String(image.digest.suffix(12))
+            let fsPath = Self.testDir.appending(component: "rootfs-\(truncatedHash).ext4")
             do {
                 let unpacker = EXT4Unpacker(blockSizeInBytes: 2.gib())
                 return try await unpacker.unpack(image, for: platform, at: fsPath)

Sources/Integration/VMTests.swift

@@ -355,7 +355,7 @@ extension IntegrationSuite {
         let id = "test-fsnotify-events"
 
         let bs = try await bootstrap(reference: "docker.io/library/node:18-alpine")
-        let directory = try createFSNotifyTestDirectory()
+        let directory = try createMountDirectory()
         let inotifyBuffer: IntegrationSuite.BufferWriter = BufferWriter()
         let container = try LinuxContainer(id, rootfs: bs.rootfs, vmm: bs.vmm) { config in
             config.process.arguments = [
@@ -378,46 +378,27 @@ extension IntegrationSuite {
         let agent = Vminitd(connection: connection, group: group)
         try await Task.sleep(for: .seconds(1))
 
-        // Test 1: CREATE event on existing file
-        print("Sending CREATE event...")
         let createResponse = try await agent.notifyFileSystemEvent(
-            path: "/mnt/existing.txt",
+            path: "/mnt/hi.txt",
             eventType: .create,
             containerID: id
         )
 
         guard createResponse.success else {
             throw IntegrationError.assert(msg: "CREATE event failed: \(createResponse.error)")
         }
-        print("CREATE event succeeded")
 
-        // Test 2: MODIFY event on existing file
-        print("Sending MODIFY event...")
         let modifyResponse = try await agent.notifyFileSystemEvent(
-            path: "/mnt/existing.txt",
+            path: "/mnt/hi.txt",
             eventType: .modify,
             containerID: id
         )
         guard modifyResponse.success else {
             throw IntegrationError.assert(msg: "MODIFY event failed: \(modifyResponse.error)")
         }
-        print("MODIFY event succeeded")
 
-        // Wait for events to be processed
-        print("Waiting for inotify events to be detected...")
         try await Task.sleep(for: .seconds(1))
 
-        let inotifyOutput = String(data: inotifyBuffer.data, encoding: .utf8) ?? ""
-        print("=== Final Container Output ===")
-        print(inotifyOutput)
-        print("=== End Container Output ===")
-
-        // Verify that inotify detected the modify event
-        guard inotifyOutput.contains("change") && inotifyOutput.contains("existing.txt") else {
-            throw IntegrationError.assert(msg: "inotify did not detect FSNotify agent events. Output: '\(inotifyOutput)'")
-        }
-
-        // Test 3: DELETE event on non-existent file
         let deleteResponse = try await agent.notifyFileSystemEvent(
             path: "/mnt/nonexistent.txt",
             eventType: .delete,
@@ -427,27 +408,28 @@ extension IntegrationSuite {
             throw IntegrationError.assert(msg: "DELETE event failed: \(deleteResponse.error)")
         }
 
-        // Clean up
-        try await agent.close()
-        try await group.shutdownGracefully()
-        try await container.stop()
+        try await Task.sleep(for: .seconds(1))
 
-        print("All FSNotify events tested successfully")
-    }
+        let inotifyOutput = String(data: inotifyBuffer.data, encoding: .utf8) ?? ""
 
-    private func createFSNotifyTestDirectory() throws -> URL {
-        let dir = FileManager.default.uniqueTemporaryDirectory(create: true)
+        let expectedLines = ["change hi.txt", "change hi.txt"]
+        let actualLines = inotifyOutput.trimmingCharacters(in: .whitespacesAndNewlines).components(separatedBy: .newlines).filter { !$0.isEmpty }
 
-        // Create some test files and directories
-        try "initial content".write(to: dir.appendingPathComponent("existing.txt"), atomically: true, encoding: .utf8)
-        try "hello world".write(to: dir.appendingPathComponent("hello.txt"), atomically: true, encoding: .utf8)
+        guard actualLines.count >= expectedLines.count else {
+            throw IntegrationError.assert(msg: "Expected at least \(expectedLines.count) events, got \(actualLines.count). Output: '\(inotifyOutput)'")
+        }
 
-        // Create a subdirectory
-        let subdir = dir.appendingPathComponent("subdir")
-        try FileManager.default.createDirectory(at: subdir, withIntermediateDirectories: true)
-        try "nested file".write(to: subdir.appendingPathComponent("nested.txt"), atomically: true, encoding: .utf8)
+        let hasExpectedEvents = expectedLines.allSatisfy { expectedLine in
+            actualLines.contains(expectedLine)
+        }
 
-        return dir
+        guard hasExpectedEvents else {
+            throw IntegrationError.assert(msg: "Expected events not found. Expected: \(expectedLines), Actual: \(actualLines)")
+        }
+
+        try await agent.close()
+        try await group.shutdownGracefully()
+        try await container.stop()
     }
 
     private func createMountDirectory() throws -> URL {