From 1b1cfdbaf370d38d4c16bc29da1f4d07ebc0cc46 Mon Sep 17 00:00:00 2001
From: Dmitry Kovba <dkovba@apple.com>
Date: Mon, 8 Sep 2025 23:15:22 -0700
Subject: [PATCH] Add comments clarifying thread-safety (#282)

---
 Sources/Containerization/ContainerManager.swift         | 7 ++-----
 Sources/Containerization/NATNetworkInterface.swift      | 1 +
 Sources/Containerization/UnixSocketRelay.swift          | 2 ++
 Sources/Containerization/VZVirtualMachineInstance.swift | 1 +
 Sources/ContainerizationOS/AsyncSignalHandler.swift     | 1 +
 Sources/Integration/ProcessTests.swift                  | 1 +
 6 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Sources/Containerization/ContainerManager.swift b/Sources/Containerization/ContainerManager.swift
index 69c3edd3..9d9ddb63 100644
--- a/Sources/Containerization/ContainerManager.swift
+++ b/Sources/Containerization/ContainerManager.swift
@@ -45,6 +45,7 @@ public struct ContainerManager: Sendable {
     @available(macOS 26.0, *)
     public struct VmnetNetwork: Network {
         private var allocator: Allocator
+        // `reference` isn't used concurrently.
         nonisolated(unsafe) private let reference: vmnet_network_ref
 
         /// The IPv4 subnet of this network.
@@ -94,6 +95,7 @@ public struct ContainerManager: Sendable {
             public let gateway: String?
             public let macAddress: String?
 
+            // `reference` isn't used concurrently.
             nonisolated(unsafe) private let reference: vmnet_network_ref
 
             public init(
@@ -478,9 +480,4 @@ extension CIDRAddress {
     }
 }
 
-@available(macOS 26.0, *)
-private struct SendableReference: Sendable {
-    nonisolated(unsafe) private let reference: vmnet_network_ref
-}
-
 #endif
diff --git a/Sources/Containerization/NATNetworkInterface.swift b/Sources/Containerization/NATNetworkInterface.swift
index 825d3cc0..845fc8f3 100644
--- a/Sources/Containerization/NATNetworkInterface.swift
+++ b/Sources/Containerization/NATNetworkInterface.swift
@@ -31,6 +31,7 @@ public final class NATNetworkInterface: Interface, Sendable {
     public let macAddress: String?
 
     @available(macOS 26, *)
+    // `reference` isn't used concurrently.
     public nonisolated(unsafe) let reference: vmnet_network_ref!
 
     @available(macOS 26, *)
diff --git a/Sources/Containerization/UnixSocketRelay.swift b/Sources/Containerization/UnixSocketRelay.swift
index d9ae971f..0cd75419 100644
--- a/Sources/Containerization/UnixSocketRelay.swift
+++ b/Sources/Containerization/UnixSocketRelay.swift
@@ -267,6 +267,7 @@ extension SocketRelay {
             )
         }
 
+        // `buf1` isn't used concurrently.
         nonisolated(unsafe) let buf1 = UnsafeMutableBufferPointer<UInt8>.allocate(capacity: Int(getpagesize()))
         connSource.setEventHandler {
             Self.fdCopyHandler(
@@ -278,6 +279,7 @@ extension SocketRelay {
         }
 
         nonisolated(unsafe) let buf2 = UnsafeMutableBufferPointer<UInt8>.allocate(capacity: Int(getpagesize()))
+        // `buf2` isn't used concurrently.
         vsockConnectionSource.setEventHandler {
             Self.fdCopyHandler(
                 buffer: buf2,
diff --git a/Sources/Containerization/VZVirtualMachineInstance.swift b/Sources/Containerization/VZVirtualMachineInstance.swift
index 72155fc3..0046bc18 100644
--- a/Sources/Containerization/VZVirtualMachineInstance.swift
+++ b/Sources/Containerization/VZVirtualMachineInstance.swift
@@ -68,6 +68,7 @@ struct VZVirtualMachineInstance: VirtualMachineInstance, Sendable {
         }
     }
 
+    // `vm` isn't used concurrently.
     private nonisolated(unsafe) let vm: VZVirtualMachine
     private let queue: DispatchQueue
     private let group: MultiThreadedEventLoopGroup
diff --git a/Sources/ContainerizationOS/AsyncSignalHandler.swift b/Sources/ContainerizationOS/AsyncSignalHandler.swift
index 895a1503..5f2fd328 100644
--- a/Sources/ContainerizationOS/AsyncSignalHandler.swift
+++ b/Sources/ContainerizationOS/AsyncSignalHandler.swift
@@ -53,6 +53,7 @@ public final class AsyncSignalHandler: Sendable {
 
     struct State: Sendable {
         var conts: [AsyncStream<Int32>.Continuation] = []
+        // `sources` isn't used concurrently.
         nonisolated(unsafe) var sources: [any DispatchSourceSignal] = []
     }
 
diff --git a/Sources/Integration/ProcessTests.swift b/Sources/Integration/ProcessTests.swift
index 7030cbe6..f8a46689 100644
--- a/Sources/Integration/ProcessTests.swift
+++ b/Sources/Integration/ProcessTests.swift
@@ -62,6 +62,7 @@ extension IntegrationSuite {
     }
 
     final class BufferWriter: Writer {
+        // `data` isn't used concurrently.
         nonisolated(unsafe) var data = Data()
 
         func write(_ data: Data) throws {