Stop inheriting IThreadPoolWorkitem

More annoying with internal changes.
metalgearsloth · Aug 22, 2024 · dc2d32e · dc2d32e
1 parent f03c006
commit dc2d32e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/Robust.Shared/Threading/IRobustJob.cs b/Robust.Shared/Threading/IRobustJob.cs
@@ -5,6 +5,7 @@ namespace Robust.Shared.Threading;
 /// <summary>
 /// Implement for code that needs to be runnable on a threadpool.
 /// </summary>
-public interface IRobustJob : IThreadPoolWorkItem
+public interface IRobustJob
 {
+    void Execute();
 }
diff --git a/Robust.Shared/Threading/ParallelManager.cs b/Robust.Shared/Threading/ParallelManager.cs
@@ -24,6 +24,8 @@ public interface IParallelManager
     /// <param name="job"></param>
     WaitHandle Process(IRobustJob job);
 
+    public void ProcessNow(IRobustJob job);
+
     /// <summary>
     /// Takes in a parallel job and runs it the specified amount.
     /// </summary>
@@ -123,6 +125,11 @@ public WaitHandle Process(IRobustJob job)
         return subJob.Event.WaitHandle;
     }
 
+    public void ProcessNow(IRobustJob job)
+    {
+        job.Execute();
+    }
+
     /// <inheritdoc/>
     public void ProcessNow(IParallelRobustJob job, int amount)
     {
@@ -195,7 +202,7 @@ private ParallelTracker InternalProcess(IParallelRobustJob job, int amount)
     /// <summary>
     /// Runs an <see cref="IRobustJob"/> and handles cleanup.
     /// </summary>
-    private sealed class InternalJob : IRobustJob
+    private sealed class InternalJob : IRobustJob, IThreadPoolWorkItem
     {
         private ISawmill _sawmill = default!;
         private IRobustJob _robust = default!;
@@ -231,7 +238,7 @@ public void Execute()
     /// <summary>
     /// Runs an <see cref="IParallelRobustJob"/> and handles cleanup.
     /// </summary>
-    private sealed class InternalParallelJob : IRobustJob
+    private sealed class InternalParallelJob : IRobustJob, IThreadPoolWorkItem
     {
         private IParallelRobustJob _robust = default!;
         private int _start;

diff --git a/Robust.UnitTesting/TestingParallelManager.cs b/Robust.UnitTesting/TestingParallelManager.cs
@@ -26,6 +26,11 @@ WaitHandle IParallelManager.Process(IRobustJob job)
         return ev.WaitHandle;
     }
 
+    public void ProcessNow(IRobustJob job)
+    {
+        job.Execute();
+    }
+
     /// <inheritdoc/>
     public void ProcessNow(IParallelRobustJob jobs, int amount)
     {