Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Event Queue Completion Refactor #4732

Merged
merged 24 commits into from
Jan 6, 2025
Merged

Event Queue Completion Refactor #4732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
59d6e69
Initial interface refactor
nibanks Dec 21, 2024
c1986e3
More progress
nibanks Jan 1, 2025
e073dba
unit tests passing
nibanks Jan 1, 2025
43db559
Fix submodule
nibanks Jan 1, 2025
3baaf4a
Fix posix platform header
nibanks Jan 1, 2025
b9f0912
Few posix fixes
nibanks Jan 1, 2025
b8bf0ab
wip
nibanks Jan 2, 2025
10f8e7a
Merge branch 'main' into event-completion-refactor
nibanks Jan 2, 2025
d86e76c
Fix epoll
nibanks Jan 2, 2025
00f4574
Fix epoll
nibanks Jan 3, 2025
4974f2d
minor fixes
nibanks Jan 3, 2025
7b10d2a
More refactoring
nibanks Jan 3, 2025
1c44a79
typo
nibanks Jan 3, 2025
9f984c9
Missed a change
nibanks Jan 3, 2025
cfcc140
More build fixes
nibanks Jan 3, 2025
1c3a486
update clog
nibanks Jan 3, 2025
5277591
fix linux build
nibanks Jan 3, 2025
e86c4c9
More CLOG fixes
nibanks Jan 3, 2025
0591c01
More fixes
nibanks Jan 3, 2025
56d750b
More fixes
nibanks Jan 3, 2025
b33ddb3
CLOG
nibanks Jan 3, 2025
69b1f03
Simplify platform worker
nibanks Jan 3, 2025
79a3666
fix cross-plat build
nibanks Jan 3, 2025
b899016
Address PR comments
nibanks Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/generated/linux/datapath_raw_xdp_linux.c.clog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,9 +546,9 @@ tracepoint(CLOG_DATAPATH_RAW_XDP_LINUX_C, XdpPartitionShutdown , arg2);\
// Decoder Ring for XdpPartitionShutdownComplete
// [ xdp][%p] XDP partition shutdown complete
// QuicTraceLogVerbose(
XdpPartitionShutdownComplete,
"[ xdp][%p] XDP partition shutdown complete",
Partition);
XdpPartitionShutdownComplete,
"[ xdp][%p] XDP partition shutdown complete",
Partition);
// arg2 = arg2 = Partition = arg2
----------------------------------------------------------*/
#ifndef _clog_3_ARGS_TRACE_XdpPartitionShutdownComplete
Expand All @@ -564,9 +564,9 @@ tracepoint(CLOG_DATAPATH_RAW_XDP_LINUX_C, XdpPartitionShutdownComplete , arg2);\
// Decoder Ring for XdpQueueAsyncIoRxComplete
// [ xdp][%p] XDP async IO complete (RX)
// QuicTraceLogVerbose(
XdpQueueAsyncIoRxComplete,
"[ xdp][%p] XDP async IO complete (RX)",
Queue);
XdpQueueAsyncIoRxComplete,
"[ xdp][%p] XDP async IO complete (RX)",
Queue);
// arg2 = arg2 = Queue = arg2
----------------------------------------------------------*/
#ifndef _clog_3_ARGS_TRACE_XdpQueueAsyncIoRxComplete
Expand Down
12 changes: 6 additions & 6 deletions src/generated/linux/datapath_raw_xdp_linux.c.clog.h.lttng.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,9 +568,9 @@ TRACEPOINT_EVENT(CLOG_DATAPATH_RAW_XDP_LINUX_C, XdpPartitionShutdown,
// Decoder Ring for XdpPartitionShutdownComplete
// [ xdp][%p] XDP partition shutdown complete
// QuicTraceLogVerbose(
XdpPartitionShutdownComplete,
"[ xdp][%p] XDP partition shutdown complete",
Partition);
XdpPartitionShutdownComplete,
"[ xdp][%p] XDP partition shutdown complete",
Partition);
// arg2 = arg2 = Partition = arg2
----------------------------------------------------------*/
TRACEPOINT_EVENT(CLOG_DATAPATH_RAW_XDP_LINUX_C, XdpPartitionShutdownComplete,
Expand All @@ -587,9 +587,9 @@ TRACEPOINT_EVENT(CLOG_DATAPATH_RAW_XDP_LINUX_C, XdpPartitionShutdownComplete,
// Decoder Ring for XdpQueueAsyncIoRxComplete
// [ xdp][%p] XDP async IO complete (RX)
// QuicTraceLogVerbose(
XdpQueueAsyncIoRxComplete,
"[ xdp][%p] XDP async IO complete (RX)",
Queue);
XdpQueueAsyncIoRxComplete,
"[ xdp][%p] XDP async IO complete (RX)",
Queue);
// arg2 = arg2 = Queue = arg2
----------------------------------------------------------*/
TRACEPOINT_EVENT(CLOG_DATAPATH_RAW_XDP_LINUX_C, XdpQueueAsyncIoRxComplete,
Expand Down
18 changes: 9 additions & 9 deletions src/generated/linux/datapath_raw_xdp_win.c.clog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,9 +263,9 @@ tracepoint(CLOG_DATAPATH_RAW_XDP_WIN_C, XdpQueueAsyncIoTx , arg2);\
// Decoder Ring for XdpQueueAsyncIoRxComplete
// [ xdp][%p] XDP async IO complete (RX)
// QuicTraceLogVerbose(
XdpQueueAsyncIoRxComplete,
"[ xdp][%p] XDP async IO complete (RX)",
Queue);
XdpQueueAsyncIoRxComplete,
"[ xdp][%p] XDP async IO complete (RX)",
Queue);
// arg2 = arg2 = Queue = arg2
----------------------------------------------------------*/
#ifndef _clog_3_ARGS_TRACE_XdpQueueAsyncIoRxComplete
Expand All @@ -281,9 +281,9 @@ tracepoint(CLOG_DATAPATH_RAW_XDP_WIN_C, XdpQueueAsyncIoRxComplete , arg2);\
// Decoder Ring for XdpQueueAsyncIoTxComplete
// [ xdp][%p] XDP async IO complete (TX)
// QuicTraceLogVerbose(
XdpQueueAsyncIoTxComplete,
"[ xdp][%p] XDP async IO complete (TX)",
Queue);
XdpQueueAsyncIoTxComplete,
"[ xdp][%p] XDP async IO complete (TX)",
Queue);
// arg2 = arg2 = Queue = arg2
----------------------------------------------------------*/
#ifndef _clog_3_ARGS_TRACE_XdpQueueAsyncIoTxComplete
Expand All @@ -299,9 +299,9 @@ tracepoint(CLOG_DATAPATH_RAW_XDP_WIN_C, XdpQueueAsyncIoTxComplete , arg2);\
// Decoder Ring for XdpPartitionShutdownComplete
// [ xdp][%p] XDP partition shutdown complete
// QuicTraceLogVerbose(
XdpPartitionShutdownComplete,
"[ xdp][%p] XDP partition shutdown complete",
Partition);
XdpPartitionShutdownComplete,
"[ xdp][%p] XDP partition shutdown complete",
Partition);
// arg2 = arg2 = Partition = arg2
----------------------------------------------------------*/
#ifndef _clog_3_ARGS_TRACE_XdpPartitionShutdownComplete
Expand Down
18 changes: 9 additions & 9 deletions src/generated/linux/datapath_raw_xdp_win.c.clog.h.lttng.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,9 +261,9 @@ TRACEPOINT_EVENT(CLOG_DATAPATH_RAW_XDP_WIN_C, XdpQueueAsyncIoTx,
// Decoder Ring for XdpQueueAsyncIoRxComplete
// [ xdp][%p] XDP async IO complete (RX)
// QuicTraceLogVerbose(
XdpQueueAsyncIoRxComplete,
"[ xdp][%p] XDP async IO complete (RX)",
Queue);
XdpQueueAsyncIoRxComplete,
"[ xdp][%p] XDP async IO complete (RX)",
Queue);
// arg2 = arg2 = Queue = arg2
----------------------------------------------------------*/
TRACEPOINT_EVENT(CLOG_DATAPATH_RAW_XDP_WIN_C, XdpQueueAsyncIoRxComplete,
Expand All @@ -280,9 +280,9 @@ TRACEPOINT_EVENT(CLOG_DATAPATH_RAW_XDP_WIN_C, XdpQueueAsyncIoRxComplete,
// Decoder Ring for XdpQueueAsyncIoTxComplete
// [ xdp][%p] XDP async IO complete (TX)
// QuicTraceLogVerbose(
XdpQueueAsyncIoTxComplete,
"[ xdp][%p] XDP async IO complete (TX)",
Queue);
XdpQueueAsyncIoTxComplete,
"[ xdp][%p] XDP async IO complete (TX)",
Queue);
// arg2 = arg2 = Queue = arg2
----------------------------------------------------------*/
TRACEPOINT_EVENT(CLOG_DATAPATH_RAW_XDP_WIN_C, XdpQueueAsyncIoTxComplete,
Expand All @@ -299,9 +299,9 @@ TRACEPOINT_EVENT(CLOG_DATAPATH_RAW_XDP_WIN_C, XdpQueueAsyncIoTxComplete,
// Decoder Ring for XdpPartitionShutdownComplete
// [ xdp][%p] XDP partition shutdown complete
// QuicTraceLogVerbose(
XdpPartitionShutdownComplete,
"[ xdp][%p] XDP partition shutdown complete",
Partition);
XdpPartitionShutdownComplete,
"[ xdp][%p] XDP partition shutdown complete",
Partition);
// arg2 = arg2 = Partition = arg2
----------------------------------------------------------*/
TRACEPOINT_EVENT(CLOG_DATAPATH_RAW_XDP_WIN_C, XdpPartitionShutdownComplete,
Expand Down
4 changes: 2 additions & 2 deletions src/generated/linux/datapath_winuser.c.clog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,10 +341,10 @@ tracepoint(CLOG_DATAPATH_WINUSER_C, LibraryError , arg2);\
"[data][%p] ERROR, %u, %s.",
SocketProc->Parent,
LastError,
"CxPlatSocketEnqueueSqe");
"CxPlatEventQEnqueueEx");
// arg2 = arg2 = SocketProc->Parent = arg2
// arg3 = arg3 = LastError = arg3
// arg4 = arg4 = "CxPlatSocketEnqueueSqe" = arg4
// arg4 = arg4 = "CxPlatEventQEnqueueEx" = arg4
----------------------------------------------------------*/
#ifndef _clog_5_ARGS_TRACE_DatapathErrorStatus
#define _clog_5_ARGS_TRACE_DatapathErrorStatus(uniqueId, encoded_arg_string, arg2, arg3, arg4)\
Expand Down
4 changes: 2 additions & 2 deletions src/generated/linux/datapath_winuser.c.clog.h.lttng.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,10 +341,10 @@ TRACEPOINT_EVENT(CLOG_DATAPATH_WINUSER_C, LibraryError,
"[data][%p] ERROR, %u, %s.",
SocketProc->Parent,
LastError,
"CxPlatSocketEnqueueSqe");
"CxPlatEventQEnqueueEx");
// arg2 = arg2 = SocketProc->Parent = arg2
// arg3 = arg3 = LastError = arg3
// arg4 = arg4 = "CxPlatSocketEnqueueSqe" = arg4
// arg4 = arg4 = "CxPlatEventQEnqueueEx" = arg4
----------------------------------------------------------*/
TRACEPOINT_EVENT(CLOG_DATAPATH_WINUSER_C, DatapathErrorStatus,
TP_ARGS(
Expand Down
12 changes: 0 additions & 12 deletions src/inc/quic_platform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,18 +541,6 @@ CxPlatWakeExecutionContext(
);
#endif

//
// The "type" of the completion queue event is stored as the first uint32_t of
// the user data. Everything after that in the user data is type-specific.
//
#define CxPlatCqeType(cqe) (*(uint32_t*)CxPlatCqeUserData(cqe))

//
// All QUIC (and lower layer) completion queue events have a type starting with
// 0x8000.
//
#define CXPLAT_CQE_TYPE_QUIC_BASE 0x8000 // to 0xFFFF

//
// Test Interface for loading a self-signed certificate.
//
Expand Down
Loading
Loading