Cleanup some code

Author: xoofx

src/Ultra.Core/DiagnosticPortSession.cs

@@ -77,7 +77,7 @@ private async Task ConnectAndStartProfilingImpl(int pid, bool sampler, string ba
 
     public async Task StartProfiling(CancellationToken token)
     {
-        // We want to make sure that we are not disposing while we are connecting
+        // We want to make sure that we are not disposing while we are starting a session
         await _semaphoreSlim.WaitAsync(token);
 
         try
@@ -143,6 +143,9 @@ public async Task WaitForConnectAndStartSession()
         var pattern = $"dotnet-diagnostic-{pid}-*-socket";
         string? diagnosticPortSocket = null;
 
+        int waitForNextCheckDelayInMs = 10;
+
+        // This loop is blocking until a file is available or the token is cancelled
         while (true)
         {
             if (Directory.Exists(tempFolder))
@@ -166,7 +169,11 @@ public async Task WaitForConnectAndStartSession()
                 }
             }
 
-            await Task.Delay(10, token).ConfigureAwait(false);
+            await Task.Delay(waitForNextCheckDelayInMs, token).ConfigureAwait(false);
+
+            // Let's increase the delay after each check to lower the overhead
+            waitForNextCheckDelayInMs += 10;
+            waitForNextCheckDelayInMs = Math.Max(waitForNextCheckDelayInMs, 100);
         }
 
         return diagnosticPortSocket;
@@ -246,38 +253,4 @@ public async ValueTask StopAndDisposeAsync()
             _cancelConnectSource.Dispose();
         }
     }
-
-    private async Task StopAsync(CancellationToken token)
-    {
-        if (_eventPipeSession is null) return;
-
-        try
-        {
-            await _eventPipeSession.StopAsync(token).ConfigureAwait(false);
-        }
-        catch (EndOfStreamException)
-        {
-
-        }
-        catch (TimeoutException)
-        {
-
-        }
-        catch (OperationCanceledException)
-        {
-
-        }
-        catch (PlatformNotSupportedException)
-        {
-
-        }
-        catch (ServerNotAvailableException)
-        {
-
-        }
-        catch (SocketException)
-        {
-
-        }
-    }
 }

src/Ultra.Core/UltraProfiler.cs

@@ -6,6 +6,7 @@
 using System.IO.Compression;
 using System.Runtime.InteropServices;
 using System.Text.Json;
+using System.Threading;
 using ByteSizeLib;
 
 namespace Ultra.Core;
@@ -21,17 +22,18 @@ public abstract class UltraProfiler : IDisposable
     private protected readonly Stopwatch ProfilerClock;
     private protected TimeSpan LastTimeProgress;
     private readonly CancellationTokenSource _cancellationTokenSource;
+    private bool _disposed;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="UltraProfiler"/> class.
     /// </summary>
-    protected UltraProfiler()
+    private protected UltraProfiler()
     {
         ProfilerClock = new Stopwatch();
         _cancellationTokenSource = new CancellationTokenSource();
     }
 
-    protected CancellationToken CancellationToken => _cancellationTokenSource.Token;
+    private protected CancellationToken CancellationToken => _cancellationTokenSource.Token;
 
     /// <summary>
     /// Creates a new instance of the <see cref="UltraProfiler"/> class.
@@ -69,6 +71,9 @@ public bool Cancel()
         {
             StopRequested = true;
 
+            // Make sure that we cancel any pending operations
+            _cancellationTokenSource.Cancel();
+
             // Before really canceling, wait for the clean cancel to be done
             WaitForCleanCancel();
             return true;
@@ -80,7 +85,11 @@ public bool Cancel()
     /// </summary>
     public void Dispose()
     {
+        if (_disposed) return;
+        _disposed = true;
+
         DisposeImpl();
+        _cancellationTokenSource.Dispose();
         CleanCancel?.Dispose();
         CleanCancel = null;
     }