Merge pull request #72053 from raulsntos/dotnet/sync-context-dispose

C#: Implement disposable pattern and seal `GodotSynchronizationContext` class and related

3 files changed, 18 insertions, 5 deletions

diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Dispatcher.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Dispatcher.cs
index e6cb4171a7..e7370b2b05 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Dispatcher.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Dispatcher.cs
@@ -9,7 +9,10 @@ namespace Godot
         internal static GodotTaskScheduler DefaultGodotTaskScheduler;
 
         internal static void InitializeDefaultGodotTaskScheduler()
-            => DefaultGodotTaskScheduler = new GodotTaskScheduler();
+        {
+            DefaultGodotTaskScheduler?.Dispose();
+            DefaultGodotTaskScheduler = new GodotTaskScheduler();
+        }
 
         public static GodotSynchronizationContext SynchronizationContext => DefaultGodotTaskScheduler.Context;
     }
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/GodotSynchronizationContext.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/GodotSynchronizationContext.cs
index 1b599beab5..027eab30fc 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/GodotSynchronizationContext.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/GodotSynchronizationContext.cs
@@ -1,13 +1,13 @@
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Threading;
 
 namespace Godot
 {
-    public class GodotSynchronizationContext : SynchronizationContext
+    public sealed class GodotSynchronizationContext : SynchronizationContext, IDisposable
     {
-        private readonly BlockingCollection<KeyValuePair<SendOrPostCallback, object>> _queue =
-            new BlockingCollection<KeyValuePair<SendOrPostCallback, object>>();
+        private readonly BlockingCollection<KeyValuePair<SendOrPostCallback, object>> _queue = new();
 
         public override void Post(SendOrPostCallback d, object state)
         {
@@ -24,5 +24,10 @@ namespace Godot
                 workItem.Key(workItem.Value);
             }
         }
+
+        public void Dispose()
+        {
+            _queue.Dispose();
+        }
     }
 }
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/GodotTaskScheduler.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/GodotTaskScheduler.cs
index 408bed71b2..f6c36455b2 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/GodotTaskScheduler.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/GodotTaskScheduler.cs
@@ -10,7 +10,7 @@ namespace Godot
     /// GodotTaskScheduler contains a linked list of tasks to perform as a queue. Methods
     /// within the class are used to control the queue and perform the contained tasks.
     /// </summary>
-    public class GodotTaskScheduler : TaskScheduler
+    public sealed class GodotTaskScheduler : TaskScheduler, IDisposable
     {
         /// <summary>
         /// The current synchronization context.
@@ -108,5 +108,10 @@ namespace Godot
                 }
             }
         }
+
+        public void Dispose()
+        {
+            Context.Dispose();
+        }
     }
 }