Removed the dependency on IExecutor from IExecutorBatch.

Author: tosh-coding

src/AsyncFiberWorks/Core/AsyncSimpleExecutorBatch.cs

@@ -19,22 +19,11 @@ public class AsyncSimpleExecutorBatch : IAsyncExecutorBatch
         /// Executes all actions.
         /// </summary>
         /// <param name="actions"></param>
-        /// <param name="executorSingle"></param>
-        public async Task Execute(IReadOnlyList<Func<Task>> actions, IAsyncExecutor executorSingle = null)
+        public async Task Execute(IReadOnlyList<Func<Task>> actions)
         {
-            if (executorSingle == null)
+            foreach (var action in actions)
             {
-                foreach (var action in actions)
-                {
-                    await action.Invoke().ConfigureAwait(false);
-                }
-            }
-            else
-            {
-                foreach (var action in actions)
-                {
-                    await executorSingle.Execute(action).ConfigureAwait(false);
-                }
+                await action.Invoke().ConfigureAwait(false);
             }
         }
     }

src/AsyncFiberWorks/Core/IAsyncExecutorBatch.cs

@@ -13,8 +13,7 @@ public interface IAsyncExecutorBatch
         /// Executes all actions.
         /// </summary>
         /// <param name="actions">A list of actions.</param>
-        /// <param name="executorSingle">The executor for each operation.</param>
         /// <returns>A task that waits for actions to be performed.</returns>
-        Task Execute(IReadOnlyList<Func<Task>> actions, IAsyncExecutor executorSingle);
+        Task Execute(IReadOnlyList<Func<Task>> actions);
     }
 }

src/AsyncFiberWorks/Core/IExecutorBatch.cs

@@ -12,7 +12,6 @@ public interface IExecutorBatch
         /// Executes all actions.
         /// </summary>
         /// <param name="actions">A list of actions.</param>
-        /// <param name="executorSingle">The executor for each operation.</param>
-        void Execute(IReadOnlyList<Action> actions, IExecutor executorSingle);
+        void Execute(IReadOnlyList<Action> actions);
     }
 }

src/AsyncFiberWorks/Core/SimpleExecutorBatch.cs

@@ -18,12 +18,11 @@ public class SimpleExecutorBatch : IExecutorBatch
         /// Executes all actions.
         /// </summary>
         /// <param name="toExecute"></param>
-        /// <param name="executorSingle"></param>
-        public void Execute(IReadOnlyList<Action> toExecute, IExecutor executorSingle)
+        public void Execute(IReadOnlyList<Action> toExecute)
         {
             foreach (var action in toExecute)
             {
-                executorSingle.Execute(action);
+                action();
             }
         }
     }

src/AsyncFiberWorks/Procedures/AsyncActionDriver.cs

@@ -44,21 +44,34 @@ public AsyncActionDriver()
         /// <returns>Unsubscriber.</returns>
         public IDisposable Subscribe(Func<Task> action)
         {
-            var maskableFilter = new AsyncMaskableExecutor();
-            var disposable = _actions.AddHandler(() => maskableFilter.Execute(action));
-            return new Unsubscriber(() =>
+            if (_executorSingle != null)
             {
-                maskableFilter.IsEnabled = false;
-                disposable.Dispose();
-            });
+                var maskableFilter = new AsyncMaskableExecutor();
+                var disposable = _actions.AddHandler(() => maskableFilter.Execute(() => _executorSingle.Execute(action)));
+                return new Unsubscriber(() =>
+                {
+                    maskableFilter.IsEnabled = false;
+                    disposable.Dispose();
+                });
+            }
+            else
+            {
+                var maskableFilter = new AsyncMaskableExecutor();
+                var disposable = _actions.AddHandler(() => maskableFilter.Execute(action));
+                return new Unsubscriber(() =>
+                {
+                    maskableFilter.IsEnabled = false;
+                    disposable.Dispose();
+                });
+            }
         }
 
         /// <summary>
         /// <see cref="IAsyncActionInvoker.Invoke"/>
         /// </summary>
         public async Task Invoke()
         {
-            await _actions.Invoke(_executorBatch, _executorSingle).ConfigureAwait(false);
+            await _actions.Invoke(_executorBatch).ConfigureAwait(false);
         }
 
         ///<summary>

src/AsyncFiberWorks/Procedures/AsyncActionList.cs

@@ -43,9 +43,8 @@ public IDisposable AddHandler(Func<Task> action)
         /// Invoke all actions.
         /// </summary>
         /// <param name="executorBatch"></param>
-        /// <param name="executorSingle"></param>
         /// <returns>A task that waits for actions to be performed.</returns>
-        public async Task Invoke(IAsyncExecutorBatch executorBatch, IAsyncExecutor executorSingle = null)
+        public async Task Invoke(IAsyncExecutorBatch executorBatch)
         {
             lock (_lock)
             {
@@ -59,7 +58,7 @@ public async Task Invoke(IAsyncExecutorBatch executorBatch, IAsyncExecutor execu
             }
             try
             {
-                await executorBatch.Execute(_copied, executorSingle).ConfigureAwait(false);
+                await executorBatch.Execute(_copied).ConfigureAwait(false);
             }
             finally
             {

src/AsyncFiberWorks/Threading/BoundedQueue.cs

@@ -19,11 +19,11 @@ public class BoundedQueue : IDedicatedConsumerThreadWork
         private List<Action> _actions = new List<Action>();
         private List<Action> _toPass = new List<Action>();
 
-        ///<summary>
+        /// <summary>
         /// Creates a bounded queue with a custom executor.
-        ///</summary>
-        ///<param name="executorBatch"></param>
-        ///<param name="executorSingle"></param>
+        /// </summary>
+        /// <param name="executorBatch"></param>
+        /// <param name="executorSingle">The executor for each operation.</param>
         public BoundedQueue(IExecutorBatch executorBatch, IExecutor executorSingle)
         {
             MaxDepth = -1;
@@ -55,12 +55,26 @@ public BoundedQueue()
         /// <param name="action"></param>
         public void Enqueue(Action action)
         {
-            lock (_lock)
+            if (_executorSingle != null)
             {
-                if (SpaceAvailable(1))
+                lock (_lock)
                 {
-                    _actions.Add(action);
-                    Monitor.PulseAll(_lock);
+                    if (SpaceAvailable(1))
+                    {
+                        _actions.Add(() => _executorSingle.Execute(action));
+                        Monitor.PulseAll(_lock);
+                    }
+                }
+            }
+            else
+            {
+                lock (_lock)
+                {
+                    if (SpaceAvailable(1))
+                    {
+                        _actions.Add(action);
+                        Monitor.PulseAll(_lock);
+                    }
                 }
             }
         }
@@ -146,7 +160,7 @@ private bool ExecuteNextBatch()
             {
                 return false;
             }
-            _executorBatch.Execute(toExecute, _executorSingle);
+            _executorBatch.Execute(toExecute);
             return true;
         }
     }

src/AsyncFiberWorks/Threading/BusyWaitQueue.cs

@@ -22,13 +22,13 @@ public class BusyWaitQueue : IDedicatedConsumerThreadWork
         private List<Action> _actions = new List<Action>();
         private List<Action> _toPass = new List<Action>();
 
-        ///<summary>
+        /// <summary>
         /// BusyWaitQueue with custom executor.
-        ///</summary>
-        ///<param name="spinsBeforeTimeCheck"></param>
-        ///<param name="msBeforeBlockingWait"></param>
-        ///<param name="executorBatch"></param>
-        ///<param name="executorSingle"></param>
+        /// </summary>
+        /// <param name="spinsBeforeTimeCheck"></param>
+        /// <param name="msBeforeBlockingWait"></param>
+        /// <param name="executorBatch"></param>
+        /// <param name="executorSingle">The executor for each operation.</param>
         public BusyWaitQueue(int spinsBeforeTimeCheck, int msBeforeBlockingWait, IExecutorBatch executorBatch, IExecutor executorSingle)
         {
             _executorBatch = executorBatch;
@@ -51,10 +51,21 @@ public BusyWaitQueue(int spinsBeforeTimeCheck, int msBeforeBlockingWait)
         /// <param name="action"></param>
         public void Enqueue(Action action)
         {
-            lock (_lock)
+            if (_executorSingle != null)
             {
-                _actions.Add(action);
-                Monitor.PulseAll(_lock);
+                lock (_lock)
+                {
+                    _actions.Add(() => _executorSingle.Execute(action));
+                    Monitor.PulseAll(_lock);
+                }
+            }
+            else
+            {
+                lock (_lock)
+                {
+                    _actions.Add(action);
+                    Monitor.PulseAll(_lock);
+                }
             }
         }
 
@@ -147,7 +158,7 @@ private bool ExecuteNextBatch()
             {
                 return false;
             }
-            _executorBatch.Execute(toExecute, _executorSingle);
+            _executorBatch.Execute(toExecute);
             return true;
         }
     }

src/AsyncFiberWorks/Threading/DefaultQueue.cs

@@ -19,11 +19,11 @@ public class DefaultQueue : IDedicatedConsumerThreadWork
         private List<Action> _actions = new List<Action>();
         private List<Action> _toPass = new List<Action>();
 
-        ///<summary>
+        /// <summary>
         /// Default queue with custom executor
-        ///</summary>
-        ///<param name="executorBatch"></param>
-        ///<param name="executorSingle"></param>
+        /// </summary>
+        /// <param name="executorBatch"></param>
+        /// <param name="executorSingle">The executor for each operation.</param>
         public DefaultQueue(IExecutorBatch executorBatch, IExecutor executorSingle)
         {
             _executorBatch = executorBatch;
@@ -44,10 +44,21 @@ public DefaultQueue()
         /// <param name="action"></param>
         public void Enqueue(Action action)
         {
-            lock (_lock)
+            if (_executorSingle != null)
             {
-                _actions.Add(action);
-                Monitor.PulseAll(_lock);
+                lock (_lock)
+                {
+                    _actions.Add(() => _executorSingle.Execute(action));
+                    Monitor.PulseAll(_lock);
+                }
+            }
+            else
+            {
+                lock (_lock)
+                {
+                    _actions.Add(action);
+                    Monitor.PulseAll(_lock);
+                }
             }
         }
 
@@ -105,7 +116,7 @@ public bool ExecuteNextBatch()
             {
                 return false;
             }
-            _executorBatch.Execute(toExecute, _executorSingle);
+            _executorBatch.Execute(toExecute);
             return true;
         }
     }

src/AsyncFiberWorksTests/PerfTests.cs

@@ -11,11 +11,11 @@ namespace AsyncFiberWorksTests
 {
     public class PerfExecutor : IExecutorBatch
     {
-        public void Execute(IReadOnlyList<Action> toExecute, IExecutor executorSingle)
+        public void Execute(IReadOnlyList<Action> toExecute)
         {
             foreach (var action in toExecute)
             {
-                executorSingle.Execute(action);
+                action();
             }
             if (toExecute.Count < 10000)
             {