Skip to content

Global Execution Context Renames#5056

Merged
nibanks merged 2 commits into
mainfrom
exec-context-rename
Apr 29, 2025
Merged

Global Execution Context Renames#5056
nibanks merged 2 commits into
mainfrom
exec-context-rename

Conversation

@nibanks

@nibanks nibanks commented Apr 28, 2025

Copy link
Copy Markdown
Collaborator

Description

Pulling out some renames from #4616.

Testing

CI/CD

Documentation

Updated

@nibanks nibanks requested a review from a team as a code owner April 28, 2025 21:06
@github-actions

Copy link
Copy Markdown

Cargo

The rust bindings need to be updated. Please apply (git apply) this diff:

diff --git a/src/rs/ffi/linux_bindings.rs b/src/rs/ffi/linux_bindings.rs
index 8b4f840..8242788 100644
--- a/src/rs/ffi/linux_bindings.rs
+++ b/src/rs/ffi/linux_bindings.rs
@@ -412,12 +412,12 @@ pub const QUIC_DATAGRAM_SEND_STATE_QUIC_DATAGRAM_SEND_ACKNOWLEDGED_SPURIOUS:
     QUIC_DATAGRAM_SEND_STATE = 5;
 pub const QUIC_DATAGRAM_SEND_STATE_QUIC_DATAGRAM_SEND_CANCELED: QUIC_DATAGRAM_SEND_STATE = 6;
 pub type QUIC_DATAGRAM_SEND_STATE = ::std::os::raw::c_uint;
-pub const QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS_QUIC_GLOBAL_EXECUTION_CONFIG_FLAG_NONE: QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS =
-    0;
-pub const QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS_QUIC_GLOBAL_EXECUTION_CONFIG_FLAG_RIO: QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS =
-    2;
-pub const QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS_QUIC_GLOBAL_EXECUTION_CONFIG_FLAG_XDP: QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS =
-    4;
+pub const QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS_QUIC_GLOBAL_EXECUTION_CONFIG_FLAG_NONE:
+    QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS = 0;
+pub const QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS_QUIC_GLOBAL_EXECUTION_CONFIG_FLAG_RIO:
+    QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS = 2;
+pub const QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS_QUIC_GLOBAL_EXECUTION_CONFIG_FLAG_XDP:
+    QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS = 4;
 pub const QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS_QUIC_GLOBAL_EXECUTION_CONFIG_FLAG_NO_IDEAL_PROC:
     QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS = 8;
 pub const QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS_QUIC_GLOBAL_EXECUTION_CONFIG_FLAG_HIGH_PRIORITY:
@@ -435,7 +435,8 @@ pub struct QUIC_GLOBAL_EXECUTION_CONFIG {
 }
 #[allow(clippy::unnecessary_operation, clippy::identity_op)]
 const _: () = {
-    ["Size of QUIC_GLOBAL_EXECUTION_CONFIG"][::std::mem::size_of::<QUIC_GLOBAL_EXECUTION_CONFIG>() - 16usize];
+    ["Size of QUIC_GLOBAL_EXECUTION_CONFIG"]
+        [::std::mem::size_of::<QUIC_GLOBAL_EXECUTION_CONFIG>() - 16usize];
     ["Alignment of QUIC_GLOBAL_EXECUTION_CONFIG"]
         [::std::mem::align_of::<QUIC_GLOBAL_EXECUTION_CONFIG>() - 4usize];
     ["Offset of field: QUIC_GLOBAL_EXECUTION_CONFIG::Flags"]

@github-actions

Copy link
Copy Markdown

Cargo

The rust bindings need to be updated. Please apply (git apply) this diff:

diff --git a/src/rs/ffi/win_bindings.rs b/src/rs/ffi/win_bindings.rs
index 1357f28..c20def9 100644
--- a/src/rs/ffi/win_bindings.rs
+++ b/src/rs/ffi/win_bindings.rs
@@ -411,12 +411,12 @@ pub const QUIC_DATAGRAM_SEND_STATE_QUIC_DATAGRAM_SEND_ACKNOWLEDGED_SPURIOUS:
     QUIC_DATAGRAM_SEND_STATE = 5;
 pub const QUIC_DATAGRAM_SEND_STATE_QUIC_DATAGRAM_SEND_CANCELED: QUIC_DATAGRAM_SEND_STATE = 6;
 pub type QUIC_DATAGRAM_SEND_STATE = ::std::os::raw::c_int;
-pub const QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS_QUIC_GLOBAL_EXECUTION_CONFIG_FLAG_NONE: QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS =
-    0;
-pub const QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS_QUIC_GLOBAL_EXECUTION_CONFIG_FLAG_RIO: QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS =
-    2;
-pub const QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS_QUIC_GLOBAL_EXECUTION_CONFIG_FLAG_XDP: QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS =
-    4;
+pub const QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS_QUIC_GLOBAL_EXECUTION_CONFIG_FLAG_NONE:
+    QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS = 0;
+pub const QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS_QUIC_GLOBAL_EXECUTION_CONFIG_FLAG_RIO:
+    QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS = 2;
+pub const QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS_QUIC_GLOBAL_EXECUTION_CONFIG_FLAG_XDP:
+    QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS = 4;
 pub const QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS_QUIC_GLOBAL_EXECUTION_CONFIG_FLAG_NO_IDEAL_PROC:
     QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS = 8;
 pub const QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS_QUIC_GLOBAL_EXECUTION_CONFIG_FLAG_HIGH_PRIORITY:
@@ -434,7 +434,8 @@ pub struct QUIC_GLOBAL_EXECUTION_CONFIG {
 }
 #[allow(clippy::unnecessary_operation, clippy::identity_op)]
 const _: () = {
-    ["Size of QUIC_GLOBAL_EXECUTION_CONFIG"][::std::mem::size_of::<QUIC_GLOBAL_EXECUTION_CONFIG>() - 16usize];
+    ["Size of QUIC_GLOBAL_EXECUTION_CONFIG"]
+        [::std::mem::size_of::<QUIC_GLOBAL_EXECUTION_CONFIG>() - 16usize];
     ["Alignment of QUIC_GLOBAL_EXECUTION_CONFIG"]
         [::std::mem::align_of::<QUIC_GLOBAL_EXECUTION_CONFIG>() - 4usize];
     ["Offset of field: QUIC_GLOBAL_EXECUTION_CONFIG::Flags"]

Comment thread src/inc/msquic.h

@ProjectsByJackHe ProjectsByJackHe left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM once the Cargo CI is passing.

@codecov

codecov Bot commented Apr 28, 2025

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 86.28%. Comparing base (504e2eb) to head (b5cc973).
Report is 8 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #5056      +/-   ##
==========================================
- Coverage   87.31%   86.28%   -1.03%     
==========================================
  Files          59       59              
  Lines       17913    17913              
==========================================
- Hits        15641    15457     -184     
- Misses       2272     2456     +184     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@guhetier

guhetier commented Apr 28, 2025

Copy link
Copy Markdown
Collaborator

Cargo

The rust bindings need to be updated. Please apply (git apply) this diff:

diff --git a/src/rs/ffi/win_bindings.rs b/src/rs/ffi/win_bindings.rs
index 1357f28..c20def9 100644
--- a/src/rs/ffi/win_bindings.rs
+++ b/src/rs/ffi/win_bindings.rs
@@ -411,12 +411,12 @@ pub const QUIC_DATAGRAM_SEND_STATE_QUIC_DATAGRAM_SEND_ACKNOWLEDGED_SPURIOUS:
     QUIC_DATAGRAM_SEND_STATE = 5;
 pub const QUIC_DATAGRAM_SEND_STATE_QUIC_DATAGRAM_SEND_CANCELED: QUIC_DATAGRAM_SEND_STATE = 6;
 pub type QUIC_DATAGRAM_SEND_STATE = ::std::os::raw::c_int;
-pub const QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS_QUIC_GLOBAL_EXECUTION_CONFIG_FLAG_NONE: QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS =
-    0;
-pub const QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS_QUIC_GLOBAL_EXECUTION_CONFIG_FLAG_RIO: QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS =
-    2;
-pub const QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS_QUIC_GLOBAL_EXECUTION_CONFIG_FLAG_XDP: QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS =
-    4;
+pub const QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS_QUIC_GLOBAL_EXECUTION_CONFIG_FLAG_NONE:
+    QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS = 0;
+pub const QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS_QUIC_GLOBAL_EXECUTION_CONFIG_FLAG_RIO:
+    QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS = 2;
+pub const QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS_QUIC_GLOBAL_EXECUTION_CONFIG_FLAG_XDP:
+    QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS = 4;
 pub const QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS_QUIC_GLOBAL_EXECUTION_CONFIG_FLAG_NO_IDEAL_PROC:
     QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS = 8;
 pub const QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS_QUIC_GLOBAL_EXECUTION_CONFIG_FLAG_HIGH_PRIORITY:
@@ -434,7 +434,8 @@ pub struct QUIC_GLOBAL_EXECUTION_CONFIG {
 }
 #[allow(clippy::unnecessary_operation, clippy::identity_op)]
 const _: () = {
-    ["Size of QUIC_GLOBAL_EXECUTION_CONFIG"][::std::mem::size_of::<QUIC_GLOBAL_EXECUTION_CONFIG>() - 16usize];
+    ["Size of QUIC_GLOBAL_EXECUTION_CONFIG"]
+        [::std::mem::size_of::<QUIC_GLOBAL_EXECUTION_CONFIG>() - 16usize];
     ["Alignment of QUIC_GLOBAL_EXECUTION_CONFIG"]
         [::std::mem::align_of::<QUIC_GLOBAL_EXECUTION_CONFIG>() - 4usize];
     ["Offset of field: QUIC_GLOBAL_EXECUTION_CONFIG::Flags"]

Command to apply:

echo @"
diff --git a/src/rs/ffi/win_bindings.rs b/src/rs/ffi/win_bindings.rs
index 1357f28..c20def9 100644
--- a/src/rs/ffi/win_bindings.rs
+++ b/src/rs/ffi/win_bindings.rs
@@ -411,12 +411,12 @@ pub const QUIC_DATAGRAM_SEND_STATE_QUIC_DATAGRAM_SEND_ACKNOWLEDGED_SPURIOUS:
     QUIC_DATAGRAM_SEND_STATE = 5;
 pub const QUIC_DATAGRAM_SEND_STATE_QUIC_DATAGRAM_SEND_CANCELED: QUIC_DATAGRAM_SEND_STATE = 6;
 pub type QUIC_DATAGRAM_SEND_STATE = ::std::os::raw::c_int;
-pub const QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS_QUIC_GLOBAL_EXECUTION_CONFIG_FLAG_NONE: QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS =
-    0;
-pub const QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS_QUIC_GLOBAL_EXECUTION_CONFIG_FLAG_RIO: QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS =
-    2;
-pub const QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS_QUIC_GLOBAL_EXECUTION_CONFIG_FLAG_XDP: QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS =
-    4;
+pub const QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS_QUIC_GLOBAL_EXECUTION_CONFIG_FLAG_NONE:
+    QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS = 0;
+pub const QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS_QUIC_GLOBAL_EXECUTION_CONFIG_FLAG_RIO:
+    QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS = 2;
+pub const QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS_QUIC_GLOBAL_EXECUTION_CONFIG_FLAG_XDP:
+    QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS = 4;
 pub const QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS_QUIC_GLOBAL_EXECUTION_CONFIG_FLAG_NO_IDEAL_PROC:
     QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS = 8;
 pub const QUIC_GLOBAL_EXECUTION_CONFIG_FLAGS_QUIC_GLOBAL_EXECUTION_CONFIG_FLAG_HIGH_PRIORITY:
@@ -434,7 +434,8 @@ pub struct QUIC_GLOBAL_EXECUTION_CONFIG {
 }
 #[allow(clippy::unnecessary_operation, clippy::identity_op)]
 const _: () = {
-    ["Size of QUIC_GLOBAL_EXECUTION_CONFIG"][::std::mem::size_of::<QUIC_GLOBAL_EXECUTION_CONFIG>() - 16usize];
+    ["Size of QUIC_GLOBAL_EXECUTION_CONFIG"]
+        [::std::mem::size_of::<QUIC_GLOBAL_EXECUTION_CONFIG>() - 16usize];
     ["Alignment of QUIC_GLOBAL_EXECUTION_CONFIG"]
         [::std::mem::align_of::<QUIC_GLOBAL_EXECUTION_CONFIG>() - 4usize];
     ["Offset of field: QUIC_GLOBAL_EXECUTION_CONFIG::Flags"]
"@ | git apply -

@nibanks Would something like this work?

@nibanks

nibanks commented Apr 29, 2025

Copy link
Copy Markdown
Collaborator Author

@nibanks Would something like this work?

Nope.

image

@nibanks nibanks added Area: API Area: Core Related to the shared, core protocol logic labels Apr 29, 2025
@nibanks nibanks enabled auto-merge (squash) April 29, 2025 11:44
@ProjectsByJackHe ProjectsByJackHe self-requested a review April 29, 2025 18:44
@nibanks nibanks merged commit d6af38c into main Apr 29, 2025
283 of 287 checks passed
@nibanks nibanks deleted the exec-context-rename branch April 29, 2025 18:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area: API Area: Core Related to the shared, core protocol logic

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants