unify datapath_raw_winXXX

microsoft · Nov 27, 2024 · 6c1b53c · 6c1b53c
1 parent f6bc45c
commit 6c1b53c
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 142 deletions.
diff --git a/scripts/clog.inputs b/scripts/clog.inputs
@@ -25,8 +25,7 @@
 ../src/platform/datapath_raw_xdp_winuser.c
 ../src/platform/datapath_raw_xdp_winkernel.c
 ../src/platform/datapath_raw_xdp_linux.c
-../src/platform/datapath_raw_winuser.c
-../src/platform/datapath_raw_winkernel.c
+../src/platform/datapath_raw_win.c
 ../src/platform/datapath_raw_linux.c
 ../src/platform/datapath_raw.c
 ../src/platform/crypt_bcrypt.c

diff --git a/...rated/linux/datapath_raw_winuser.c.clog.h → ...generated/linux/datapath_raw_win.c.clog.h b/...rated/linux/datapath_raw_winuser.c.clog.h → ...generated/linux/datapath_raw_win.c.clog.h
@@ -2,16 +2,16 @@
 #include <clog.h>
 #endif
 #undef TRACEPOINT_PROVIDER
-#define TRACEPOINT_PROVIDER CLOG_DATAPATH_RAW_WINUSER_C
+#define TRACEPOINT_PROVIDER CLOG_DATAPATH_RAW_WIN_C
 #undef TRACEPOINT_PROBE_DYNAMIC_LINKAGE
 #define  TRACEPOINT_PROBE_DYNAMIC_LINKAGE
 #undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "datapath_raw_winuser.c.clog.h.lttng.h"
-#if !defined(DEF_CLOG_DATAPATH_RAW_WINUSER_C) || defined(TRACEPOINT_HEADER_MULTI_READ)
-#define DEF_CLOG_DATAPATH_RAW_WINUSER_C
+#define TRACEPOINT_INCLUDE "datapath_raw_win.c.clog.h.lttng.h"
+#if !defined(DEF_CLOG_DATAPATH_RAW_WIN_C) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#define DEF_CLOG_DATAPATH_RAW_WIN_C
 #include <lttng/tracepoint.h>
 #define __int64 __int64_t
-#include "datapath_raw_winuser.c.clog.h.lttng.h"
+#include "datapath_raw_win.c.clog.h.lttng.h"
 #endif
 #include <lttng/tracepoint-event.h>
 #ifndef _clog_MACRO_QuicTraceEvent
@@ -34,7 +34,7 @@ extern "C" {
 ----------------------------------------------------------*/
 #ifndef _clog_4_ARGS_TRACE_AllocFailure
 #define _clog_4_ARGS_TRACE_AllocFailure(uniqueId, encoded_arg_string, arg2, arg3)\
-tracepoint(CLOG_DATAPATH_RAW_WINUSER_C, AllocFailure , arg2, arg3);\
+tracepoint(CLOG_DATAPATH_RAW_WIN_C, AllocFailure , arg2, arg3);\
 
 #endif
 
@@ -54,7 +54,7 @@ tracepoint(CLOG_DATAPATH_RAW_WINUSER_C, AllocFailure , arg2, arg3);\
 ----------------------------------------------------------*/
 #ifndef _clog_4_ARGS_TRACE_LibraryErrorStatus
 #define _clog_4_ARGS_TRACE_LibraryErrorStatus(uniqueId, encoded_arg_string, arg2, arg3)\
-tracepoint(CLOG_DATAPATH_RAW_WINUSER_C, LibraryErrorStatus , arg2, arg3);\
+tracepoint(CLOG_DATAPATH_RAW_WIN_C, LibraryErrorStatus , arg2, arg3);\
 
 #endif
 
@@ -76,7 +76,7 @@ tracepoint(CLOG_DATAPATH_RAW_WINUSER_C, LibraryErrorStatus , arg2, arg3);\
 ----------------------------------------------------------*/
 #ifndef _clog_5_ARGS_TRACE_DatapathErrorStatus
 #define _clog_5_ARGS_TRACE_DatapathErrorStatus(uniqueId, encoded_arg_string, arg2, arg3, arg4)\
-tracepoint(CLOG_DATAPATH_RAW_WINUSER_C, DatapathErrorStatus , arg2, arg3, arg4);\
+tracepoint(CLOG_DATAPATH_RAW_WIN_C, DatapathErrorStatus , arg2, arg3, arg4);\
 
 #endif
 
@@ -87,5 +87,5 @@ tracepoint(CLOG_DATAPATH_RAW_WINUSER_C, DatapathErrorStatus , arg2, arg3, arg4);
 }
 #endif
 #ifdef CLOG_INLINE_IMPLEMENTATION
-#include "quic.clog_datapath_raw_winuser.c.clog.h.c"
+#include "quic.clog_datapath_raw_win.c.clog.h.c"
 #endif
diff --git a/...nux/datapath_raw_winuser.c.clog.h.lttng.h → ...d/linux/datapath_raw_win.c.clog.h.lttng.h b/...nux/datapath_raw_winuser.c.clog.h.lttng.h → ...d/linux/datapath_raw_win.c.clog.h.lttng.h
@@ -12,7 +12,7 @@
 // arg2 = arg2 = "CXPLAT_DATAPATH" = arg2
 // arg3 = arg3 = sizeof(CXPLAT_ROUTE_RESOLUTION_WORKER) = arg3
 ----------------------------------------------------------*/
-TRACEPOINT_EVENT(CLOG_DATAPATH_RAW_WINUSER_C, AllocFailure,
+TRACEPOINT_EVENT(CLOG_DATAPATH_RAW_WIN_C, AllocFailure,
     TP_ARGS(
         const char *, arg2,
         unsigned long long, arg3), 
@@ -35,7 +35,7 @@ TRACEPOINT_EVENT(CLOG_DATAPATH_RAW_WINUSER_C, AllocFailure,
 // arg2 = arg2 = Status = arg2
 // arg3 = arg3 = "CxPlatThreadCreate" = arg3
 ----------------------------------------------------------*/
-TRACEPOINT_EVENT(CLOG_DATAPATH_RAW_WINUSER_C, LibraryErrorStatus,
+TRACEPOINT_EVENT(CLOG_DATAPATH_RAW_WIN_C, LibraryErrorStatus,
     TP_ARGS(
         unsigned int, arg2,
         const char *, arg3), 
@@ -60,7 +60,7 @@ TRACEPOINT_EVENT(CLOG_DATAPATH_RAW_WINUSER_C, LibraryErrorStatus,
 // arg3 = arg3 = Status = arg3
 // arg4 = arg4 = "ResolveIpNetEntry2" = arg4
 ----------------------------------------------------------*/
-TRACEPOINT_EVENT(CLOG_DATAPATH_RAW_WINUSER_C, DatapathErrorStatus,
+TRACEPOINT_EVENT(CLOG_DATAPATH_RAW_WIN_C, DatapathErrorStatus,
     TP_ARGS(
         const void *, arg2,
         unsigned int, arg3,

diff --git a/src/generated/linux/datapath_raw_winkernel.c.clog.h b/src/generated/linux/datapath_raw_winkernel.c.clog.h
diff --git a/...quic.clog_datapath_raw_winuser.c.clog.h.c → ...nux/quic.clog_datapath_raw_win.c.clog.h.c b/...quic.clog_datapath_raw_winuser.c.clog.h.c → ...nux/quic.clog_datapath_raw_win.c.clog.h.c
@@ -4,4 +4,4 @@
 #else
 #define TRACEPOINT_DEFINE
 #endif
-#include "datapath_raw_winuser.c.clog.h"
+#include "datapath_raw_win.c.clog.h"
diff --git a/src/generated/linux/quic.clog_datapath_raw_winkernel.c.clog.h.c b/src/generated/linux/quic.clog_datapath_raw_winkernel.c.clog.h.c
diff --git a/src/platform/CMakeLists.txt b/src/platform/CMakeLists.txt
@@ -20,7 +20,7 @@ if("${CX_PLATFORM}" STREQUAL "windows")
        ${SYSTEM_PROCESSOR} STREQUAL "arm64ec")
         set(SOURCES ${SOURCES} datapath_raw_dummy.c)
     else()
-        set(SOURCES ${SOURCES} datapath_raw.c datapath_raw_winuser.c datapath_raw_socket.c datapath_raw_socket_win.c datapath_raw_socket_common.c datapath_raw_xdp_winuser.c)
+        set(SOURCES ${SOURCES} datapath_raw.c datapath_raw_win.c datapath_raw_socket.c datapath_raw_socket_win.c datapath_raw_socket_common.c datapath_raw_xdp_winuser.c)
     endif()
 else()
     set(SOURCES ${SOURCES} inline.c platform_posix.c storage_posix.c cgroup.c datapath_unix.c)

diff --git a/src/platform/datapath_raw_winuser.c → src/platform/datapath_raw_win.c b/src/platform/datapath_raw_winuser.c → src/platform/datapath_raw_win.c
@@ -11,7 +11,7 @@
 
 #include "datapath_raw_win.h"
 #ifdef QUIC_CLOG
-#include "datapath_raw_winuser.c.clog.h"
+#include "datapath_raw_win.c.clog.h"
 #endif
 
 #pragma warning(disable:4116) // unnamed type definition in parentheses
@@ -241,5 +241,7 @@ CXPLAT_THREAD_CALLBACK(CxPlatRouteResolutionWorkerThread, Context)
         CXPLAT_FREE(Operation, QUIC_POOL_ROUTE_RESOLUTION_OPER);
     }
 
+#ifndef _KERNEL_MODE
     return 0;
+#endif
 }
diff --git a/src/platform/datapath_raw_winkernel.c b/src/platform/datapath_raw_winkernel.c
diff --git a/src/platform/platform.kernel.vcxproj b/src/platform/platform.kernel.vcxproj
@@ -25,7 +25,7 @@
     <ClCompile Include="datapath_xplat.c" />
     <ClCompile Include="datapath_win.c" />
     <ClCompile Include="datapath_raw.c" />
-    <ClCompile Include="datapath_raw_winkernel.c" />
+    <ClCompile Include="datapath_raw_win.c" />
     <ClCompile Include="datapath_raw_socket.c" />
     <ClCompile Include="datapath_raw_socket_common.c" />
     <ClCompile Include="datapath_raw_socket_win.c" />