Update Stream detailed Ref Counts

Author: anrossi

src/core/stream.c

@@ -89,7 +89,8 @@ QuicStreamInitialize(
     Stream->ReceiveCompleteOperation->API_CALL.Context->Type = QUIC_API_TYPE_STRM_RECV_COMPLETE;
     Stream->ReceiveCompleteOperation->API_CALL.Context->STRM_RECV_COMPLETE.Stream = Stream;
 #if DEBUG
-    Stream->RefTypeCount[QUIC_STREAM_REF_APP] = 1;
+    CxPlatRefInitializeMultiple(Stream->RefTypeBiasCount, QUIC_STREAM_REF_COUNT);
+    CxPlatRefIncrement(&Stream->RefTypeBiasCount[QUIC_STREAM_REF_APP]);
 #endif
 
     if (Stream->Flags.Unidirectional) {
@@ -173,6 +174,7 @@ QuicStreamInitialize(
 
     if (Stream) {
 #if DEBUG
+        CxPlatRefDecrement(&Stream->RefTypeBiasCount[QUIC_STREAM_REF_APP]);
         CxPlatDispatchLockAcquire(&Connection->Streams.AllStreamsLock);
         CxPlatListEntryRemove(&Stream->AllStreamsLink);
         CxPlatDispatchLockRelease(&Connection->Streams.AllStreamsLock);

src/core/stream.h

@@ -220,7 +220,12 @@ typedef struct QUIC_STREAM {
     CXPLAT_REF_COUNT RefCount;
 
 #if DEBUG
-    short RefTypeCount[QUIC_STREAM_REF_COUNT];
+    //
+    // Detailed ref counts.
+    // Note: These ref counts are biased by 1, so lowest they go is 1. It is an
+    // error for them to ever be zero.
+    //
+    CXPLAT_REF_COUNT RefTypeBiasCount[QUIC_STREAM_REF_COUNT];
 #endif
 
     //
@@ -707,7 +712,7 @@ QuicStreamAddRef(
     CXPLAT_DBG_ASSERT(Stream->RefCount > 0);
 
 #if DEBUG
-    InterlockedIncrement16((volatile short*)&Stream->RefTypeCount[Ref]);
+    CxPlatRefIncrement(&Stream->RefTypeBiasCount[Ref]);
 #else
     UNREFERENCED_PARAMETER(Ref);
 #endif
@@ -732,17 +737,15 @@ QuicStreamRelease(
     CXPLAT_TEL_ASSERT(Stream->RefCount > 0);
 
 #if DEBUG
-    CXPLAT_TEL_ASSERT(Stream->RefTypeCount[Ref] > 0);
-    uint16_t result = (uint16_t)InterlockedDecrement16((volatile short*)&Stream->RefTypeCount[Ref]);
-    CXPLAT_TEL_ASSERT(result != 0xFFFF);
+    CXPLAT_TEL_ASSERT(!CxPlatRefDecrement(&Stream->RefTypeBiasCount[Ref]));
 #else
     UNREFERENCED_PARAMETER(Ref);
 #endif
 
     if (CxPlatRefDecrement(&Stream->RefCount)) {
 #if DEBUG
         for (uint32_t i = 0; i < QUIC_STREAM_REF_COUNT; i++) {
-            CXPLAT_TEL_ASSERT(Stream->RefTypeCount[i] == 0);
+            CXPLAT_TEL_ASSERT(Stream->RefTypeBiasCount[i] == 1);
         }
 #endif
         QuicStreamFree(Stream);