Removing obsolete global lock since now we are using filename-based locking

Author: levitation

AsyncToSyncConverter.cs

@@ -63,7 +63,20 @@ static class AsyncToSyncConverter
 
         public static async Task AsyncFileUpdated(string fullName, Context context)
         {
-            using (await Global.FileOperationAsyncLock.LockAsync())
+            var otherFullName = ConsoleWatch.GetOtherFullName(fullName);
+
+            var filenames = new List<string>()
+                            {
+                                fullName,
+                                otherFullName
+                            };
+
+            //NB! in order to avoid deadlocks, always take the locks in deterministic order
+            filenames.Sort(StringComparer.InvariantCultureIgnoreCase);
+
+            using (await Global.FileOperationLocks.LockAsync(filenames[0], context.Token))
+            using (await Global.FileOperationLocks.LockAsync(filenames[1], context.Token))
+            //using (await Global.FileOperationAsyncLock.LockAsync())
             {
                 //@"\\?\" prefix is needed for reading from long paths: https://stackoverflow.com/questions/44888844/directorynotfoundexception-when-using-long-paths-in-net-4-7
                 var fileData = await FileExtensions.ReadAllTextAsync(@"\\?\" + fullName, context.Token);

Program.cs

@@ -41,9 +41,8 @@ internal static class Global
 
 
 
-        internal static readonly AsyncLock FileOperationAsyncLock = new AsyncLock();
-
-        internal static ConcurrentDictionary<string, DateTime> ConverterSavedFileDates = new ConcurrentDictionary<string, DateTime>();
+        internal static readonly AsyncLockQueueDictionary FileOperationLocks = new AsyncLockQueueDictionary();
+        //internal static readonly AsyncLock FileOperationAsyncLock = new AsyncLock();
     }
 #pragma warning restore S2223
 
@@ -303,6 +302,7 @@ internal class ConsoleWatch
         public static bool DoingInitialSync = false;
 #pragma warning restore S2223
 
+        private static ConcurrentDictionary<string, DateTime> ConverterSavedFileDates = new ConcurrentDictionary<string, DateTime>();
         private static readonly AsyncLockQueueDictionary FileLocks = new AsyncLockQueueDictionary();
 
 
@@ -396,7 +396,7 @@ public static async Task DeleteFile(string fullName, Context context)
         public static DateTime GetConverterSaveDate(string fullName)
         {
             DateTime converterSaveDate;
-            if (!Global.ConverterSavedFileDates.TryGetValue(fullName, out converterSaveDate))
+            if (!ConverterSavedFileDates.TryGetValue(fullName, out converterSaveDate))
             {
                 converterSaveDate = DateTime.MinValue;
             }
@@ -733,7 +733,7 @@ public static async Task SaveFileModifications(string fullName, string fileData,
                 await FileExtensions.WriteAllTextAsync(@"\\?\" + otherFullName, fileData, context.Token);
 
                 var now = DateTime.UtcNow;  //NB! compute now after saving the file
-                Global.ConverterSavedFileDates[otherFullName] = now;
+                ConverterSavedFileDates[otherFullName] = now;
 
 
                 await AddMessage(ConsoleColor.Magenta, $"Synchronised updates from file {fullName}", context);
@@ -752,7 +752,7 @@ public static async Task SaveFileModifications(string fullName, string fileData,
                     await ConsoleWatch.WriteException(ex, context);
                 }
 
-                Global.ConverterSavedFileDates[otherFullName] = now;
+                ConverterSavedFileDates[otherFullName] = now;
             }
         }
 
@@ -780,7 +780,7 @@ public static async Task SaveFileModifications(string fullName, byte[] fileData,
                 await FileExtensions.WriteAllBytesAsync(@"\\?\" + otherFullName, fileData, context.Token);
 
                 var now = DateTime.UtcNow;  //NB! compute now after saving the file
-                Global.ConverterSavedFileDates[otherFullName] = now;
+                ConverterSavedFileDates[otherFullName] = now;
 
 
                 await AddMessage(ConsoleColor.Magenta, $"Synchronised updates from file {fullName}", context);
@@ -799,7 +799,7 @@ public static async Task SaveFileModifications(string fullName, byte[] fileData,
                     await ConsoleWatch.WriteException(ex, context);
                 }
 
-                Global.ConverterSavedFileDates[otherFullName] = now;
+                ConverterSavedFileDates[otherFullName] = now;
             }
         }
 

SyncToAsyncConverter.cs

@@ -61,7 +61,20 @@ static SyncToAsyncConverter()
 
         public static async Task SyncFileUpdated(string fullName, Context context)
         {
-            using (await Global.FileOperationAsyncLock.LockAsync())
+            var otherFullName = ConsoleWatch.GetOtherFullName(fullName);
+
+            var filenames = new List<string>()
+                            {
+                                fullName,
+                                otherFullName
+                            };
+
+            //NB! in order to avoid deadlocks, always take the locks in deterministic order
+            filenames.Sort(StringComparer.InvariantCultureIgnoreCase);
+
+            using (await Global.FileOperationLocks.LockAsync(filenames[0], context.Token))
+            using (await Global.FileOperationLocks.LockAsync(filenames[1], context.Token))
+            //using (await Global.FileOperationAsyncLock.LockAsync())
             {
                 //@"\\?\" prefix is needed for reading from long paths: https://stackoverflow.com/questions/44888844/directorynotfoundexception-when-using-long-paths-in-net-4-7
                 var fileData = await FileExtensions.ReadAllTextAsync(@"\\?\" + fullName, context.Token);