refactor runners

lunditoph-siago · Feb 24, 2024 · 322461e · 322461e
1 parent 1e6c4b4
commit 322461e
Show file tree

Hide file tree

Showing 8 changed files with 156 additions and 124 deletions.
diff --git a/Sia/Entities/Extensions/EntityHostExtensions.Handle.cs b/Sia/Entities/Extensions/EntityHostExtensions.Handle.cs
@@ -19,7 +19,7 @@ public static unsafe void Handle<TRunner>(
 
         runner.Run(count, new(host, handler), static (in HandleData data, (int, int) range) => {
             data.Handler(data.Host, range.Item1, range.Item2);
-        });
+        }).WaitAndReturn();
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -32,7 +32,7 @@ public static unsafe void Handle<TRunner, TData>(
 
         runner.Run(count, new(host, userData, handler), static (in HandleData<TData> data, (int, int) range) => {
             data.Handler(data.Host, data.UserData, range.Item1, range.Item2);
-        });
+        }).WaitAndReturn();
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]

diff --git a/Sia/Entities/Extensions/EntityQueryExtensions.Handle.cs b/Sia/Entities/Extensions/EntityQueryExtensions.Handle.cs
@@ -58,7 +58,7 @@ public static unsafe void Handle<TRunner>(
                     slotIndex = 0;
                 }
             }
-        });
+        }).WaitAndReturn();
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -93,7 +93,7 @@ public static unsafe void Handle<TRunner, TData>(
                 host = hosts[++hostIndex];
                 slotIndex = 0;
             }
-        });
+        }).WaitAndReturn();
     }
 
     #region CurrentThreadRunner

diff --git a/Sia/Runners/CurrentThreadRunner.cs b/Sia/Runners/CurrentThreadRunner.cs
@@ -9,16 +9,32 @@ public sealed class CurrentThreadRunner : IRunner
     private CurrentThreadRunner() {}
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public void Run(Action action) => action();
+    public IRunnerBarrier Run(Action action)
+    {
+        action();
+        return RunnerBarriers.Empty;
+    }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public void Run<TData>(in TData data, InAction<TData> action) => action(data);
+    public IRunnerBarrier Run<TData>(in TData data, InAction<TData> action)
+    {
+        action(data);
+        return RunnerBarriers.Empty;
+    }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public void Run(int taskCount, GroupAction action) => action((0, taskCount));
+    public IRunnerBarrier Run(int taskCount, GroupAction action)
+    {
+        action((0, taskCount));
+        return RunnerBarriers.Empty;
+    }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public void Run<TData>(int taskCount, in TData data, GroupAction<TData> action) => action(data, (0, taskCount));
+    public IRunnerBarrier Run<TData>(int taskCount, in TData data, GroupAction<TData> action)
+    {
+        action(data, (0, taskCount));
+        return RunnerBarriers.Empty;
+    }
 
     public void Dispose() {}
 }
diff --git a/Sia/Runners/Interfaces/IJob.cs b/Sia/Runners/Interfaces/IJob.cs
@@ -2,6 +2,6 @@ namespace Sia;
 
 public interface IJob
 {
-    void Throw(Exception e);
+    IRunnerBarrier Barrier { get; }
     void Invoke();
 }
diff --git a/Sia/Runners/Interfaces/IRunner.cs b/Sia/Runners/Interfaces/IRunner.cs
@@ -2,8 +2,8 @@ namespace Sia;
 
 public interface IRunner : IDisposable
 {
-    void Run(Action action);
-    void Run<TData>(in TData data, InAction<TData> action);
-    void Run(int taskCount, GroupAction action);
-    void Run<TData>(int taskCount, in TData data, GroupAction<TData> action);
+    IRunnerBarrier Run(Action action);
+    IRunnerBarrier Run<TData>(in TData data, InAction<TData> action);
+    IRunnerBarrier Run(int taskCount, GroupAction action);
+    IRunnerBarrier Run<TData>(int taskCount, in TData data, GroupAction<TData> action);
 }
diff --git a/Sia/Runners/Interfaces/IRunnerBarrier.cs b/Sia/Runners/Interfaces/IRunnerBarrier.cs
@@ -0,0 +1,10 @@
+namespace Sia;
+
+public interface IRunnerBarrier
+{
+    Exception? Exception { get; }
+
+    void Signal();
+    void Throw(Exception e);
+    void WaitAndReturn();
+}