Merge pull request #1015 from Soreepeong/fix/ticktask-racecon

Dalamud/Game/Framework.cs

@@ -27,12 +27,15 @@ namespace Dalamud.Game
     {
         private static Stopwatch statsStopwatch = new();
 
-        private readonly List<RunOnNextTickTaskBase> runOnNextTickTaskList = new();
         private readonly Stopwatch updateStopwatch = new();
 
         private readonly Hook<OnUpdateDetour> updateHook;
         private readonly Hook<OnRealDestroyDelegate> destroyHook;
 
+        private readonly object runOnNextTickTaskListSync = new();
+        private List<RunOnNextTickTaskBase> runOnNextTickTaskList = new();
+        private List<RunOnNextTickTaskBase> runOnNextTickTaskList2 = new();
+
         private Thread? frameworkUpdateThread;
 
         [ServiceManager.ServiceConstructor]
@@ -193,6 +196,8 @@ namespace Dalamud.Game
             }
 
             var tcs = new TaskCompletionSource<T>();
+            lock (this.runOnNextTickTaskListSync)
+            {
                 this.runOnNextTickTaskList.Add(new RunOnNextTickTaskFunc<T>()
                 {
                     RemainingTicks = delayTicks,
@@ -201,6 +206,8 @@ namespace Dalamud.Game
                     TaskCompletionSource = tcs,
                     Func = func,
                 });
+            }
+
             return tcs.Task;
         }
 
@@ -225,6 +232,8 @@ namespace Dalamud.Game
             }
 
             var tcs = new TaskCompletionSource();
+            lock (this.runOnNextTickTaskListSync)
+            {
                 this.runOnNextTickTaskList.Add(new RunOnNextTickTaskAction()
                 {
                     RemainingTicks = delayTicks,
@@ -233,6 +242,8 @@ namespace Dalamud.Game
                     TaskCompletionSource = tcs,
                     Action = action,
                 });
+            }
+
             return tcs.Task;
         }
 
@@ -258,6 +269,8 @@ namespace Dalamud.Game
             }
 
             var tcs = new TaskCompletionSource<Task<T>>();
+            lock (this.runOnNextTickTaskListSync)
+            {
                 this.runOnNextTickTaskList.Add(new RunOnNextTickTaskFunc<Task<T>>()
                 {
                     RemainingTicks = delayTicks,
@@ -266,6 +279,8 @@ namespace Dalamud.Game
                     TaskCompletionSource = tcs,
                     Func = func,
                 });
+            }
+
             return tcs.Task.ContinueWith(x => x.Result, cancellationToken).Unwrap();
         }
 
@@ -291,6 +306,8 @@ namespace Dalamud.Game
             }
 
             var tcs = new TaskCompletionSource<Task>();
+            lock (this.runOnNextTickTaskListSync)
+            {
                 this.runOnNextTickTaskList.Add(new RunOnNextTickTaskFunc<Task>()
                 {
                     RemainingTicks = delayTicks,
@@ -299,6 +316,8 @@ namespace Dalamud.Game
                     TaskCompletionSource = tcs,
                     Func = func,
                 });
+            }
+
             return tcs.Task.ContinueWith(x => x.Result, cancellationToken).Unwrap();
         }
 
@@ -330,6 +349,20 @@ namespace Dalamud.Game
             this.destroyHook.Enable();
         }
 
+        private void RunPendingTickTasks()
+        {
+            if (this.runOnNextTickTaskList.Count == 0 && this.runOnNextTickTaskList2.Count == 0)
+                return;
+
+            for (var i = 0; i < 2; i++)
+            {
+                lock (this.runOnNextTickTaskListSync)
+                    (this.runOnNextTickTaskList, this.runOnNextTickTaskList2) = (this.runOnNextTickTaskList2, this.runOnNextTickTaskList);
+
+                this.runOnNextTickTaskList2.RemoveAll(x => x.Run());
+            }
+        }
+
         private bool HandleFrameworkUpdate(IntPtr framework)
         {
             this.frameworkUpdateThread ??= Thread.CurrentThread;
@@ -362,7 +395,7 @@ namespace Dalamud.Game
                 this.LastUpdate = DateTime.Now;
                 this.LastUpdateUTC = DateTime.UtcNow;
 
-                this.runOnNextTickTaskList.RemoveAll(x => x.Run());
+                this.RunPendingTickTasks();
 
                 if (StatsEnabled && this.Update != null)
                 {
@@ -430,7 +463,7 @@ namespace Dalamud.Game
 
             Log.Information("Framework::Destroy!");
             Service<Dalamud>.Get().Unload();
-            this.runOnNextTickTaskList.RemoveAll(x => x.Run());
+            this.RunPendingTickTasks();
             ServiceManager.UnloadAllServices();
             Log.Information("Framework::Destroy OK!");