Merge branch 'main' into event-completion-refactor

microsoft · Jan 2, 2025 · 10f8e7a · 10f8e7a
2 parents b8bf0ab + 453fb17
commit 10f8e7a
Show file tree

Hide file tree

Showing 22 changed files with 576 additions and 283 deletions.
diff --git a/.CodeQL.yml b/.CodeQL.yml
@@ -2,13 +2,14 @@
 # https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-docs/codeql/troubleshooting/bugs/generated-library-code
 # (Access restricted to Microsoft employees only.)
 
-# The following paths are explicitly classified which indicates they should no
+# The following paths are explicitly classified which indicates they should not
 # be analyzed by CodeQL and generate alerts.
 path_classifiers:
   docs:
     - docs
   generated:
+    - build
     - src/cs
     - src/generated
   submodules:
-    - subodules
+    - submodules
diff --git a/.github/workflows/build-darwin-framework.yml b/.github/workflows/build-darwin-framework.yml
@@ -25,3 +25,4 @@ jobs:
     uses: ./.github/workflows/build-reuse-darwin-framework.yml
     with:
       config: 'Release'
+      repo: ${{ github.repository }}
diff --git a/.github/workflows/build-reuse-darwin-framework.yml b/.github/workflows/build-reuse-darwin-framework.yml
@@ -7,6 +7,10 @@ on:
         required: false
         default: ''
         type: string
+      repo:
+        required: false
+        default: microsoft/msquic
+        type: string
       config:
         required: false
         default: 'Release'
@@ -46,6 +50,7 @@ jobs:
       arch: ${{ matrix.arch }}
       tls: ${{ inputs.tls }}
       static: ${{ inputs.static }}
+      repo: ${{ inputs.repo }}
 
   build-darwin-universal:
     name: Build Universal Binaries 
@@ -55,7 +60,7 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       with:
-        repository: microsoft/msquic
+        repository: ${{ inputs.repo}}
         ref: ${{ inputs.ref }}
     - name: Download Build Artifacts (x64)
       uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
@@ -92,7 +97,7 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       with:
-        repository: microsoft/msquic
+        repository: ${{ inputs.repo}}
         ref: ${{ inputs.ref }}
     - name: Download Build Artifacts (x64)
       uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
@@ -116,7 +121,7 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       with:
-        repository: microsoft/msquic
+        repository: ${{ inputs.repo}}
         ref: ${{ inputs.ref }}
     - name: Download Build Artifacts (iOS x64)
       uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16

diff --git a/.github/workflows/build-reuse-unix.yml b/.github/workflows/build-reuse-unix.yml
@@ -9,6 +9,10 @@ on:
         required: false
         default: ''
         type: string
+      repo:
+        required: false
+        default: microsoft/msquic
+        type: string
       config:
         required: false
         default: 'Release'
@@ -91,7 +95,7 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       with:
-        repository: microsoft/msquic
+        repository: ${{ inputs.repo}}
         ref: ${{ inputs.ref }}
     - name: Set ownership
       if: inputs.plat == 'linux'

diff --git a/.github/workflows/build-reuse-win.yml b/.github/workflows/build-reuse-win.yml
@@ -9,6 +9,10 @@ on:
         required: false
         default: ''
         type: string
+      repo:
+        required: false
+        default: microsoft/msquic
+        type: string
       config:
         required: false
         default: 'Release'
@@ -71,7 +75,7 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       with:
-        repository: microsoft/msquic
+        repository: ${{ inputs.repo}}
         ref: ${{ inputs.ref }}
     - name: Install Perl
       uses: shogo82148/actions-setup-perl@98dfedee230bcf1ee68d5b021931fc8d63f2016e

diff --git a/.github/workflows/build-reuse-winkernel.yml b/.github/workflows/build-reuse-winkernel.yml
@@ -9,6 +9,10 @@ on:
         required: false
         default: ''
         type: string
+      repo:
+        required: false
+        default: microsoft/msquic
+        type: string
       config:
         required: false
         default: 'Release'
@@ -60,7 +64,7 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       with:
-        repository: microsoft/msquic
+        repository: ${{ inputs.repo}}
         ref: ${{ inputs.ref }}
     - name: Prepare Machine
       shell: pwsh

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -53,6 +53,7 @@ jobs:
       arch: ${{ matrix.arch }}
       tls: ${{ matrix.tls }}
       static: ${{ matrix.static }}
+      repo: ${{ github.repository }}
 
   build-windows-kernel:
     name: WinKernel
@@ -72,6 +73,7 @@ jobs:
       os: ${{ matrix.os }}
       arch: ${{ matrix.arch }}
       tls: ${{ matrix.tls }}
+      repo: ${{ github.repository }}
 
   build-ubuntu-cross-compile:
     name: UbuntuArm
@@ -93,6 +95,7 @@ jobs:
       arch: ${{ matrix.arch }}
       tls: ${{ matrix.tls }}
       static: ${{ matrix.static }}
+      repo: ${{ github.repository }}
 
   build-ubuntu:
     name: Ubuntu
@@ -177,6 +180,7 @@ jobs:
       clang: ${{ matrix.clang }}
       codecheck: ${{ matrix.codecheck }}
       xdp: ${{ matrix.xdp }}
+      repo: ${{ github.repository }}
 
   build-darwin:
     name: MacOs
@@ -198,6 +202,7 @@ jobs:
       arch: ${{ matrix.arch }}
       tls: ${{ matrix.tls }}
       static: ${{ matrix.static }}
+      repo: ${{ github.repository }}
 
   build-nuget:
     name: Build Nuget Package

diff --git a/.github/workflows/cargo.yml b/.github/workflows/cargo.yml
@@ -17,6 +17,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest, macos-latest-xlarge]
+        features: ["", "--features static"]
     runs-on: ${{ matrix.os }}
     name: Cargo
     steps:
@@ -40,9 +41,13 @@ jobs:
     - name: Install Cargo
       if: runner.os == 'Linux'
       run: curl https://sh.rustup.rs -sSf | sh -s -- -y
+    - name: Cargo fmt
+      run: cargo fmt --all -- --check
+    - name: Cargo clippy
+      run: cargo clippy --all-targets -- -D warnings
     - name: Cargo build
-      run: cargo build --all
+      run: cargo build --all ${{ matrix.features }}
     - name: Cargo test
-      run: cargo test --all
+      run: cargo test --all ${{ matrix.features }}
     - name: Cargo Publish (dry run)
       run: cargo publish --dry-run --allow-dirty
diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml
@@ -37,6 +37,7 @@ jobs:
       tls: ${{ matrix.vec.tls }}
       sanitize: ${{ matrix.vec.sanitize }}
       build: ${{ matrix.vec.build }}
+      repo: ${{ github.repository }}
 
   bvt-winlatest:
     name: BVT WinPrerelease

diff --git a/.github/workflows/dotnet-test.yml b/.github/workflows/dotnet-test.yml
@@ -25,6 +25,7 @@ jobs:
     uses: ./.github/workflows/build-reuse-darwin-framework.yml
     with:
       config: 'Debug'
+      repo: ${{ github.repository }}
 
   build-linux:
     name: Ubuntu
@@ -45,6 +46,7 @@ jobs:
       arch: ${{ matrix.vec.arch }}
       tls: ${{ matrix.vec.tls }}
       xdp: ${{ matrix.vec.xdp }}
+      repo: ${{ github.repository }}
 
   build-windows:
     name: Windows
@@ -63,6 +65,7 @@ jobs:
       os: ${{ matrix.vec.os }}
       arch: ${{ matrix.vec.arch }}
       tls: ${{ matrix.vec.tls }}
+      repo: ${{ github.repository }}
 
   dotnet-test:
     name: DotNet Test

diff --git a/.github/workflows/package-reuse-linux.yml b/.github/workflows/package-reuse-linux.yml
@@ -75,6 +75,7 @@ jobs:
       clang: ${{ inputs.clang }}
       build: ${{ inputs.build }}
       xdp: ${{ inputs.xdp }}
+      repo: ${{ github.repository }}
 
   package:
     name: Package

diff --git a/.github/workflows/stress.yml b/.github/workflows/stress.yml
@@ -40,6 +40,7 @@ jobs:
       tls: ${{ matrix.vec.tls }}
       sanitize: ${{ matrix.vec.sanitize }}
       build: ${{ matrix.vec.build }}
+      repo: ${{ github.repository }}
 
   build-unix:
     name: Build Unix
@@ -66,6 +67,7 @@ jobs:
       sanitize: ${{ matrix.vec.sanitize }}
       build: ${{ matrix.vec.build }}
       xdp: ${{ matrix.vec.xdp }}
+      repo: ${{ github.repository }}
 
   stress:
     name: Stress

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -43,6 +43,7 @@ jobs:
       tls: ${{ matrix.vec.tls }}
       build: ${{ matrix.vec.build }}
       ref: ${{ inputs.ref || '' }}
+      repo: ${{ github.repository }}
 
   build-windows:
     name: Build WinUser
@@ -66,6 +67,7 @@ jobs:
       sanitize: ${{ matrix.vec.sanitize }}
       build: ${{ matrix.vec.build }}
       ref: ${{ inputs.ref || '' }}
+      repo: ${{ github.repository }}
 
   build-unix:
     name: Build Unix
@@ -94,6 +96,7 @@ jobs:
       build: ${{ matrix.vec.build }}
       xdp: ${{ matrix.vec.xdp }}
       ref: ${{ inputs.ref || '' }}
+      repo: ${{ github.repository }}
 
   bvt:
     name: BVT

diff --git a/.github/workflows/wan-perf.yml b/.github/workflows/wan-perf.yml
@@ -1,24 +1,24 @@
 name: WAN Perf
 
 on:
-  push:
-    branches:
-    - main
-    paths:
-    - .github/workflows/wan-perf.yml
-    - src/core/*
-    - src/platform/*
-    - src/perf/*
-  pull_request:
-    branches:
-    - main
-    paths:
-    - .github/workflows/wan-perf.yml
-    - src/core/*
-    - src/platform/*
-    - src/perf/*
-    - submodules/openssl/*
-
+  workflow_dispatch:
+#  push:
+#    branches:
+#    - main
+#    paths:
+#    - .github/workflows/wan-perf.yml
+#    - src/core/*
+#    - src/platform/*
+#    - src/perf/*
+#  pull_request:
+#    branches:
+#    - main
+#    paths:
+#    - .github/workflows/wan-perf.yml
+#    - src/core/*
+#    - src/platform/*
+#    - src/perf/*
+#    - submodules/openssl/*
 concurrency:
   # Cancel any workflow currently in progress for the same PR.
   # Allow running concurrently with any other commits.
@@ -92,11 +92,11 @@ jobs:
         name: bin
         path: artifacts/bin
     - name: Run WAN Perf (QUIC only)
-      if: ${{ github.event_name == 'pull_request' }}
+      if: ${{ github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' }}
       shell: pwsh
       run: scripts/emulated-performance.ps1 -Debug -Protocol QUIC -LogProfile Performance.Light -NoDateLogDir -NumIterations ${{ env.iterations }} -DurationMs ${{ env.duration }} -Pacing ${{ env.pacing }} -BottleneckMbps ${{ matrix.rate }} -RttMs ${{ matrix.rtt }} -BottleneckQueueRatio ${{ matrix.queueRatio }} -RandomLossDenominator ${{ env.loss }} -RandomReorderDenominator ${{ env.reorder }} -ReorderDelayDeltaMs ${{ env.delay }} -BaseRandomSeed ${{ env.seed }} -CongestionControl ${{ env.congestionControl }}
     - name: Run WAN Perf (QUIC + TCP)
-      if: ${{ github.event_name != 'pull_request' }}
+      if: ${{ github.event_name != 'pull_request' && github.event_name != 'workflow_dispatch' }}
       shell: pwsh
       run: scripts/emulated-performance.ps1 -Debug -Protocol ('QUIC','TCPTLS') -LogProfile Performance.Light -NoDateLogDir -NumIterations ${{ env.iterations }} -DurationMs ${{ env.duration }} -Pacing ${{ env.pacing }} -BottleneckMbps ${{ matrix.rate }} -RttMs ${{ matrix.rtt }} -BottleneckQueueRatio ${{ matrix.queueRatio }} -RandomLossDenominator ${{ env.loss }} -RandomReorderDenominator ${{ env.reorder }} -ReorderDelayDeltaMs ${{ env.delay }} -BaseRandomSeed ${{ env.seed }} -CongestionControl ${{ env.congestionControl }}
     - name: Upload Results

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -67,9 +67,6 @@ elseif (UNIX)
 endif()
 message(STATUS "QUIC Platform: ${CX_PLATFORM}")
 
-set(FILENAME_DEP_REPLACE "get_filename_component(SELF_DIR \"$\{CMAKE_CURRENT_LIST_FILE\}\" PATH)")
-set(SELF_DIR "$\{SELF_DIR\}")
-
 enable_testing()
 
 # Set the default TLS method for each platform.

diff --git a/Cargo.toml b/Cargo.toml
@@ -44,6 +44,11 @@ include = [
     "/THIRD-PARTY-NOTICES",
 ]
 
+[features]
+default = []
+static = []
+preview-api = []
+
 [build-dependencies]
 cmake = "0.1"
 
@@ -52,3 +57,5 @@ bitfield = "0.17.0"
 libc = "0.2.0"
 c-types = "4.0.0"
 serde = { version = "1.0.117", features = ["derive"] }
+ctor = "0.2.9"
+socket2 = "0.5.8"