Make TryExecuteTaskInline a bit smarter

mono · Feb 23, 2011 · df12cf4 · df12cf4
1 parent 4e37530
commit df12cf4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/mcs/class/corlib/System.Threading.Tasks/SynchronizationContextScheduler.cs b/mcs/class/corlib/System.Threading.Tasks/SynchronizationContextScheduler.cs
@@ -63,8 +63,15 @@ protected internal override bool TryDequeue (Task task)
 
 		protected override bool TryExecuteTaskInline (Task task, bool taskWasPreviouslyQueued)
 		{
-			task.Execute (null);
-			return true;
+			if (task.IsCompleted)
+				return false;
+
+			if (task.Status == TaskStatus.WaitingToRun) {
+				task.Execute (null);
+				return true;
+			}
+
+			return false;
 		}
 
 		public override int MaximumConcurrencyLevel {

diff --git a/mcs/class/corlib/System.Threading.Tasks/TpScheduler.cs b/mcs/class/corlib/System.Threading.Tasks/TpScheduler.cs
@@ -70,8 +70,15 @@ protected internal override bool TryDequeue (Task task)
 
 		protected override bool TryExecuteTaskInline (Task task, bool taskWasPreviouslyQueued)
 		{
-			task.Execute (null);
-			return true;
+			if (task.IsCompleted)
+				return false;
+
+			if (task.Status == TaskStatus.WaitingToRun) {
+				task.Execute (null);
+				return true;
+			}
+
+			return false;
 		}
 
 		public override int MaximumConcurrencyLevel {