fixes

microsoft · Aug 22, 2023 · c63b345 · c63b345
1 parent 6aaec49
commit c63b345
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 9 deletions.
diff --git a/src/generated/linux/datapath_winkernel.c.clog.h b/src/generated/linux/datapath_winkernel.c.clog.h
@@ -306,17 +306,17 @@ tracepoint(CLOG_DATAPATH_WINKERNEL_C, DatapathFragmented , arg2);\
 
 
 /*----------------------------------------------------------
-// Decoder Ring for DatapathDropAllocRecvContextFailure
+// Decoder Ring for DatapathDropAllocIoBlockFailure
 // [%p] Couldn't allocate receive context.
 // QuicTraceLogWarning(
-                        DatapathDropAllocRecvContextFailure,
+                        DatapathDropAllocIoBlockFailure,
                         "[%p] Couldn't allocate receive context.",
                         Binding);
 // arg2 = arg2 = Binding = arg2
 ----------------------------------------------------------*/
-#ifndef _clog_3_ARGS_TRACE_DatapathDropAllocRecvContextFailure
-#define _clog_3_ARGS_TRACE_DatapathDropAllocRecvContextFailure(uniqueId, encoded_arg_string, arg2)\
-tracepoint(CLOG_DATAPATH_WINKERNEL_C, DatapathDropAllocRecvContextFailure , arg2);\
+#ifndef _clog_3_ARGS_TRACE_DatapathDropAllocIoBlockFailure
+#define _clog_3_ARGS_TRACE_DatapathDropAllocIoBlockFailure(uniqueId, encoded_arg_string, arg2)\
+tracepoint(CLOG_DATAPATH_WINKERNEL_C, DatapathDropAllocIoBlockFailure , arg2);\
 
 #endif
 

diff --git a/src/generated/linux/datapath_winkernel.c.clog.h.lttng.h b/src/generated/linux/datapath_winkernel.c.clog.h.lttng.h
@@ -291,15 +291,15 @@ TRACEPOINT_EVENT(CLOG_DATAPATH_WINKERNEL_C, DatapathFragmented,
 
 
 /*----------------------------------------------------------
-// Decoder Ring for DatapathDropAllocRecvContextFailure
+// Decoder Ring for DatapathDropAllocIoBlockFailure
 // [%p] Couldn't allocate receive context.
 // QuicTraceLogWarning(
-                        DatapathDropAllocRecvContextFailure,
+                        DatapathDropAllocIoBlockFailure,
                         "[%p] Couldn't allocate receive context.",
                         Binding);
 // arg2 = arg2 = Binding = arg2
 ----------------------------------------------------------*/
-TRACEPOINT_EVENT(CLOG_DATAPATH_WINKERNEL_C, DatapathDropAllocRecvContextFailure,
+TRACEPOINT_EVENT(CLOG_DATAPATH_WINKERNEL_C, DatapathDropAllocIoBlockFailure,
     TP_ARGS(
         const void *, arg2), 
     TP_FIELDS(

diff --git a/src/manifest/clog.sidecar b/src/manifest/clog.sidecar
@@ -2487,6 +2487,18 @@
       ],
       "macroName": "QuicTraceEvent"
     },
+    "DatapathDropAllocIoBlockFailure": {
+      "ModuleProperites": {},
+      "TraceString": "[%p] Couldn't allocate receive context.",
+      "UniqueId": "DatapathDropAllocIoBlockFailure",
+      "splitArgs": [
+        {
+          "DefinationEncoding": "p",
+          "MacroVariableName": "arg2"
+        }
+      ],
+      "macroName": "QuicTraceLogWarning"
+    },
     "DatapathDropAllocRecvBufferFailure": {
       "ModuleProperites": {},
       "TraceString": "[%p] Couldn't allocate receive buffers.",
@@ -13404,6 +13416,11 @@
         "TraceID": "DatapathDestroyed",
         "EncodingString": "[data][%p] Destroyed"
       },
+      {
+        "UniquenessHash": "1705c557-a3f1-30bf-f2d6-d31f7a2995cc",
+        "TraceID": "DatapathDropAllocIoBlockFailure",
+        "EncodingString": "[%p] Couldn't allocate receive context."
+      },
       {
         "UniquenessHash": "977ca100-03bb-010a-09ab-0a04d33a7dfd",
         "TraceID": "DatapathDropAllocRecvBufferFailure",

diff --git a/src/platform/datapath_epoll.c b/src/platform/datapath_epoll.c
@@ -1832,7 +1832,7 @@ CxPlatSocketContextRecvComplete(
             IoBlock->RefCount++;
             Datagram->IoBlock = IoBlock;
 
-            CXPLAT_RECV_DATA* RecvData = &Datagram->RecvData;
+            CXPLAT_RECV_DATA* RecvData = &Datagram->Data;
             RecvData->Next = NULL;
             RecvData->Route = &IoBlock->Route;
             RecvData->Buffer = RecvBuffer + Offset;