Merge pull request #2 from wintoncode/master

Sync with wintoncode

Author: Jos Hickson

README.md

@@ -1,8 +1,7 @@
 # Winton.Extensions.Threading.Actor
 
 [![Build Status](https://travis-ci.org/wintoncode/Winton.Extensions.Threading.Actor.svg?branch=master)](https://travis-ci.org/wintoncode/Winton.Extensions.Threading.Actor)
-[![Build status](https://ci.appveyor.com/api/projects/status/p8q7dr2fnx6cxjka/branch/master?svg=true)](https://ci.appveyor.com/project/jhickson/winton-extensions-threading-actor-oadln/branch/master)
-
+[![Build status](https://ci.appveyor.com/api/projects/status/nddtjsmqktd5dggu/branch/master?svg=true)](https://ci.appveyor.com/project/wintoncode/winton-extensions-threading-actor/branch/master)
 
 A lightweight implementation of the actor pattern designed to integrate with C#'s `async`/`await` keywords.
 It is a richer version of the implementation outlined on [Winton's Tech Blog](https://tech.winton.com/blog/2017/03/a-tpl-actor-pattern).

Winton.Extensions.Threading.Actor.Tests.Unit/Internal/ActorTaskSchedulerTests.cs

@@ -266,7 +266,6 @@ await Launch(x =>
         [Fact]
         public void ShouldYieldCurrentThreadAndRerequestFromThreadPoolIfHaveProcessedNonLongRunningTasksContinuouslyForMoreThanAGivenTimePeriod()
         {
-            var fixableUtcTimeSource = new FixableTimeSource();
             _scheduler = new ActorTaskScheduler(_actorId, Mock.Get(_workItemQueuer).Object, _actorTaskFactory);
 
             var taskStartBarrier = new TaskCompletionSource<bool>();
@@ -281,7 +280,6 @@ public void ShouldYieldCurrentThreadAndRerequestFromThreadPoolIfHaveProcessedNon
             task1.Start(_scheduler);
             task2.Start(_scheduler);
             ThrowIfWaitTimesOut(taskStartBarrier.Task);
-            fixableUtcTimeSource.Increment(TimeSpan.FromMilliseconds(250));
             barrier.SetResult(true);
 
             task2.AwaitingShouldCompleteIn(_waitTimeout);

Winton.Extensions.Threading.Actor.Tests.Unit/Internal/ActorWorkSchedulerTests.cs

@@ -64,6 +64,8 @@ protected override void StopImpl()
 
         protected override void EnterImpl()
         {
+            Context.StartCompletionSource.SetResult(true);
+
             foreach (var task in Context.InitialWorkQueue)
             {
                 Context.StartTask(task);

Winton.Extensions.Threading.Actor.Tests.Utilities/FixableTimeSource.cs

@@ -25,6 +25,8 @@ public ActorContext(IActorTaskFactory actorTaskFactory)
 
         public List<Task> InitialWorkQueue { get; } = new List<Task>();
 
+        public List<Task> InitialWorkToBeCancelledQueue { get; } = new List<Task>();
+
         public IActorTaskFactory ActorTaskFactory { get; }
 
         public ActorStartWork StartWork

Winton.Extensions.Threading.Actor/Internal/StateMachine/ActiveActorState.cs

@@ -19,7 +19,6 @@ protected override void StartImpl()
             }
             else
             {
-                Context.StartCompletionSource.SetResult(true);
                 Context.SetState<ActiveActorState>();
             }
         }

Winton.Extensions.Threading.Actor/Internal/StateMachine/ActorContext.cs

@@ -34,7 +34,6 @@ protected override void EnterImpl()
                          {
                              await task.ConfigureAwait(false);
 
-                             Context.StartCompletionSource.SetResult(true);
                              Context.SetState<ActiveActorState>();
 
                              if (ReceivedStopSignal)
@@ -62,7 +61,14 @@ protected override void EnterImpl()
 
         protected override void ScheduleImpl(Task task)
         {
-            Context.InitialWorkQueue.Add(task);
+            if (!ReceivedStopSignal)
+            {
+                Context.InitialWorkQueue.Add(task);
+            }
+            else
+            {
+                Context.InitialWorkToBeCancelledQueue.Add(task);
+            }
         }
 
         private bool ReceivedStopSignal { get; set; } = false;

Winton.Extensions.Threading.Actor/Internal/StateMachine/InitialActorState.cs

@@ -1,3 +1,4 @@
+using System.Linq;
 using System.Threading.Tasks;
 
 namespace Winton.Extensions.Threading.Actor.Internal.StateMachine
@@ -24,12 +25,13 @@ protected override void StopImpl()
 
         protected override void EnterImpl()
         {
-            foreach (var task in Context.InitialWorkQueue)
+            foreach (var task in Context.InitialWorkQueue.Concat(Context.InitialWorkToBeCancelledQueue))
             {
                 task.Cancel();
             }
 
             Context.InitialWorkQueue.Clear();
+            Context.InitialWorkToBeCancelledQueue.Clear();
         }
     }
 }