simplify counting

Author: mgravell

src/StackExchange.Redis/ConnectionMultiplexer.Debug.cs

@@ -4,24 +4,23 @@ namespace StackExchange.Redis;
 
 public partial class ConnectionMultiplexer
 {
-    private static int _collectedWithoutDispose, s_MuxerDestroyCount, s_MuxerCreateCount;
+    private static int _collectedWithoutDispose, s_DisposedCount, s_MuxerCreateCount;
     internal static int CollectedWithoutDispose => Volatile.Read(ref _collectedWithoutDispose);
 
-    internal static int GetLiveObjectCount(out int created, out int destroyed, out int nonDisposed)
+    internal static int GetLiveObjectCount(out int created, out int disposed, out int finalized)
     {
         // read destroy first, to prevent negative numbers in race conditions
-        destroyed = Volatile.Read(ref s_MuxerDestroyCount);
+        disposed = Volatile.Read(ref s_DisposedCount);
         created = Volatile.Read(ref s_MuxerCreateCount);
-        nonDisposed = Volatile.Read(ref _collectedWithoutDispose);
-        return created - destroyed;
+        finalized = Volatile.Read(ref _collectedWithoutDispose);
+        return created - (disposed + finalized);
     }
 
     /// <summary>
     /// Invoked by the garbage collector.
     /// </summary>
     ~ConnectionMultiplexer()
     {
-        Interlocked.Increment(ref s_MuxerDestroyCount);
         Interlocked.Increment(ref _collectedWithoutDispose);
     }
 

src/StackExchange.Redis/ConnectionMultiplexer.cs

@@ -2260,8 +2260,8 @@ ConfigurationChangedChannel is byte[] channel
         public void Dispose()
         {
             GC.SuppressFinalize(this);
-            Interlocked.Increment(ref s_MuxerDestroyCount);
-            Close(!_isDisposed);
+            if (!_isDisposed) Interlocked.Increment(ref s_DisposedCount);
+            Close(!_isDisposed); // marks disposed
             sentinelConnection?.Dispose();
             var oldTimer = Interlocked.Exchange(ref sentinelPrimaryReconnectTimer, null);
             oldTimer?.Dispose();
@@ -2273,8 +2273,8 @@ public void Dispose()
         public async ValueTask DisposeAsync()
         {
             GC.SuppressFinalize(this);
-            Interlocked.Increment(ref s_MuxerDestroyCount);
-            await CloseAsync(!_isDisposed).ForAwait();
+            if (!_isDisposed) Interlocked.Increment(ref s_DisposedCount);
+            await CloseAsync(!_isDisposed).ForAwait(); // marks disposed
             if (sentinelConnection is ConnectionMultiplexer sentinel)
             {
                 await sentinel.DisposeAsync().ForAwait();

src/StackExchange.Redis/ExceptionFactory.cs

@@ -347,10 +347,10 @@ private static void AddCommonDetail(
                 Add(data, sb, "Last-Result-Bytes", "last-in", bs.Connection.BytesLastResult.ToString());
                 Add(data, sb, "Inbound-Buffer-Bytes", "cur-in", bs.Connection.BytesInBuffer.ToString());
 
-                var liveMuxers = ConnectionMultiplexer.GetLiveObjectCount(out var created, out var destroyed, out var nonDisposed);
+                var liveMuxers = ConnectionMultiplexer.GetLiveObjectCount(out var created, out var disposed, out var finalized);
                 if (created > 1)
                 {
-                    Add(data, sb, "Live-Multiplexers", "lm", $"{liveMuxers}/{created}/{destroyed}/{nonDisposed}");
+                    Add(data, sb, "Live-Multiplexers", "lm", $"{liveMuxers}/{created}/{disposed}/{finalized}");
                 }
 
                 Add(data, sb, "Sync-Ops", "sync-ops", multiplexer.syncOps.ToString());