Merge branch 'main' into too-many-bytes

.editorconfig

@@ -0,0 +1,8 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true

.github/workflows/pull_request_label.yml

@@ -2,7 +2,7 @@ name: PR label
 
 on:
     pull_request:
-        types: [labeled, unlabeled]
+        types: [labeled, unlabeled, opened, reopened, synchronize]
 
 jobs:
     semver-label-check:
@@ -12,5 +12,7 @@ jobs:
         steps:
             - name: Checkout repository
               uses: actions/checkout@v4
+              with:
+                  persist-credentials: false
             - name: Check for Semantic Version label
               uses: ./.github/actions/pull_request_semver_label_checker/

.github/workflows/soundness.yml

@@ -59,6 +59,7 @@ jobs:
       with:
         # We need to fetch everything otherwise only the head commit will be fetched.
         fetch-depth: 0
+        persist-credentials: false
     - name: Mark the workspace as safe
       # https://github.com/actions/checkout/issues/766
       run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
@@ -75,6 +76,8 @@ jobs:
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4
+      with:
+          persist-credentials: false
     - name: Run documentation check
       run: |
         apt-get -qq update && apt-get -qq -y install curl yq
@@ -88,6 +91,8 @@ jobs:
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4
+      with:
+          persist-credentials: false
     - name: Run unacceptable language check
       env:
         UNACCEPTABLE_WORD_LIST: ${{ inputs.unacceptable_language_check_word_list}}
@@ -101,6 +106,8 @@ jobs:
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4
+      with:
+          persist-credentials: false
     - name: Run license header check
       env:
         PROJECT_NAME: ${{ inputs.license_header_check_project_name }}
@@ -114,6 +121,8 @@ jobs:
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4
+      with:
+          persist-credentials: false
     - name: Run broken symlinks check
       run: curl -s https://raw.githubusercontent.com/apple/swift-nio/main/scripts/check-broken-symlinks.sh | bash
 
@@ -127,6 +136,8 @@ jobs:
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4
+      with:
+          persist-credentials: false
     - name: Mark the workspace as safe
     # https://github.com/actions/checkout/issues/766
       run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
@@ -143,6 +154,8 @@ jobs:
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4
+      with:
+          persist-credentials: false
     - name: Mark the workspace as safe
     # https://github.com/actions/checkout/issues/766
       run: git config --global --add safe.directory ${GITHUB_WORKSPACE}

.github/workflows/swift_6_language_mode.yml

@@ -17,6 +17,8 @@ jobs:
         steps:
             - name: Checkout repository
               uses: actions/checkout@v4
+              with:
+                  persist-credentials: false
             - name: Set the language mode
               run: swift package tools-version --set 6.0
             - name: Build with Swift 6 language mode

.github/workflows/swift_matrix.yml

@@ -81,6 +81,11 @@ jobs:
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4
+      with:
+          persist-credentials: false
+    - name: Mark the workspace as safe
+    # https://github.com/actions/checkout/issues/766
+      run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
     - name: Run matrix job
       if: ${{ matrix.swift.enabled }}
       env:

.licenseignore

@@ -7,6 +7,7 @@
 .mailmap
 .spi.yml
 .swift-format
+.editorconfig
 .github/*
 *.md
 *.txt

Benchmarks/Benchmarks/NIOCoreBenchmarks/Benchmarks.swift

@@ -23,7 +23,12 @@ let benchmarks = {
 
     Benchmark(
         "NIOAsyncChannel.init",
-        configuration: Benchmark.Configuration(metrics: defaultMetrics)
+        configuration: .init(
+            metrics: defaultMetrics,
+            scalingFactor: .kilo,
+            maxDuration: .seconds(10_000_000),
+            maxIterations: 10
+        )
     ) { benchmark in
         // Elide the cost of the 'EmbeddedChannel'. It's only used for its pipeline.
         var channels: [EmbeddedChannel] = []

Benchmarks/Benchmarks/NIOPosixBenchmarks/Benchmarks.swift

@@ -26,8 +26,9 @@ let benchmarks = {
         "TCPEcho",
         configuration: .init(
             metrics: defaultMetrics,
-            timeUnits: .milliseconds,
-            scalingFactor: .mega
+            scalingFactor: .mega,
+            maxDuration: .seconds(10_000_000),
+            maxIterations: 5
         )
     ) { benchmark in
         try runTCPEcho(
@@ -43,8 +44,9 @@ let benchmarks = {
         "TCPEchoAsyncChannel",
         configuration: .init(
             metrics: defaultMetrics,
-            timeUnits: .milliseconds,
             scalingFactor: .mega,
+            maxDuration: .seconds(10_000_000),
+            maxIterations: 5,
             // We are expecting a bit of allocation variance due to an allocation
             // in the Concurrency runtime which happens when resuming a continuation.
             thresholds: [.mallocCountTotal: .init(absolute: [.p90: 2000])],

Benchmarks/Thresholds/5.10/NIOCoreBenchmarks.NIOAsyncChannel.init.p90.json

@@ -1,3 +1,3 @@
 {
-  "mallocCountTotal" : 8
-}
+  "mallocCountTotal" : 8000
+}

Benchmarks/Thresholds/5.10/NIOPosixBenchmarks.TCPEcho.p90.json

@@ -1,3 +1,3 @@
 {
-  "mallocCountTotal" : 108
+  "mallocCountTotal" : 555
 }

Benchmarks/Thresholds/5.10/NIOPosixBenchmarks.TCPEchoAsyncChannel.p90.json

@@ -1,3 +1,3 @@
 {
-  "mallocCountTotal" : 165000
-}
+  "mallocCountTotal" : 164375
+}

Benchmarks/Thresholds/5.8/NIOCoreBenchmarks.NIOAsyncChannel.init.p90.json

@@ -1,3 +1,3 @@
 {
-  "mallocCountTotal" : 8
-}
+  "mallocCountTotal" : 8000
+}

Benchmarks/Thresholds/5.8/NIOPosixBenchmarks.TCPEcho.p90.json

@@ -1,3 +1,3 @@
 {
-  "mallocCountTotal" : 110
+  "mallocCountTotal" : 556
 }

Benchmarks/Thresholds/5.9/NIOCoreBenchmarks.NIOAsyncChannel.init.p90.json

@@ -1,3 +1,3 @@
 {
-  "mallocCountTotal" : 8
-}
+  "mallocCountTotal" : 8000
+}

Benchmarks/Thresholds/5.9/NIOPosixBenchmarks.TCPEcho.p90.json

@@ -1,3 +1,3 @@
 {
-  "mallocCountTotal" : 110
+  "mallocCountTotal" : 556
 }

Benchmarks/Thresholds/5.9/NIOPosixBenchmarks.TCPEchoAsyncChannel.p90.json

@@ -1,3 +1,3 @@
 {
-  "mallocCountTotal" : 164000
-}
+  "mallocCountTotal" : 164381
+}

Benchmarks/Thresholds/nightly-6.0/NIOCoreBenchmarks.NIOAsyncChannel.init.p90.json

@@ -1,3 +1,3 @@
 {
-  "mallocCountTotal" : 8
-}
+  "mallocCountTotal" : 8000
+}

Benchmarks/Thresholds/nightly-6.0/NIOPosixBenchmarks.TCPEcho.p90.json

@@ -1,3 +1,3 @@
 {
-  "mallocCountTotal" : 108
+  "mallocCountTotal" : 548
 }

Benchmarks/Thresholds/nightly-6.0/NIOPosixBenchmarks.TCPEchoAsyncChannel.p90.json

@@ -1,3 +1,3 @@
 {
-  "mallocCountTotal" : 165000
-}
+  "mallocCountTotal" : 164376
+}

Benchmarks/Thresholds/nightly-main/NIOCoreBenchmarks.NIOAsyncChannel.init.p90.json

@@ -1,3 +1,3 @@
 {
-  "mallocCountTotal" : 8
-}
+  "mallocCountTotal" : 8000
+}

Benchmarks/Thresholds/nightly-main/NIOPosixBenchmarks.TCPEcho.p90.json

@@ -1,3 +1,3 @@
 {
-  "mallocCountTotal" : 108
+  "mallocCountTotal" : 548
 }

Benchmarks/Thresholds/nightly-main/NIOPosixBenchmarks.TCPEchoAsyncChannel.p90.json

@@ -1,3 +1,3 @@
 {
-  "mallocCountTotal" : 165000
-}
+  "mallocCountTotal" : 164371
+}

Package.swift

@@ -15,6 +15,10 @@
 
 import PackageDescription
 
+// Used only for environment variables, does not make its way
+// into the product code.
+import class Foundation.ProcessInfo
+
 let swiftAtomics: PackageDescription.Target.Dependency = .product(name: "Atomics", package: "swift-atomics")
 let swiftCollections: PackageDescription.Target.Dependency = .product(name: "DequeModule", package: "swift-collections")
 let swiftSystem: PackageDescription.Target.Dependency = .product(
@@ -23,6 +27,24 @@ let swiftSystem: PackageDescription.Target.Dependency = .product(
     condition: .when(platforms: [.macOS, .iOS, .tvOS, .watchOS, .linux, .android])
 )
 
+let strictConcurrencyDevelopment = false
+
+let strictConcurrencySettings: [SwiftSetting] = {
+    var initialSettings: [SwiftSetting] = []
+    initialSettings.append(contentsOf: [
+        .enableUpcomingFeature("StrictConcurrency"),
+        .enableUpcomingFeature("InferSendableFromCaptures"),
+    ])
+
+    if strictConcurrencyDevelopment {
+        // -warnings-as-errors here is a workaround so that IDE-based development can
+        // get tripped up on -require-explicit-sendable.
+        initialSettings.append(.unsafeFlags(["-require-explicit-sendable", "-warnings-as-errors"]))
+    }
+
+    return initialSettings
+}()
+
 // This doesn't work when cross-compiling: the privacy manifest will be included in the Bundle and
 // Foundation will be linked. This is, however, strictly better than unconditionally adding the
 // resource.
@@ -66,10 +88,12 @@ let package = Package(
             ]
         ),
         .target(
-            name: "_NIODataStructures"
+            name: "_NIODataStructures",
+            swiftSettings: strictConcurrencySettings
         ),
         .target(
-            name: "_NIOBase64"
+            name: "_NIOBase64",
+            swiftSettings: strictConcurrencySettings
         ),
         .target(
             name: "NIOEmbedded",
@@ -150,7 +174,8 @@ let package = Package(
             name: "NIOConcurrencyHelpers",
             dependencies: [
                 "CNIOAtomics"
-            ]
+            ],
+            swiftSettings: strictConcurrencySettings
         ),
         .target(
             name: "NIOHTTP1",
@@ -415,15 +440,18 @@ let package = Package(
             dependencies: [
                 "NIOConcurrencyHelpers",
                 "NIOCore",
-            ]
+            ],
+            swiftSettings: strictConcurrencySettings
         ),
         .testTarget(
             name: "NIODataStructuresTests",
-            dependencies: ["_NIODataStructures"]
+            dependencies: ["_NIODataStructures"],
+            swiftSettings: strictConcurrencySettings
         ),
         .testTarget(
             name: "NIOBase64Tests",
-            dependencies: ["_NIOBase64"]
+            dependencies: ["_NIOBase64"],
+            swiftSettings: strictConcurrencySettings
         ),
         .testTarget(
             name: "NIOHTTP1Tests",

Sources/NIOConcurrencyHelpers/NIOAtomic.swift

@@ -19,6 +19,23 @@ import CNIOAtomics
 /// **Do not add conformance to this protocol for arbitrary types**. Only a small range
 /// of types have appropriate atomic operations supported by the CPU, and those types
 /// already have conformances implemented.
+#if compiler(>=6.0)
+@preconcurrency
+public protocol NIOAtomicPrimitive {
+    associatedtype AtomicWrapper
+    static var nio_atomic_create_with_existing_storage: @Sendable (UnsafeMutablePointer<AtomicWrapper>, Self) -> Void {
+        get
+    }
+    static var nio_atomic_compare_and_exchange: @Sendable (UnsafeMutablePointer<AtomicWrapper>, Self, Self) -> Bool {
+        get
+    }
+    static var nio_atomic_add: @Sendable (UnsafeMutablePointer<AtomicWrapper>, Self) -> Self { get }
+    static var nio_atomic_sub: @Sendable (UnsafeMutablePointer<AtomicWrapper>, Self) -> Self { get }
+    static var nio_atomic_exchange: @Sendable (UnsafeMutablePointer<AtomicWrapper>, Self) -> Self { get }
+    static var nio_atomic_load: @Sendable (UnsafeMutablePointer<AtomicWrapper>) -> Self { get }
+    static var nio_atomic_store: @Sendable (UnsafeMutablePointer<AtomicWrapper>, Self) -> Void { get }
+}
+#else
 public protocol NIOAtomicPrimitive {
     associatedtype AtomicWrapper
     static var nio_atomic_create_with_existing_storage: (UnsafeMutablePointer<AtomicWrapper>, Self) -> Void { get }
@@ -29,6 +46,7 @@ public protocol NIOAtomicPrimitive {
     static var nio_atomic_load: (UnsafeMutablePointer<AtomicWrapper>) -> Self { get }
     static var nio_atomic_store: (UnsafeMutablePointer<AtomicWrapper>, Self) -> Void { get }
 }
+#endif
 
 extension Bool: NIOAtomicPrimitive {
     public typealias AtomicWrapper = catmc_nio_atomic__Bool