fix

microsoft · Jul 8, 2024 · 30d6067 · 30d6067
1 parent 42d885d
commit 30d6067
Show file tree

Hide file tree

Showing 4 changed files with 86 additions and 33 deletions.
diff --git a/src/core/stream_recv.c b/src/core/stream_recv.c
@@ -859,16 +859,23 @@ QuicStreamRecvFlush(
         return;
     }
 
-    if ((Stream->RecvBuffer.RecvMode != QUIC_RECV_BUF_MODE_MULTIPLE &&
-         Stream->RecvBuffer.ReadPendingLength != 0) ||
-        !Stream->Flags.ReceiveEnabled) {
+
+    if (Stream->RecvBuffer.RecvMode != QUIC_RECV_BUF_MODE_MULTIPLE &&
+        Stream->RecvBuffer.ReadPendingLength != 0) {
+        QuicTraceLogStreamVerbose(
+            IgnoreRecvFlushByReadPending,
+            Stream,
+            "Ignoring recv flush (ReadPendingLenght=%lu)",
+            Stream->RecvBuffer.ReadPendingLength);
+        return;
+    }
+
+
+    if (!Stream->Flags.ReceiveEnabled) {
         QuicTraceLogStreamVerbose(
             IgnoreRecvFlush,
             Stream,
-            "Ignoring recv flush (%s)",
-            !Stream->Flags.ReceiveEnabled ?
-                "recv disabled" :
-                sprintf("ReadPendingLength=%lu", Stream->RecvBuffer.ReadPendingLength));
+            "Ignoring recv flush (recv disabled)");
         return;
     }
 

diff --git a/src/generated/linux/stream_recv.c.clog.h b/src/generated/linux/stream_recv.c.clog.h
@@ -397,24 +397,38 @@ tracepoint(CLOG_STREAM_RECV_C, UpdateFlowControl , arg1);\
 
 
 
+/*----------------------------------------------------------
+// Decoder Ring for IgnoreRecvFlushByReadPending
+// [strm][%p] Ignoring recv flush (ReadPendingLenght=%lu)
+// QuicTraceLogStreamVerbose(
+            IgnoreRecvFlushByReadPending,
+            Stream,
+            "Ignoring recv flush (ReadPendingLenght=%lu)",
+            Stream->RecvBuffer.ReadPendingLength);
+// arg1 = arg1 = Stream = arg1
+// arg3 = arg3 = Stream->RecvBuffer.ReadPendingLength = arg3
+----------------------------------------------------------*/
+#ifndef _clog_4_ARGS_TRACE_IgnoreRecvFlushByReadPending
+#define _clog_4_ARGS_TRACE_IgnoreRecvFlushByReadPending(uniqueId, arg1, encoded_arg_string, arg3)\
+tracepoint(CLOG_STREAM_RECV_C, IgnoreRecvFlushByReadPending , arg1, arg3);\
+
+#endif
+
+
+
+
 /*----------------------------------------------------------
 // Decoder Ring for IgnoreRecvFlush
-// [strm][%p] Ignoring recv flush (%s)
+// [strm][%p] Ignoring recv flush (recv disabled)
 // QuicTraceLogStreamVerbose(
             IgnoreRecvFlush,
             Stream,
-            "Ignoring recv flush (%s)",
-            !Stream->Flags.ReceiveEnabled ?
-                "recv disabled" :
-                sprintf("ReadPendingLength=%lu", Stream->RecvBuffer.ReadPendingLength));
+            "Ignoring recv flush (recv disabled)");
 // arg1 = arg1 = Stream = arg1
-// arg3 = arg3 = !Stream->Flags.ReceiveEnabled ?
-                "recv disabled" :
-                sprintf("ReadPendingLength=%lu", Stream->RecvBuffer.ReadPendingLength) = arg3
 ----------------------------------------------------------*/
-#ifndef _clog_4_ARGS_TRACE_IgnoreRecvFlush
-#define _clog_4_ARGS_TRACE_IgnoreRecvFlush(uniqueId, arg1, encoded_arg_string, arg3)\
-tracepoint(CLOG_STREAM_RECV_C, IgnoreRecvFlush , arg1, arg3);\
+#ifndef _clog_3_ARGS_TRACE_IgnoreRecvFlush
+#define _clog_3_ARGS_TRACE_IgnoreRecvFlush(uniqueId, arg1, encoded_arg_string)\
+tracepoint(CLOG_STREAM_RECV_C, IgnoreRecvFlush , arg1);\
 
 #endif
 

diff --git a/src/generated/linux/stream_recv.c.clog.h.lttng.h b/src/generated/linux/stream_recv.c.clog.h.lttng.h
@@ -406,28 +406,43 @@ TRACEPOINT_EVENT(CLOG_STREAM_RECV_C, UpdateFlowControl,
 
 
 
+/*----------------------------------------------------------
+// Decoder Ring for IgnoreRecvFlushByReadPending
+// [strm][%p] Ignoring recv flush (ReadPendingLenght=%lu)
+// QuicTraceLogStreamVerbose(
+            IgnoreRecvFlushByReadPending,
+            Stream,
+            "Ignoring recv flush (ReadPendingLenght=%lu)",
+            Stream->RecvBuffer.ReadPendingLength);
+// arg1 = arg1 = Stream = arg1
+// arg3 = arg3 = Stream->RecvBuffer.ReadPendingLength = arg3
+----------------------------------------------------------*/
+TRACEPOINT_EVENT(CLOG_STREAM_RECV_C, IgnoreRecvFlushByReadPending,
+    TP_ARGS(
+        const void *, arg1,
+        unsigned int, arg3), 
+    TP_FIELDS(
+        ctf_integer_hex(uint64_t, arg1, arg1)
+        ctf_integer(unsigned int, arg3, arg3)
+    )
+)
+
+
+
 /*----------------------------------------------------------
 // Decoder Ring for IgnoreRecvFlush
-// [strm][%p] Ignoring recv flush (%s)
+// [strm][%p] Ignoring recv flush (recv disabled)
 // QuicTraceLogStreamVerbose(
             IgnoreRecvFlush,
             Stream,
-            "Ignoring recv flush (%s)",
-            !Stream->Flags.ReceiveEnabled ?
-                "recv disabled" :
-                sprintf("ReadPendingLength=%lu", Stream->RecvBuffer.ReadPendingLength));
+            "Ignoring recv flush (recv disabled)");
 // arg1 = arg1 = Stream = arg1
-// arg3 = arg3 = !Stream->Flags.ReceiveEnabled ?
-                "recv disabled" :
-                sprintf("ReadPendingLength=%lu", Stream->RecvBuffer.ReadPendingLength) = arg3
 ----------------------------------------------------------*/
 TRACEPOINT_EVENT(CLOG_STREAM_RECV_C, IgnoreRecvFlush,
     TP_ARGS(
-        const void *, arg1,
-        const char *, arg3), 
+        const void *, arg1), 
     TP_FIELDS(
         ctf_integer_hex(uint64_t, arg1, arg1)
-        ctf_string(arg3, arg3)
     )
 )
 

diff --git a/src/manifest/clog.sidecar b/src/manifest/clog.sidecar
@@ -5634,15 +5634,27 @@
     },
     "IgnoreRecvFlush": {
       "ModuleProperites": {},
-      "TraceString": "[strm][%p] Ignoring recv flush (%s)",
+      "TraceString": "[strm][%p] Ignoring recv flush (recv disabled)",
       "UniqueId": "IgnoreRecvFlush",
+      "splitArgs": [
+        {
+          "DefinationEncoding": "p",
+          "MacroVariableName": "arg1"
+        }
+      ],
+      "macroName": "QuicTraceLogStreamVerbose"
+    },
+    "IgnoreRecvFlushByReadPending": {
+      "ModuleProperites": {},
+      "TraceString": "[strm][%p] Ignoring recv flush (ReadPendingLenght=%lu)",
+      "UniqueId": "IgnoreRecvFlushByReadPending",
       "splitArgs": [
         {
           "DefinationEncoding": "p",
           "MacroVariableName": "arg1"
         },
         {
-          "DefinationEncoding": "s",
+          "DefinationEncoding": "lu",
           "MacroVariableName": "arg3"
         }
       ],
@@ -14920,9 +14932,14 @@
         "EncodingString": "[strm][%p] Ignoring recv after close"
       },
       {
-        "UniquenessHash": "d9009522-4a03-ff39-003d-9b504c1c032a",
+        "UniquenessHash": "b7d10598-79a4-31fa-8455-0d393b45c1e7",
         "TraceID": "IgnoreRecvFlush",
-        "EncodingString": "[strm][%p] Ignoring recv flush (%s)"
+        "EncodingString": "[strm][%p] Ignoring recv flush (recv disabled)"
+      },
+      {
+        "UniquenessHash": "26637f25-1bde-5664-8c9e-6a925231029b",
+        "TraceID": "IgnoreRecvFlushByReadPending",
+        "EncodingString": "[strm][%p] Ignoring recv flush (ReadPendingLenght=%lu)"
       },
       {
         "UniquenessHash": "1e752977-c5b3-6034-4b89-414f9c6ff50f",