release/2.0 - CP #2508, #2511, #2512 & #2513 (#2514)

microsoft · Mar 12, 2022 · aab7246 · aab7246
1 parent 7ba16f5
commit aab7246
Show file tree

Hide file tree

Showing 12 changed files with 7,340 additions and 7,139 deletions.
diff --git a/src/core/loss_detection.c b/src/core/loss_detection.c
@@ -374,7 +374,7 @@ QuicLossDetectionUpdateTimer(
     } else {
         QuicTraceEvent(
             ConnLossDetectionTimerSet,
-            "[conn][%p] Setting loss detection %hhu timer for %u ms. (ProbeCount=%hu)",
+            "[conn][%p] Setting loss detection %hhu timer for %u us. (ProbeCount=%hu)",
             Connection,
             TimeoutType,
             Delay,

diff --git a/src/generated/linux/loss_detection.c.clog.h b/src/generated/linux/loss_detection.c.clog.h
@@ -339,10 +339,10 @@ tracepoint(CLOG_LOSS_DETECTION_C, KeyChangeConfirmed , arg1);\
 
 /*----------------------------------------------------------
 // Decoder Ring for ConnLossDetectionTimerSet
-// [conn][%p] Setting loss detection %hhu timer for %u ms. (ProbeCount=%hu)
+// [conn][%p] Setting loss detection %hhu timer for %u us. (ProbeCount=%hu)
 // QuicTraceEvent(
             ConnLossDetectionTimerSet,
-            "[conn][%p] Setting loss detection %hhu timer for %u ms. (ProbeCount=%hu)",
+            "[conn][%p] Setting loss detection %hhu timer for %u us. (ProbeCount=%hu)",
             Connection,
             TimeoutType,
             Delay,

diff --git a/src/generated/linux/loss_detection.c.clog.h.lttng.h b/src/generated/linux/loss_detection.c.clog.h.lttng.h
@@ -356,10 +356,10 @@ TRACEPOINT_EVENT(CLOG_LOSS_DETECTION_C, KeyChangeConfirmed,
 
 /*----------------------------------------------------------
 // Decoder Ring for ConnLossDetectionTimerSet
-// [conn][%p] Setting loss detection %hhu timer for %u ms. (ProbeCount=%hu)
+// [conn][%p] Setting loss detection %hhu timer for %u us. (ProbeCount=%hu)
 // QuicTraceEvent(
             ConnLossDetectionTimerSet,
-            "[conn][%p] Setting loss detection %hhu timer for %u ms. (ProbeCount=%hu)",
+            "[conn][%p] Setting loss detection %hhu timer for %u us. (ProbeCount=%hu)",
             Connection,
             TimeoutType,
             Delay,

diff --git a/src/inc/quic_platform_posix.h b/src/inc/quic_platform_posix.h
@@ -284,7 +284,7 @@ CxPlatAlloc(
 
 void
 CxPlatFree(
-    __drv_freesMem(Mem) _Frees_ptr_opt_ void* Mem,
+    __drv_freesMem(Mem) _Frees_ptr_ void* Mem,
     _In_ uint32_t Tag
     );
 

diff --git a/src/inc/quic_platform_winuser.h b/src/inc/quic_platform_winuser.h
@@ -246,7 +246,7 @@ CxPlatAlloc(
 
 void
 CxPlatFree(
-    __drv_freesMem(Mem) _Frees_ptr_opt_ void* Mem,
+    __drv_freesMem(Mem) _Frees_ptr_ void* Mem,
     _In_ uint32_t Tag
     );
 

diff --git a/src/manifest/MsQuicEtw.man b/src/manifest/MsQuicEtw.man
@@ -199,41 +199,49 @@
                 value="2"
                 />
             <map
-                message="$(string.Enum.QUIC_API_TYPE.STRM_CLOSE)"
+                message="$(string.Enum.QUIC_API_TYPE.SET_CONFIGURATION)"
                 value="3"
                 />
             <map
-                message="$(string.Enum.QUIC_API_TYPE.STRM_SHUTDOWN)"
+                message="$(string.Enum.QUIC_API_TYPE.SEND_RESUMPTION_TICKET)"
                 value="4"
                 />
             <map
-                message="$(string.Enum.QUIC_API_TYPE.STRM_START)"
+                message="$(string.Enum.QUIC_API_TYPE.STRM_CLOSE)"
                 value="5"
                 />
             <map
-                message="$(string.Enum.QUIC_API_TYPE.STRM_SEND)"
+                message="$(string.Enum.QUIC_API_TYPE.STRM_SHUTDOWN)"
                 value="6"
                 />
             <map
-                message="$(string.Enum.QUIC_API_TYPE.STRM_RECV_COMPLETE)"
+                message="$(string.Enum.QUIC_API_TYPE.STRM_START)"
                 value="7"
                 />
             <map
-                message="$(string.Enum.QUIC_API_TYPE.STRM_RECV_SET_ENABLED)"
+                message="$(string.Enum.QUIC_API_TYPE.STRM_SEND)"
                 value="8"
                 />
             <map
-                message="$(string.Enum.QUIC_API_TYPE.SET_PARAM)"
+                message="$(string.Enum.QUIC_API_TYPE.STRM_RECV_COMPLETE)"
                 value="9"
                 />
             <map
-                message="$(string.Enum.QUIC_API_TYPE.GET_PARAM)"
+                message="$(string.Enum.QUIC_API_TYPE.STRM_RECV_SET_ENABLED)"
                 value="10"
                 />
             <map
-                message="$(string.Enum.QUIC_API_TYPE.DATAGRAM_SEND)"
+                message="$(string.Enum.QUIC_API_TYPE.SET_PARAM)"
                 value="11"
                 />
+            <map
+                message="$(string.Enum.QUIC_API_TYPE.GET_PARAM)"
+                value="12"
+                />
+            <map
+                message="$(string.Enum.QUIC_API_TYPE.DATAGRAM_SEND)"
+                value="13"
+                />
           </valueMap>
           <valueMap name="map_QUIC_CONN_TIMER_TYPE">
             <map
@@ -3424,7 +3432,7 @@
             />
         <string
             id="Etw.ConnLossDetectionTimerSet"
-            value="[conn][%1] Setting loss detection %2 timer for %3 ms. (ProbeCount=%4)"
+            value="[conn][%1] Setting loss detection %2 timer for %3 us. (ProbeCount=%4)"
             />
         <string
             id="Etw.ConnLossDetectionTimerCancel"
@@ -3923,6 +3931,14 @@
             id="Enum.QUIC_API_TYPE.CONN_START"
             value="API.CONN_START"
             />
+        <string
+            id="Enum.QUIC_API_TYPE.SET_CONFIGURATION"
+            value="API.SET_CONFIGURATION"
+            />
+        <string
+            id="Enum.QUIC_API_TYPE.SEND_RESUMPTION_TICKET"
+            value="API.SEND_RESUMPTION_TICKET"
+            />
         <string
             id="Enum.QUIC_API_TYPE.STRM_CLOSE"
             value="API.STRM_CLOSE"