Improve mutex stuff?

idk i cant really find anything else wrong with it
bloxstraplabs · Aug 23, 2023 · 5741d82 · 5741d82
1 parent 7a963c5
commit 5741d82
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/Bloxstrap/Bootstrapper.cs b/Bloxstrap/Bootstrapper.cs
@@ -119,6 +119,8 @@ public async Task Run()
 
             App.Logger.WriteLine(LOG_IDENT, "Performing connectivity check...");
 
+            SetStatus("Connecting to Roblox...");
+
             try
             {
                 await RobloxDeployment.GetInfo(RobloxDeployment.DefaultChannel);
@@ -158,8 +160,9 @@ public async Task Run()
 
             try
             {
-                Mutex.OpenExisting("Bloxstrap_BootstrapperMutex").Close();
-                App.Logger.WriteLine(LOG_IDENT, "Bloxstrap_BootstrapperMutex mutex exists, waiting...");
+                Mutex.OpenExisting("Bloxstrap_SingletonMutex").Close();
+                App.Logger.WriteLine(LOG_IDENT, "Bloxstrap_SingletonMutex mutex exists, waiting...");
+                SetStatus("Waiting for other instances...");
                 mutexExists = true;
             }
             catch (Exception)
@@ -168,7 +171,7 @@ public async Task Run()
             }
 
             // wait for mutex to be released if it's not yet
-            await using AsyncMutex mutex = new("Bloxstrap_BootstrapperMutex");
+            await using var mutex = new AsyncMutex(true, "Bloxstrap_SingletonMutex");
             await mutex.AcquireAsync(_cancelTokenSource.Token);
 
             // reload our configs since they've likely changed by now
@@ -219,8 +222,6 @@ private async Task CheckLatestVersion()
         {
             const string LOG_IDENT = "Bootstrapper::CheckLatestVersion";
 
-            SetStatus("Connecting to Roblox...");
-
             ClientVersion clientVersion;
 
             try

diff --git a/Bloxstrap/Utility/AsyncMutex.cs b/Bloxstrap/Utility/AsyncMutex.cs
@@ -4,13 +4,15 @@
 
     public sealed class AsyncMutex : IAsyncDisposable
     {
+        private readonly bool _initiallyOwned;
         private readonly string _name;
         private Task? _mutexTask;
         private ManualResetEventSlim? _releaseEvent;
         private CancellationTokenSource? _cancellationTokenSource;
 
-        public AsyncMutex(string name)
+        public AsyncMutex(bool initiallyOwned, string name)
         {
+            _initiallyOwned = initiallyOwned;
             _name = name;
         }
 
@@ -31,7 +33,7 @@ public Task AcquireAsync(CancellationToken cancellationToken)
                     try
                     {
                         CancellationToken cancellationToken = _cancellationTokenSource.Token;
-                        using var mutex = new Mutex(false, _name);
+                        using var mutex = new Mutex(_initiallyOwned, _name);
                         try
                         {
                             // Wait for either the mutex to be acquired, or cancellation