Merge pull request #66 from AshleighAdams/bugfix

AsyncSignal: Fix bug where work items weren't being properly reset

Author: AshleighAdams

src/CoroutineScheduler/AsyncSignal.cs

@@ -71,10 +71,17 @@ public void Invoke()
 
 	internal class RegisteredWorkItem
 	{
-		public WorkItem Item { get; set; }
+		public WorkItem Item { get; private set; }
 		public CancellationTokenRegistration CancellationTokenRegistration { get; set; }
 		private volatile int completed;
 
+		public void Reset(WorkItem item)
+		{
+			Item = item;
+			completed = 0;
+			CancellationTokenRegistration = default;
+		}
+
 		public bool TryComplete()
 		{
 			int was = Interlocked.Exchange(ref completed, 1);
@@ -114,7 +121,7 @@ public void NotifyAll()
 
 			workItem.CancellationTokenRegistration.Dispose();
 			workItem.Item.Invoke();
-			workItem.Item = default;
+			workItem.Reset(default);
 
 			workItemPool.Add(workItem);
 		}
@@ -135,8 +142,9 @@ internal void AddContinuation(int token, WorkItem item, CancellationToken ct)
 				if (!workItemPool.TryTake(out var regItem))
 					regItem = new();
 
-				regItem.Item = item;
+				regItem.Reset(item);
 				workQueueFront.Add(regItem);
+
 				if (ct.CanBeCanceled)
 					regItem.CancellationTokenRegistration = ct.Register(TokenCancelled, regItem, false);
 				return;
@@ -164,7 +172,8 @@ internal void TokenCancelled(object objItem)
 			return;
 
 		var ret = item.Item;
-		item.Item = default;
+		item.Reset(default);
+
 		workItemPool.Add(item);
 
 		ret.Invoke();

src/CoroutineScheduler/Scheduler.cs

@@ -63,7 +63,11 @@ public Scheduler()
 	private ContextCallback? Runner { get; set; }
 
 	private int? ResumingOnThread { get; set; }
-	private bool RequiresMarshalling => ResumingOnThread is null || ResumingOnThread.Value != Thread.CurrentThread.ManagedThreadId;
+	private bool RequiresMarshalling => ResumingOnThread switch
+	{
+		int resumingThread => resumingThread != Thread.CurrentThread.ManagedThreadId,
+		_ => true,
+	};
 
 	/// <summary>
 	/// Resume any tasks that are at the point of invocation are currently awaiting `Yield()`, and <br />