Merge branch 'main' into pooledbuffer-niocore

apple · Feb 5, 2025 · e61fe18 · e61fe18
2 parents c4c430a + 73e83ab
commit e61fe18
Show file tree

Hide file tree

Showing 57 changed files with 1,573 additions and 531 deletions.
diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -24,7 +24,11 @@ on:
         default: true
       linux_nightly_6_0_enabled:
         type: boolean
-        description: "Boolean to enable the Linux nightly 6.0 Swift version matrix job. Defaults to true."
+        description: "⚠️  Deprecated, we no longer run against 6.0 nightly."
+        default: false
+      linux_nightly_6_1_enabled:
+        type: boolean
+        description: "Boolean to enable the Linux nightly 6.1 Swift version matrix job. Defaults to true."
         default: true
       linux_nightly_main_enabled:
         type: boolean
@@ -33,15 +37,15 @@ on:
 
       windows_6_0_enabled:
         type: boolean
-        description: "Boolean to enable the Windows 6.0 Swift version matrix job. Defaults to true."
+        description: "Boolean to enable the Windows 6.0 Swift version matrix job. Currently has no effect!"  # TODO: implement Windows benchmarking
         default: false
       windows_nightly_6_0_enabled:
         type: boolean
-        description: "Boolean to enable the Windows nightly 6.0 Swift version matrix job. Defaults to true."
+        description: "⚠️  Deprecated, we no longer run against 6.0 nightly."  # TODO: implement Windows benchmarking
         default: false
       windows_nightly_main_enabled:
         type: boolean
-        description: "Boolean to enable the Windows nightly main Swift version matrix job. Defaults to true."
+        description: "Boolean to enable the Windows nightly main Swift version matrix job. Currently has no effect!"  # TODO: implement Windows benchmarking
         default: false
 
 jobs:
@@ -63,7 +67,7 @@ jobs:
           MATRIX_LINUX_5_9_ENABLED: ${{ inputs.linux_5_9_enabled }}
           MATRIX_LINUX_5_10_ENABLED: ${{ inputs.linux_5_10_enabled }}
           MATRIX_LINUX_6_0_ENABLED: ${{ inputs.linux_6_0_enabled }}
-          MATRIX_LINUX_NIGHTLY_6_0_ENABLED: ${{ inputs.linux_nightly_6_0_enabled }}
+          MATRIX_LINUX_NIGHTLY_6_1_ENABLED: ${{ inputs.linux_nightly_6_1_enabled }}
           MATRIX_LINUX_NIGHTLY_MAIN_ENABLED: ${{ inputs.linux_nightly_main_enabled }}
 
   benchmarks:

diff --git a/.github/workflows/cxx_interop.yml b/.github/workflows/cxx_interop.yml
@@ -16,6 +16,10 @@ on:
         description: "Boolean to enable the Linux 6.0 Swift version matrix job. Defaults to true."
         default: true
       linux_nightly_6_0_enabled:
+        type: boolean
+        description: "⚠️  Deprecated, we no longer run against 6.0 nightly."
+        default: false
+      linux_nightly_6_1_enabled:
         type: boolean
         description: "Boolean to enable the Linux nightly 6.0 Swift version matrix job. Defaults to true."
         default: true
@@ -30,7 +34,7 @@ on:
         default: false
       windows_nightly_6_0_enabled:
         type: boolean
-        description: "Boolean to enable the Windows nightly 6.0 Swift version matrix job. Defaults to false. Currently has no effect!"  # TODO: implement Windows Cxx compat checking
+        description: "⚠️  Deprecated, we no longer run against 6.0 nightly."  # TODO: implement Windows Cxx compat checking
         default: false
       windows_nightly_main_enabled:
         type: boolean
@@ -56,7 +60,7 @@ jobs:
           MATRIX_LINUX_5_9_ENABLED: ${{ inputs.linux_5_9_enabled }}
           MATRIX_LINUX_5_10_ENABLED: ${{ inputs.linux_5_10_enabled }}
           MATRIX_LINUX_6_0_ENABLED: ${{ inputs.linux_6_0_enabled }}
-          MATRIX_LINUX_NIGHTLY_6_0_ENABLED: ${{ inputs.linux_nightly_6_0_enabled }}
+          MATRIX_LINUX_NIGHTLY_6_1_ENABLED: ${{ inputs.linux_nightly_6_1_enabled }}
           MATRIX_LINUX_NIGHTLY_MAIN_ENABLED: ${{ inputs.linux_nightly_main_enabled }}
 
   cxx-interop:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -15,7 +15,7 @@ jobs:
       linux_5_9_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
       linux_5_10_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
       linux_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
-      linux_nightly_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
+      linux_nightly_6_1_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
       linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"
 
   cxx-interop:

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -19,7 +19,7 @@ jobs:
       linux_5_9_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
       linux_5_10_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
       linux_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
-      linux_nightly_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
+      linux_nightly_6_1_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
       linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"
 
   benchmarks:

diff --git a/.github/workflows/swift_matrix.yml b/.github/workflows/swift_matrix.yml
@@ -46,15 +46,26 @@ on:
         description: "The command of the 6.0 Swift version linux matrix job to execute."
       matrix_linux_nightly_6_0_enabled:
         type: boolean
-        description: "Boolean to enable the nightly 6.0 Swift version matrix job. Defaults to true."
+        description: "⚠️  Deprecated, we no longer run against 6.0 nightly."
         default: true
       matrix_linux_nightly_6_0_container_image:
         type: string
-        description: "Container image for the nightly 6.0 Swift version matrix job. Defaults to matching Swift Ubuntu image."
+        description: "⚠️  Deprecated, we no longer run against 6.0 nightly."
         default: "swiftlang/swift:nightly-6.0-jammy"
       matrix_linux_nightly_6_0_command_override:
         type: string
-        description: "The command of the nightly 6.0 Swift version linux matrix job to execute."
+        description: "⚠️  Deprecated, we no longer run against 6.0 nightly."
+      matrix_linux_nightly_6_1_enabled:
+        type: boolean
+        description: "Boolean to enable the nightly 6.1 Swift version matrix job. Defaults to true."
+        default: true
+      matrix_linux_nightly_6_1_container_image:
+        type: string
+        description: "Container image for the nightly 6.1 Swift version matrix job. Defaults to matching Swift Ubuntu image."
+        default: "swiftlang/swift:nightly-6.1-jammy"
+      matrix_linux_nightly_6_1_command_override:
+        type: string
+        description: "The command of the nightly 6.1 Swift version linux matrix job to execute."
       matrix_linux_nightly_main_enabled:
         type: boolean
         description: "Boolean to enable the nightly main Swift version matrix job. Defaults to true."
@@ -80,11 +91,18 @@ on:
         description: "The command of the 6.0 Swift version windows matrix job to execute."
       matrix_windows_nightly_6_0_enabled:
         type: boolean
-        description: "Boolean to enable the nightly 6.0 Swift version matrix job. Defaults to true."
+        description: "⚠️  Deprecated, we no longer run against 6.0 nightly."
         default: false
       matrix_windows_nightly_6_0_command_override:
         type: string
-        description: "The command of the nightly 6.0 Swift version windows matrix job to execute."
+        description: "⚠️  Deprecated, we no longer run against 6.0 nightly."
+      matrix_windows_nightly_6_1_enabled:
+        type: boolean
+        description: "Boolean to enable the nightly 6.1 Swift version matrix job. Defaults to true."
+        default: false
+      matrix_windows_nightly_6_1_command_override:
+        type: string
+        description: "The command of the nightly 6.1 Swift version windows matrix job to execute."
       matrix_windows_nightly_main_enabled:
         type: boolean
         description: "Boolean to enable the nightly main Swift version matrix job. Defaults to true."
@@ -116,9 +134,9 @@ jobs:
           - image: ${{ inputs.matrix_linux_6_0_container_image }}
             swift_version: "6.0"
             enabled: ${{ inputs.matrix_linux_6_0_enabled }}
-          - image: ${{ inputs.matrix_linux_nightly_6_0_container_image }}
-            swift_version: "nightly-6.0"
-            enabled: ${{ inputs.matrix_linux_nightly_6_0_enabled }}
+          - image: ${{ inputs.matrix_linux_nightly_6_1_container_image }}
+            swift_version: "nightly-6.1"
+            enabled: ${{ inputs.matrix_linux_nightly_6_1_enabled }}
           - image: ${{ inputs.matrix_linux_nightly_main_container_image }}
             swift_version: "nightly-main"
             enabled: ${{ inputs.matrix_linux_nightly_main_enabled }}
@@ -143,7 +161,7 @@ jobs:
           COMMAND_OVERRIDE_5_9: ${{ inputs.matrix_linux_5_9_command_override }}
           COMMAND_OVERRIDE_5_10: ${{ inputs.matrix_linux_5_10_command_override }}
           COMMAND_OVERRIDE_6_0: ${{ inputs.matrix_linux_6_0_command_override }}
-          COMMAND_OVERRIDE_NIGHTLY_6_0: ${{ inputs.matrix_linux_nightly_6_0_command_override }}
+          COMMAND_OVERRIDE_NIGHTLY_6_1: ${{ inputs.matrix_linux_nightly_6_1_command_override }}
           COMMAND_OVERRIDE_NIGHTLY_MAIN: ${{ inputs.matrix_linux_nightly_main_command_override }}
         run: |
           apt-get -qq update && apt-get -qq -y install curl
@@ -185,9 +203,9 @@ jobs:
       matrix:
         # We are specifying only the major and minor of the docker images to automatically pick up the latest patch release
         swift:
-          - image: swiftlang/swift:nightly-6.0-windowsservercore-1809
-            swift_version: "nightly-6.0"
-            enabled: ${{ inputs.matrix_windows_nightly_6_0_enabled }}
+          - image: swiftlang/swift:nightly-6.1-windowsservercore-1809
+            swift_version: "nightly-6.1"
+            enabled: ${{ inputs.matrix_windows_nightly_6_1_enabled }}
           - image: swiftlang/swift:nightly-main-windowsservercore-1809
             swift_version: "nightly-main"
             enabled: ${{ inputs.matrix_windows_nightly_main_enabled }}
@@ -207,4 +225,4 @@ jobs:
       - name: Run matrix job
         if: ${{ matrix.swift.enabled }}
         run: |
-          docker run --env SWIFT_VERSION="${{ matrix.swift.swift_version }}" --env COMMAND="${{ inputs.matrix_windows_command }}" --env COMMAND_OVERRIDE_NIGHTLY_6_0="${{ inputs.matrix_windows_nightly_6_0_command_override }}" --env COMMAND_OVERRIDE_NIGHTLY_MAIN="${{ inputs.matrix_windows_nightly_main_command_override }}" -v ${{ github.workspace }}:C:\source ${{ matrix.swift.image }} cmd /s /c  "swift --version & cd C:\source\ & powershell -File __check-matrix-job.ps1"
+          docker run --env SWIFT_VERSION="${{ matrix.swift.swift_version }}" --env COMMAND="${{ inputs.matrix_windows_command }}" --env COMMAND_OVERRIDE_NIGHTLY_6_1="${{ inputs.matrix_windows_nightly_6_1_command_override }}" --env COMMAND_OVERRIDE_NIGHTLY_MAIN="${{ inputs.matrix_windows_nightly_main_command_override }}" -v ${{ github.workspace }}:C:\source ${{ matrix.swift.image }} cmd /s /c  "swift --version & cd C:\source\ & powershell -File __check-matrix-job.ps1"
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
@@ -29,11 +29,19 @@ on:
         default: ""
       linux_nightly_6_0_enabled:
         type: boolean
-        description: "Boolean to enable the Linux nightly 6.0 Swift version matrix job. Defaults to true."
+        description: "⚠️  Deprecated, we no longer run against 6.0 nightly."
         default: true
       linux_nightly_6_0_arguments_override:
         type: string
-        description: "The arguments passed to swift test in the Linux nightly 6.0 Swift version matrix job."
+        description: "⚠️  Deprecated, we no longer run against 6.0 nightly."
+        default: ""
+      linux_nightly_6_1_enabled:
+        type: boolean
+        description: "Boolean to enable the Linux nightly 6.1 Swift version matrix job. Defaults to true."
+        default: true
+      linux_nightly_6_1_arguments_override:
+        type: string
+        description: "The arguments passed to swift test in the Linux nightly 6.1 Swift version matrix job."
         default: ""
       linux_nightly_main_enabled:
         type: boolean
@@ -46,23 +54,31 @@ on:
 
       windows_6_0_enabled:
         type: boolean
-        description: "Boolean to enable the Windows 6.0 Swift version matrix job. Defaults to true."
+        description: "Boolean to enable the Windows 6.0 Swift version matrix job. Defaults to false."
         default: false
       windows_6_0_arguments_override:
         type: string
         description: "The arguments passed to swift test in the Windows 6.0 Swift version matrix job."
         default: ""
       windows_nightly_6_0_enabled:
         type: boolean
-        description: "Boolean to enable the Windows nightly 6.0 Swift version matrix job. Defaults to true."
+        description: "⚠️  Deprecated, we no longer run against 6.0 nightly."
         default: false
       windows_nightly_6_0_arguments_override:
         type: string
-        description: "The arguments passed to swift test in the Windows nightly 6.0 Swift version matrix job."
+        description: "⚠️  Deprecated, we no longer run against 6.0 nightly."
+        default: ""
+      windows_nightly_6_1_enabled:
+        type: boolean
+        description: "Boolean to enable the Windows nightly 6.1 Swift version matrix job. Defaults to false."
+        default: false
+      windows_nightly_6_1_arguments_override:
+        type: string
+        description: "The arguments passed to swift test in the Windows nightly 6.1 Swift version matrix job."
         default: ""
       windows_nightly_main_enabled:
         type: boolean
-        description: "Boolean to enable the Windows nightly main Swift version matrix job. Defaults to true."
+        description: "Boolean to enable the Windows nightly main Swift version matrix job. Defaults to false."
         default: false
       windows_nightly_main_arguments_override:
         type: string
@@ -90,15 +106,15 @@ jobs:
           MATRIX_LINUX_5_10_COMMAND_ARGUMENTS: ${{ inputs.linux_5_10_arguments_override }}
           MATRIX_LINUX_6_0_ENABLED: ${{ inputs.linux_6_0_enabled }}
           MATRIX_LINUX_6_0_COMMAND_ARGUMENTS: ${{ inputs.linux_6_0_arguments_override }}
-          MATRIX_LINUX_NIGHTLY_6_0_ENABLED: ${{ inputs.linux_nightly_6_0_enabled }}
-          MATRIX_LINUX_NIGHTLY_6_0_COMMAND_ARGUMENTS: ${{ inputs.linux_nightly_6_0_arguments_override }}
+          MATRIX_LINUX_NIGHTLY_6_1_ENABLED: ${{ inputs.linux_nightly_6_1_enabled }}
+          MATRIX_LINUX_NIGHTLY_6_1_COMMAND_ARGUMENTS: ${{ inputs.linux_nightly_6_1_arguments_override }}
           MATRIX_LINUX_NIGHTLY_MAIN_ENABLED: ${{ inputs.linux_nightly_main_enabled }}
           MATRIX_LINUX_NIGHTLY_MAIN_COMMAND_ARGUMENTS: ${{ inputs.linux_nightly_main_arguments_override }}
           MATRIX_WINDOWS_COMMAND: "swift test"
           MATRIX_WINDOWS_6_0_ENABLED: ${{ inputs.windows_6_0_enabled }}
           MATRIX_WINDOWS_6_0_COMMAND_ARGUMENTS: ${{ inputs.windows_6_0_arguments_override }}
-          MATRIX_WINDOWS_NIGHTLY_6_0_ENABLED: ${{ inputs.windows_nightly_6_0_enabled }}
-          MATRIX_WINDOWS_NIGHTLY_6_0_COMMAND_ARGUMENTS: ${{ inputs.windows_nightly_6_0_arguments_override }}
+          MATRIX_WINDOWS_NIGHTLY_6_1_ENABLED: ${{ inputs.windows_nightly_6_1_enabled }}
+          MATRIX_WINDOWS_NIGHTLY_6_1_COMMAND_ARGUMENTS: ${{ inputs.windows_nightly_6_1_arguments_override }}
           MATRIX_WINDOWS_NIGHTLY_MAIN_ENABLED: ${{ inputs.windows_nightly_main_enabled }}
           MATRIX_WINDOWS_NIGHTLY_MAIN_COMMAND_ARGUMENTS: ${{ inputs.windows_nightly_main_arguments_override }}
 

diff --git a/Benchmarks/Thresholds/5.10/NIOPosixBenchmarks.TCPEcho.p90.json b/Benchmarks/Thresholds/5.10/NIOPosixBenchmarks.TCPEcho.p90.json
@@ -1,3 +1,3 @@
 {
-  "mallocCountTotal" : 107
+  "mallocCountTotal" : 108
 }
diff --git a/Benchmarks/Thresholds/5.9/NIOPosixBenchmarks.TCPEcho.p90.json b/Benchmarks/Thresholds/5.9/NIOPosixBenchmarks.TCPEcho.p90.json
@@ -1,3 +1,3 @@
 {
-  "mallocCountTotal" : 109
+  "mallocCountTotal" : 110
 }
diff --git a/Benchmarks/Thresholds/6.0/NIOPosixBenchmarks.TCPEcho.p90.json b/Benchmarks/Thresholds/6.0/NIOPosixBenchmarks.TCPEcho.p90.json
@@ -1,3 +1,3 @@
 {
-  "mallocCountTotal" : 107
+  "mallocCountTotal" : 108
 }
diff --git a/Benchmarks/Thresholds/nightly-6.0/NIOPosixBenchmarks.TCPEcho.p90.json b/Benchmarks/Thresholds/nightly-6.0/NIOPosixBenchmarks.TCPEcho.p90.json
diff --git a/...eBenchmarks.NIOAsyncChannel.init.p90.json → ...eBenchmarks.NIOAsyncChannel.init.p90.json b/...eBenchmarks.NIOAsyncChannel.init.p90.json → ...eBenchmarks.NIOAsyncChannel.init.p90.json
diff --git a/Benchmarks/Thresholds/nightly-6.1/NIOPosixBenchmarks.TCPEcho.p90.json b/Benchmarks/Thresholds/nightly-6.1/NIOPosixBenchmarks.TCPEcho.p90.json
@@ -0,0 +1,3 @@
+{
+  "mallocCountTotal" : 108
+}
diff --git a/...ixBenchmarks.TCPEchoAsyncChannel.p90.json → ...ixBenchmarks.TCPEchoAsyncChannel.p90.json b/...ixBenchmarks.TCPEchoAsyncChannel.p90.json → ...ixBenchmarks.TCPEchoAsyncChannel.p90.json
diff --git a/Benchmarks/Thresholds/nightly-main/NIOPosixBenchmarks.TCPEcho.p90.json b/Benchmarks/Thresholds/nightly-main/NIOPosixBenchmarks.TCPEcho.p90.json
@@ -1,3 +1,3 @@
 {
-  "mallocCountTotal" : 107
+  "mallocCountTotal" : 108
 }
diff --git a/IntegrationTests/tests_04_performance/Thresholds/5.10.json b/IntegrationTests/tests_04_performance/Thresholds/5.10.json
@@ -20,7 +20,7 @@
     "1000_udpbootstraps": 2050,
     "1000_udpconnections": 75050,
     "1_reqs_1000_conn": 384050,
-    "assume_isolated_scheduling_10000_executions": 20100,
+    "assume_isolated_scheduling_10000_executions": 89,
     "bytebuffer_lots_of_rw": 2050,
     "creating_10000_headers": 0,
     "decode_1000_ws_frames": 2050,
@@ -33,8 +33,8 @@
     "encode_1000_ws_frames_new_buffer_with_space": 3050,
     "encode_1000_ws_frames_new_buffer_with_space_with_mask": 5050,
     "execute_hop_10000_tasks": 0,
-    "flat_schedule_10000_tasks": 130100,
-    "flat_schedule_assume_isolated_10000_tasks": 110100,
+    "flat_schedule_10000_tasks": 100100,
+    "flat_schedule_assume_isolated_10000_tasks": 90100,
     "future_assume_isolated_lots_of_callbacks": 74050,
     "future_erase_result": 4050,
     "future_lots_of_callbacks": 74050,
@@ -48,12 +48,12 @@
     "read_10000_chunks_from_file": 110050,
     "schedule_10000_tasks": 40100,
     "schedule_and_run_10000_tasks": 50050,
-    "schedule_assume_isolated_10000_tasks": 50100,
+    "schedule_assume_isolated_10000_tasks": 40100,
     "schedule_with_deadline_10000_tasks": 40100,
-    "schedule_with_deadline_assume_isolated_10000_tasks": 50100,
+    "schedule_with_deadline_assume_isolated_10000_tasks": 40100,
     "scheduling_10000_executions": 89,
     "submit_10000_tasks": 20100,
-    "submit_assume_isolated_10000_tasks": 30100,
+    "submit_assume_isolated_10000_tasks": 20100,
     "udp_1000_reqs_1_conn": 6200,
     "udp_1_reqs_1000_conn": 162050
 }
diff --git a/IntegrationTests/tests_04_performance/Thresholds/5.9.json b/IntegrationTests/tests_04_performance/Thresholds/5.9.json
@@ -20,7 +20,7 @@
     "1000_udpbootstraps": 2050,
     "1000_udpconnections": 75050,
     "1_reqs_1000_conn": 393050,
-    "assume_isolated_scheduling_10000_executions": 20100,
+    "assume_isolated_scheduling_10000_executions": 89,
     "bytebuffer_lots_of_rw": 2050,
     "creating_10000_headers": 0,
     "decode_1000_ws_frames": 2050,
@@ -33,8 +33,8 @@
     "encode_1000_ws_frames_new_buffer_with_space": 3050,
     "encode_1000_ws_frames_new_buffer_with_space_with_mask": 5050,
     "execute_hop_10000_tasks": 0,
-    "flat_schedule_10000_tasks": 130100,
-    "flat_schedule_assume_isolated_10000_tasks": 110100,
+    "flat_schedule_10000_tasks": 100100,
+    "flat_schedule_assume_isolated_10000_tasks": 90100,
     "future_assume_isolated_lots_of_callbacks": 74050,
     "future_erase_result": 4050,
     "future_lots_of_callbacks": 74050,
@@ -48,12 +48,12 @@
     "read_10000_chunks_from_file": 110050,
     "schedule_10000_tasks": 40100,
     "schedule_and_run_10000_tasks": 50050,
-    "schedule_assume_isolated_10000_tasks": 50100,
+    "schedule_assume_isolated_10000_tasks": 40100,
     "schedule_with_deadline_10000_tasks": 40100,
-    "schedule_with_deadline_assume_isolated_10000_tasks": 50100,
+    "schedule_with_deadline_assume_isolated_10000_tasks": 40100,
     "scheduling_10000_executions": 89,
     "submit_10000_tasks": 20100,
-    "submit_assume_isolated_10000_tasks": 30100,
+    "submit_assume_isolated_10000_tasks": 20100,
     "udp_1000_reqs_1_conn": 6200,
     "udp_1_reqs_1000_conn": 162050
 }