Skip to content

Commit 5551f1f

Browse files
guhetierguhetier
authored
Merge branch 'main' into guhetier/cleanups
2 parents d9e176b + 7f4d7f9 commit 5551f1f

File tree

20 files changed

+423
-1160
lines changed

20 files changed

+423
-1160
lines changed

‎.docker/ubuntu-24.04/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Stage 1: Base image
2-
FROM ubuntu:24.04@sha256:590e57acc18d58cd25d00254d4ca989bbfcd7d929ca6b521892c9c904c391f50 AS base
2+
FROM ubuntu:24.04@sha256:c35e29c9450151419d9448b0fd75374fec4fff364a27f176fb458d472dfc9e54 AS base
33

44
LABEL org.opencontainers.image.source=https://github.com/microsoft/msquic
55

‎.github/workflows/stress.yml‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,20 @@ name: Stress
22

33
on:
44
workflow_dispatch:
5+
inputs:
6+
logprofile:
7+
description: 'Log profile to use'
8+
required: false
9+
default: "None"
10+
type: choice
11+
options:
12+
- "None"
13+
- SpinQuic.Light
14+
- SpinQuicWarnings.Light
15+
- Basic.Light
16+
- Basic.Verbose
17+
- Full.Light
18+
- Full.Verbose
519
push:
620
branches:
721
- main
@@ -131,12 +145,12 @@ jobs:
131145
if: github.event_name == 'pull_request'
132146
timeout-minutes: 15
133147
shell: pwsh
134-
run: scripts/spin.ps1 -AZP -Config ${{ matrix.vec.config }} -Arch ${{ matrix.vec.arch }} -Tls ${{ matrix.vec.tls }} -Timeout ${{ env.pr-timeout }} -RepeatCount ${{ env.pr-repeat }} -AllocFail ${{ env.pr-allocfail }} ${{ matrix.vec.xdp }}
148+
run: scripts/spin.ps1 -AZP -Config ${{ matrix.vec.config }} -Arch ${{ matrix.vec.arch }} -Tls ${{ matrix.vec.tls }} -Timeout ${{ env.pr-timeout }} -RepeatCount ${{ env.pr-repeat }} -AllocFail ${{ env.pr-allocfail }} ${{ matrix.vec.xdp }} -LogProfile ${{ inputs.logprofile || 'SpinQuic.Light' }}
135149
- name: spinquic (Official)
136150
if: github.event_name != 'pull_request'
137151
timeout-minutes: 65
138152
shell: pwsh
139-
run: scripts/spin.ps1 -AZP -Config ${{ matrix.vec.config }} -Arch ${{ matrix.vec.arch }} -Tls ${{ matrix.vec.tls }} -Timeout ${{ env.main-timeout }} -RepeatCount ${{ env.main-repeat }} -AllocFail ${{ env.main-allocfail }} ${{ matrix.vec.xdp }}
153+
run: scripts/spin.ps1 -AZP -Config ${{ matrix.vec.config }} -Arch ${{ matrix.vec.arch }} -Tls ${{ matrix.vec.tls }} -Timeout ${{ env.main-timeout }} -RepeatCount ${{ env.main-repeat }} -AllocFail ${{ env.main-allocfail }} ${{ matrix.vec.xdp }} -LogProfile ${{ inputs.logprofile || 'SpinQuic.Light' }}
140154
- name: Fix log permissions for Linux XDP
141155
if: failure() && matrix.vec.plat == 'linux' # (matrix.vec.plat == 'linux' && matrix.vec.xdp == '-UseXdp') doesn't work for some reason
142156
run: |

‎.github/workflows/test.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,10 @@ jobs:
145145
{ config: "Debug", plat: "linux", os: "ubuntu-24.04", arch: "x64", tls: "quictls", systemcrypto: "-UseSystemOpenSSLCrypto", build: "-Test", iouring: "-UseIoUring" },
146146
{ config: "Release", plat: "linux", os: "ubuntu-24.04", arch: "x64", tls: "quictls", systemcrypto: "-UseSystemOpenSSLCrypto", build: "-Test", iouring: "-UseIoUring" },
147147
{ config: "Debug", plat: "linux", os: "ubuntu-22.04", arch: "x64", tls: "openssl", sanitize: "-SanitizeAddress", build: "-Test" },
148-
{ config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "schannel", sanitize: "-SanitizeAddress", build: "-Test" },
148+
{ config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "schannel", sanitize: "-SanitizeAddress", build: "-Test", log: "Full.Verbose" },
149149
{ config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "schannel", xdp: "-UseXdp", sanitize: "-SanitizeAddress", build: "-Test" },
150150
{ config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "schannel", xdp: "-UseXdp", qtip: "-UseQtip", sanitize: "-SanitizeAddress", build: "-Test" },
151-
{ config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "quictls", build: "-Test" },
151+
{ config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "quictls", build: "-Test", log: "Full.Verbose" },
152152
{ config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "quictls", xdp: "-UseXdp", build: "-Test" },
153153
{ config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "quictls", xdp: "-UseXdp", qtip: "-UseQtip", build: "-Test" },
154154
{ config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "openssl", build: "-Test" },
@@ -160,8 +160,8 @@ jobs:
160160
{ config: "Debug", plat: "windows", os: "windows-2025", arch: "x64", tls: "quictls", build: "-Test" },
161161
{ config: "Debug", plat: "windows", os: "windows-2025", arch: "x64", tls: "quictls", xdp: "-UseXdp", build: "-Test" },
162162
{ config: "Debug", plat: "windows", os: "windows-2025", arch: "x64", tls: "quictls", xdp: "-UseXdp", qtip: "-UseQtip", build: "-Test" },
163-
{ config: "Debug", plat: "windows", os: "WinServerPrerelease", arch: "x64", tls: "schannel", build: "-Test" },
164-
{ config: "Release", plat: "windows", os: "WinServerPrerelease", arch: "x64", tls: "schannel", build: "-Test" },
163+
{ config: "Debug", plat: "windows", os: "WinServerPrerelease", arch: "x64", tls: "schannel", build: "-Test", log: "Full.Verbose" },
164+
{ config: "Release", plat: "windows", os: "WinServerPrerelease", arch: "x64", tls: "schannel", build: "-Test", log: "Full.Verbose" },
165165
]
166166
runs-on: ${{ matrix.vec.plat == 'windows' && matrix.vec.os == 'WinServerPrerelease' && fromJson('[''self-hosted'', ''1ES.Pool=1es-msquic-pool'', ''1ES.ImageOverride=WinServerPrerelease-LatestPwsh'']') || matrix.vec.os }}
167167
steps:

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ find = []
9191
# This feature enables openssl on windows, and has no effect on linux.
9292
openssl = []
9393
quictls = []
94-
static = []
94+
static = ["src"]
9595
preview-api = []
9696
# Overwrite generated binding by reruning the bindgen
9797
overwrite = [ "dep:bindgen" ]

‎rust-toolchain.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
# cargo + rustup will use this to consistently build the project
33
# with the same version across all checkouts and environments
44
[toolchain]
5-
channel = "1.91.1"
5+
channel = "1.92.0"
66
profile = "default"

‎scripts/build.rs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
// Licensed under the MIT License.
33

44
fn main() {
5-
if cfg!(feature = "static") {
6-
assert!(cfg!(feature = "src"), "static requires build for src");
7-
}
8-
95
#[cfg(all(feature = "src", feature = "find"))]
106
panic!("feature src and find are mutually exclusive");
117

‎scripts/clog.inputs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
../src/platform/datapath_linux.c
1919
../src/platform/datapath_unix.c
2020
../src/platform/datapath_xplat.c
21-
../src/platform/datapath_raw_dpdk.c
2221
../src/platform/datapath_raw_socket.c
2322
../src/platform/datapath_raw_socket_win.c
2423
../src/platform/datapath_raw_socket_linux.c

‎src/core/library.c‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -502,9 +502,16 @@ MsQuicLibraryInitialize(
502502
CxPlatToeplitzHashInitialize(&MsQuicLib.ToeplitzHash);
503503

504504
CxPlatDispatchRwLockInitialize(&MsQuicLib.StatelessRetry.Lock);
505-
PlatformInitialized = TRUE;
506505

507506
CxPlatZeroMemory(&MsQuicLib.Settings, sizeof(MsQuicLib.Settings));
507+
CxPlatLockInitialize(&MsQuicLib.RegistrationCloseCleanupLock);
508+
CxPlatEventInitialize(&MsQuicLib.RegistrationCloseCleanupEvent, FALSE, FALSE);
509+
MsQuicLib.RegistrationCloseCleanupShutdown = FALSE;
510+
CxPlatListInitializeHead(&MsQuicLib.RegistrationCloseCleanupList);
511+
CxPlatRundownInitialize(&MsQuicLib.RegistrationCloseCleanupRundown);
512+
513+
PlatformInitialized = TRUE;
514+
508515
Status =
509516
CxPlatStorageOpen(
510517
NULL,
@@ -522,12 +529,6 @@ MsQuicLibraryInitialize(
522529

523530
MsQuicLibraryReadSettings(NULL); // NULL means don't update registrations.
524531

525-
CxPlatLockInitialize(&MsQuicLib.RegistrationCloseCleanupLock);
526-
CxPlatEventInitialize(&MsQuicLib.RegistrationCloseCleanupEvent, FALSE, FALSE);
527-
MsQuicLib.RegistrationCloseCleanupShutdown = FALSE;
528-
CxPlatListInitializeHead(&MsQuicLib.RegistrationCloseCleanupList);
529-
CxPlatRundownInitialize(&MsQuicLib.RegistrationCloseCleanupRundown);
530-
531532
CXPLAT_THREAD_CONFIG ThreadConfig = {
532533
0,
533534
0,
@@ -606,9 +607,6 @@ MsQuicLibraryInitialize(
606607
CxPlatThreadDelete(&MsQuicLib.RegistrationCloseCleanupWorker);
607608
MsQuicLib.RegistrationCloseCleanupWorker = 0;
608609
}
609-
CxPlatRundownUninitialize(&MsQuicLib.RegistrationCloseCleanupRundown);
610-
CxPlatEventUninitialize(MsQuicLib.RegistrationCloseCleanupEvent);
611-
CxPlatLockUninitialize(&MsQuicLib.RegistrationCloseCleanupLock);
612610
if (MsQuicLib.Storage != NULL) {
613611
CxPlatStorageClose(MsQuicLib.Storage);
614612
MsQuicLib.Storage = NULL;
@@ -618,6 +616,9 @@ MsQuicLibraryInitialize(
618616
MsQuicLib.DefaultCompatibilityList = NULL;
619617
}
620618
if (PlatformInitialized) {
619+
CxPlatRundownUninitialize(&MsQuicLib.RegistrationCloseCleanupRundown);
620+
CxPlatEventUninitialize(MsQuicLib.RegistrationCloseCleanupEvent);
621+
CxPlatLockUninitialize(&MsQuicLib.RegistrationCloseCleanupLock);
621622
CxPlatDispatchRwLockUninitialize(&MsQuicLib.StatelessRetry.Lock);
622623
CxPlatUninitialize();
623624
}

‎src/generated/linux/datapath_raw_dpdk.c.clog.h‎

Lines changed: 0 additions & 67 deletions
This file was deleted.

‎src/generated/linux/datapath_raw_dpdk.c.clog.h.lttng.h‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

0 commit comments

Comments
 (0)