Fix Task child waiting for RunSynchronously

zsbfree · Apr 16, 2012 · fa8a7b4 · fa8a7b4
1 parent 3fe545a
commit fa8a7b4
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 4 deletions.
diff --git a/mcs/class/corlib/System.Threading.Tasks/Task.cs b/mcs/class/corlib/System.Threading.Tasks/Task.cs
@@ -566,10 +566,13 @@ void HandleGenericException (AggregateException e)
 			ProcessCompleteDelegates ();
 		}
 
-		internal void WaitOnChildren ()
+		internal bool WaitOnChildren ()
 		{
-			if (Status == TaskStatus.WaitingForChildrenToComplete && childTasks != null)
+			if (Status == TaskStatus.WaitingForChildrenToComplete && childTasks != null) {
 				childTasks.Wait ();
+				return true;
+			}
+			return false;
 		}
 
 		public void Wait ()

diff --git a/mcs/class/corlib/System.Threading.Tasks/TaskScheduler.cs b/mcs/class/corlib/System.Threading.Tasks/TaskScheduler.cs
@@ -122,7 +122,8 @@ internal protected bool TryExecuteTask (Task task)
 
 			if (task.Status == TaskStatus.WaitingToRun) {
 				task.Execute ();
-				task.WaitOnChildren ();
+				if (task.WaitOnChildren ())
+					task.Wait ();
 
 				return true;
 			}
@@ -139,6 +140,7 @@ internal bool RunInline (Task task)
 
 			if (!task.IsCompleted)
 				throw new InvalidOperationException ("The TryExecuteTaskInline call to the underlying scheduler succeeded, but the task body was not invoked");
+
 			return true;
 		}
 

diff --git a/mcs/class/corlib/Test/System.Threading.Tasks/TaskTest.cs b/mcs/class/corlib/Test/System.Threading.Tasks/TaskTest.cs
@@ -187,7 +187,7 @@ public void WaitAny_ManyCanceled ()
 		}
 
 		[Test]
-		public void WaitAllTest()
+		public void WaitAllTest ()
 		{
 			ParallelTestHelper.Repeat (delegate {
 				int achieved = 0;
@@ -902,6 +902,24 @@ public void WhenChildTaskSeveralLevelsDeepHandlesAggregateExceptionErrorStillBub
 			Assert.IsTrue (continuationRan);
 		}
 
+		[Test]
+		public void AlreadyCompletedChildTaskShouldRunContinuationImmediately ()
+		{
+			string result = "Failed";
+			var testTask = new Task (() => 
+			{
+				var child = new Task<string> (() =>
+				{
+					return "Success";
+				}, TaskCreationOptions.AttachedToParent);
+				child.RunSynchronously ();
+				child.ContinueWith (x => { Thread.Sleep (50); result = x.Result; }, TaskContinuationOptions.AttachedToParent | TaskContinuationOptions.NotOnFaulted);
+			});
+			testTask.RunSynchronously ();
+
+			Assert.AreEqual ("Success", result);
+		}
+
 		[Test]
 		public void InlineNotTrashingParentRelationship ()
 		{