Switch to using ref counts

Author: anrossi

src/core/api.c

@@ -444,7 +444,7 @@ MsQuicConnectionStart(
         goto Error;
     }
 
-    QuicConfigurationAddRef(Configuration, QUIC_CONF_REF_OPERATION);
+    QuicConfigurationAddRef(Configuration, QUIC_CONF_REF_CONN_START_OP);
     Oper->API_CALL.Context->Type = QUIC_API_TYPE_CONN_START;
     Oper->API_CALL.Context->CONN_START.Configuration = Configuration;
     Oper->API_CALL.Context->CONN_START.ServerName = ServerNameCopy;
@@ -543,7 +543,7 @@ MsQuicConnectionSetConfiguration(
         goto Error;
     }
 
-    QuicConfigurationAddRef(Configuration, QUIC_CONF_REF_OPERATION);
+    QuicConfigurationAddRef(Configuration, QUIC_CONF_REF_CONN_SET_OP);
     Oper->API_CALL.Context->Type = QUIC_API_TYPE_CONN_SET_CONFIGURATION;
     Oper->API_CALL.Context->CONN_SET_CONFIGURATION.Configuration = Configuration;
 

src/core/configuration.c

@@ -85,7 +85,7 @@ MsQuicConfigurationOpen(
     Configuration->Registration = Registration;
     CxPlatRefInitialize(&Configuration->RefCount);
 #if DEBUG
-    Configuration->RefTypeCount[QUIC_CONF_REF_HANDLE] = 1;
+    CxPlatRefInitialize(&Configuration->RefTypeCount[QUIC_CONF_REF_HANDLE]);
 #endif
 
     Configuration->AlpnListLength = (uint16_t)AlpnListLength;

src/core/configuration.h

@@ -5,12 +5,16 @@
 
 --*/
 
+//
+// The different kinds of references on a Configuration.
+//
 typedef enum QUIC_CONFIGURATION_REF {
 
-    QUIC_CONF_REF_HANDLE,       // The handle provided to the app.
-    QUIC_CONF_REF_CONNECTION,   // Per connection using this Configuration.
-    QUIC_CONF_REF_LOAD_CRED,    // During async credential loading.
-    QUIC_CONF_REF_OPERATION,    // Per queued operation.
+    QUIC_CONF_REF_HANDLE,
+    QUIC_CONF_REF_CONNECTION,
+    QUIC_CONF_REF_LOAD_CRED,
+    QUIC_CONF_REF_CONN_START_OP,
+    QUIC_CONF_REF_CONN_SET_OP,
 
     QUIC_CONF_REF_COUNT
 } QUIC_CONFIGURATION_REF;
@@ -45,7 +49,7 @@ typedef struct QUIC_CONFIGURATION {
     //
     // Detailed Reference count.
     //
-    uint16_t RefTypeCount[QUIC_CONF_REF_COUNT];
+    CXPLAT_REF_COUNT RefTypeCount[QUIC_CONF_REF_COUNT];
 #endif
 
     //
@@ -127,12 +131,12 @@ QuicConfigurationAddRef(
     _In_ QUIC_CONFIGURATION_REF Ref
     )
 {
+    CxPlatRefIncrement(&Configuration->RefCount);
 #if DEBUG
-    InterlockedIncrement16((volatile short*)&Configuration->RefTypeCount[Ref]);
+    CxPlatRefIncrement(&Configuration->RefTypeCount[Ref]);
 #else
     UNREFERENCED_PARAMETER(Ref);
 #endif
-    CxPlatRefIncrement(&Configuration->RefCount);
 }
 
 //
@@ -146,9 +150,7 @@ QuicConfigurationRelease(
     )
 {
 #if DEBUG
-    CXPLAT_TEL_ASSERT(Configuration->RefTypeCount[Ref] > 0);
-    uint16_t Result = (uint16_t)InterlockedDecrement16((volatile short*)&Configuration->RefTypeCount[Ref]);
-    CXPLAT_TEL_ASSERT(Result != 0xFFFF);
+    CxPlatRefDecrement(&Configuration->RefTypeCount[Ref]);
 #else
     UNREFERENCED_PARAMETER(Ref);
 #endif

src/core/operation.c

@@ -95,12 +95,12 @@ QuicOperationFree(
     if (Oper->Type == QUIC_OPER_TYPE_API_CALL) {
         QUIC_API_CONTEXT* ApiCtx = Oper->API_CALL.Context;
         if (ApiCtx->Type == QUIC_API_TYPE_CONN_START) {
-            QuicConfigurationRelease(ApiCtx->CONN_START.Configuration, QUIC_CONF_REF_OPERATION);
+            QuicConfigurationRelease(ApiCtx->CONN_START.Configuration, QUIC_CONF_REF_CONN_START_OP);
             if (ApiCtx->CONN_START.ServerName != NULL) {
                 CXPLAT_FREE(ApiCtx->CONN_START.ServerName, QUIC_POOL_SERVERNAME);
             }
         } else if (ApiCtx->Type == QUIC_API_TYPE_CONN_SET_CONFIGURATION) {
-            QuicConfigurationRelease(ApiCtx->CONN_SET_CONFIGURATION.Configuration, QUIC_CONF_REF_OPERATION);
+            QuicConfigurationRelease(ApiCtx->CONN_SET_CONFIGURATION.Configuration, QUIC_CONF_REF_CONN_SET_OP);
         } else if (ApiCtx->Type == QUIC_API_TYPE_CONN_SEND_RESUMPTION_TICKET) {
             if (ApiCtx->CONN_SEND_RESUMPTION_TICKET.ResumptionAppData != NULL) {
                 CXPLAT_DBG_ASSERT(ApiCtx->CONN_SEND_RESUMPTION_TICKET.AppDataLength != 0);