Merge branch 'bugfix-main-thread-root'

[mono.git] / mcs / class / corlib / System.Threading / ThreadPool.cs

diff --git a/mcs/class/corlib/System.Threading/ThreadPool.cs b/mcs/class/corlib/System.Threading/ThreadPool.cs
index c79ca9a5ada6d026ecf8dd987c592b5263da6533..7dfee45fc808f18c8f9e64f52a3fc26afed7434b 100644 (file)
--- a/mcs/class/corlib/System.Threading/ThreadPool.cs
+++ b/mcs/class/corlib/System.Threading/ThreadPool.cs
@@ -1,5 +1,5 @@
 //
-// System.Threading.ThreadPool
+// System.Threading.ThreadPool.cs
 //
 // Author:
 //   Patrik Torstensson
@@ -38,26 +38,13 @@ using System.Security.Permissions;
 
 namespace System.Threading {
 
-#if NET_2_0
        public static class ThreadPool {
-#else
-       public sealed class ThreadPool {
-
-               private ThreadPool ()
-               {
-                       /* nothing to do */
-               }
-#endif
-
-#if NET_2_0
                [Obsolete("This method is obsolete, use BindHandle(SafeHandle) instead")]
-#endif
                public static bool BindHandle (IntPtr osHandle)
                {
                        return true;
                }
 
-#if NET_2_0
                public static bool BindHandle (SafeHandle osHandle)
                {
                        if (osHandle == null)
@@ -65,11 +52,11 @@ namespace System.Threading {
                        
                        return true;
                }
-#endif
-               
+
+#if !NET_2_1           
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                public static extern void GetAvailableThreads (out int workerThreads, out int completionPortThreads);
-
+#endif
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                public static extern void GetMaxThreads (out int workerThreads, out int completionPortThreads);
                        
@@ -81,29 +68,40 @@ namespace System.Threading {
                [SecurityPermission (SecurityAction.Demand, ControlThread=true)]
                public static extern bool SetMinThreads (int workerThreads, int completionPortThreads);
 
-#if NET_2_0
-               [MonoTODO("The max number of threads cannot be decremented.")]
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                [SecurityPermission (SecurityAction.Demand, ControlThread=true)]
                public static extern bool SetMaxThreads (int workerThreads, int completionPortThreads);
-#endif
                        
-               public static bool QueueUserWorkItem (WaitCallback callback)
+               public static bool QueueUserWorkItem (WaitCallback callBack)
                {
-                       IAsyncResult ar = callback.BeginInvoke (null, null, null);
-                       if (ar == null)
-                               return false;
-                       return true;
+                       return QueueUserWorkItem (callBack, null);
                }
 
-               public static bool QueueUserWorkItem (WaitCallback callback, object state)
+               public static bool QueueUserWorkItem (WaitCallback callBack, object state)
                {
-                       IAsyncResult ar = callback.BeginInvoke (state, null, null);
-                       if (ar == null)
-                               return false;
+                       if (callBack == null)
+                               throw new ArgumentNullException ("callBack");
+
+#if MOONLIGHT
+                       callBack = MoonlightHandler (callBack);
+#endif
+                       if (callBack.IsTransparentProxy ()) {
+                               IAsyncResult ar = callBack.BeginInvoke (state, null, null);
+                               if (ar == null)
+                                       return false;
+                       } else {
+                               if (!callBack.HasSingleTarget)
+                                       throw new Exception ("The delegate must have only one target");
+
+                               AsyncResult ares = new AsyncResult (callBack, state, true);
+                               pool_queue (ares);
+                       }
                        return true;
                }
 
+               [MethodImplAttribute(MethodImplOptions.InternalCall)]
+               static extern void pool_queue (AsyncResult ares);
+
                public static RegisteredWaitHandle RegisterWaitForSingleObject (WaitHandle waitObject,
                                                                                WaitOrTimerCallback callBack,
                                                                                object state,
@@ -156,22 +154,37 @@ namespace System.Threading {
                                                            (long) millisecondsTimeOutInterval, executeOnlyOnce);
                }
 
+#if !NET_2_1
+
+               [CLSCompliant (false)]
+               unsafe public static bool UnsafeQueueNativeOverlapped (NativeOverlapped *overlapped)
+               {
+                       throw new NotImplementedException ();
+               }
+
                [SecurityPermission (SecurityAction.Demand, ControlEvidence=true, ControlPolicy=true)]
-               public static bool UnsafeQueueUserWorkItem (WaitCallback callback, object state)
+               public static bool UnsafeQueueUserWorkItem (WaitCallback callBack, object state)
                {
                        // no stack propagation here (that's why it's unsafe and requires extra security permissions)
-                       IAsyncResult ar = null;
+                       if (!callBack.IsTransparentProxy ()) {
+                               if (!callBack.HasSingleTarget)
+                                       throw new Exception ("The delegate must have only one target");
+
+                               AsyncResult ares = new AsyncResult (callBack, state, false);
+                               pool_queue (ares);
+                               return true;
+                       }
                        try {
                                if (!ExecutionContext.IsFlowSuppressed ())
                                        ExecutionContext.SuppressFlow (); // on current thread only
-
-                               ar = callback.BeginInvoke (state, null, null);
-                       }
-                       finally {
+                               IAsyncResult ar = callBack.BeginInvoke (state, null, null);
+                               if (ar == null)
+                                       return false;
+                       } finally {
                                if (ExecutionContext.IsFlowSuppressed ())
                                        ExecutionContext.RestoreFlow ();
                        }
-                       return (ar != null);
+                       return true;
                }
                
                [MonoTODO("Not implemented")]
@@ -210,5 +223,21 @@ namespace System.Threading {
                {
                        throw new NotImplementedException ();
                }
+
+#endif
+
+#if MOONLIGHT
+               static WaitCallback MoonlightHandler (WaitCallback callback)
+               {
+                       return delegate (object o) {
+                               try {
+                                       callback (o);
+                               } 
+                               catch (Exception ex) {
+                                       Thread.MoonlightUnhandledException (ex);
+                               } 
+                       };
+               }
+#endif
        }
 }