Threadpool Task scheduler

diff --git a/mcs/class/corlib/System.Threading.Tasks/TaskScheduler.cs b/mcs/class/corlib/System.Threading.Tasks/TaskScheduler.cs
index e8b33e2de268eaeb97bc8c84347cdf248b938e87..835d1485049eba9b42ddd567f19170d32c563634 100644 (file)
--- a/mcs/class/corlib/System.Threading.Tasks/TaskScheduler.cs
+++ b/mcs/class/corlib/System.Threading.Tasks/TaskScheduler.cs
@@ -35,7 +35,7 @@ namespace System.Threading.Tasks
        [System.Diagnostics.DebuggerTypeProxy ("System.Threading.Tasks.TaskScheduler+SystemThreadingTasks_TaskSchedulerDebugView")]
        public abstract class TaskScheduler
        {
-               static TaskScheduler defaultScheduler = new Scheduler ();
+               static TaskScheduler defaultScheduler = new TpScheduler ();
                
                [ThreadStatic]
                static TaskScheduler currentScheduler;

diff --git a/mcs/class/corlib/System.Threading.Tasks/TpScheduler.cs b/mcs/class/corlib/System.Threading.Tasks/TpScheduler.cs
new file mode 100644 (file)
index 0000000..a81fc83
--- /dev/null
+++ b/mcs/class/corlib/System.Threading.Tasks/TpScheduler.cs
@@ -0,0 +1,108 @@
+// TpScheduler.cs
+//
+// Copyright (c) 2011 Jérémie "Garuma" Laval
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+//
+
+#if NET_4_0 || MOBILE
+using System;
+using System.Collections.Concurrent;
+
+namespace System.Threading.Tasks
+{
+       internal class TpScheduler: TaskScheduler, IScheduler
+       {
+
+               public TpScheduler ()
+                       : this (Environment.ProcessorCount, ThreadPriority.Normal)
+               {
+               }
+
+               public TpScheduler (int maxWorker, ThreadPriority priority)
+               {
+               }
+
+               public void AddWork (Task t)
+               {
+                       ThreadPool.QueueUserWorkItem (_ => t.Execute (null));
+               }
+
+               public void ParticipateUntil (Task task)
+               {
+                       ParticipateUntil (task, new ManualResetEventSlim (false), -1);
+               }
+
+               public bool ParticipateUntil (Task task, ManualResetEventSlim evt, int millisecondsTimeout)
+               {
+                       if (task.IsCompleted)
+                               return false;
+
+                       bool isFromPredicate = true;
+                       task.ContinueWith (_ => { isFromPredicate = false; evt.Set (); }, TaskContinuationOptions.ExecuteSynchronously);
+
+                       evt.Wait (millisecondsTimeout);
+
+                       return isFromPredicate;
+               }
+
+               static bool TaskCompletedPredicate (Task self)
+               {
+                       return self.IsCompleted;
+               }
+
+               public void PulseAll ()
+               {
+               }
+
+               public void Dispose ()
+               {
+               }
+#region Scheduler dummy stubs
+               protected override System.Collections.Generic.IEnumerable<Task> GetScheduledTasks ()
+               {
+                       throw new System.NotImplementedException();
+               }
+
+               protected internal override void QueueTask (Task task)
+               {
+                       throw new System.NotImplementedException();
+               }
+
+               protected internal override bool TryDequeue (Task task)
+               {
+                       throw new System.NotImplementedException();
+               }
+
+               protected override bool TryExecuteTaskInline (Task task, bool taskWasPreviouslyQueued)
+               {
+                       task.Execute (null);
+                       return true;
+               }
+
+               public override int MaximumConcurrencyLevel {
+                       get {
+                               return base.MaximumConcurrencyLevel;
+                       }
+               }
+#endregion
+       }
+}
+#endif

diff --git a/mcs/class/corlib/corlib.dll.sources b/mcs/class/corlib/corlib.dll.sources
index b17166942c714a441a9db571b9ae1842e521bfcb..665f8d6bbf4fab9578d0509788f3039a8854063f 100644 (file)
--- a/mcs/class/corlib/corlib.dll.sources
+++ b/mcs/class/corlib/corlib.dll.sources
@@ -1577,3 +1577,4 @@ System.Threading.Tasks/SimpleConcurrentBag.cs
 System.Threading.Tasks/SynchronizationContextScheduler.cs
 System.Threading.Tasks/UnobservedTaskExceptionEventArgs.cs
 System.Collections.Concurrent/ObjectPool.cs
+System.Threading.Tasks/TpScheduler.cs