2009-04-12 Gonzalo Paniagua Javier <gonzalo@novell.com>

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

diff --git a/mcs/class/corlib/System.Threading/WaitHandle.cs b/mcs/class/corlib/System.Threading/WaitHandle.cs
index 49094ac67230a890e54659b89c1078c8a2574db6..2d7f4f4662bad00ad56874448b0d0a90995a9d76 100644 (file)
--- a/mcs/class/corlib/System.Threading/WaitHandle.cs
+++ b/mcs/class/corlib/System.Threading/WaitHandle.cs
@@ -37,10 +37,14 @@ using System.Security.Permissions;
 #if NET_2_0
 using System.Runtime.InteropServices;
 using Microsoft.Win32.SafeHandles;
+using System.Runtime.ConstrainedExecution;
 #endif
 
 namespace System.Threading
 {
+#if NET_2_0
+       [ComVisible (true)]
+#endif
        public abstract class WaitHandle : MarshalByRefObject, IDisposable
        {
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
@@ -79,7 +83,8 @@ namespace System.Threading
 #endif
                        }
                }
-
+#if false
+               // usage of property is commented - see above
                static bool IsSTAThread {
                        get {
                                bool isSTA = Thread.CurrentThread.ApartmentState ==
@@ -96,7 +101,7 @@ namespace System.Threading
                                return isSTA;
                        }
                }
-               
+#endif
                public static bool WaitAll(WaitHandle[] waitHandles)
                {
                        CheckArray (waitHandles, true);
@@ -138,12 +143,18 @@ namespace System.Threading
                private static extern int WaitAny_internal(WaitHandle[] handles, int ms, bool exitContext);
 
                // LAMESPEC: Doesn't specify how to signal failures
+#if NET_2_0
+               [ReliabilityContract (Consistency.WillNotCorruptState, Cer.MayFail)]
+#endif
                public static int WaitAny(WaitHandle[] waitHandles)
                {
                        CheckArray (waitHandles, false);
                        return(WaitAny_internal(waitHandles, Timeout.Infinite, false));
                }
 
+#if NET_2_0
+               [ReliabilityContract (Consistency.WillNotCorruptState, Cer.MayFail)]
+#endif
                public static int WaitAny(WaitHandle[] waitHandles,
                                          int millisecondsTimeout,
                                          bool exitContext)
@@ -158,6 +169,22 @@ namespace System.Threading
                        }
                }
 
+#if NET_2_0
+               [ReliabilityContract (Consistency.WillNotCorruptState, Cer.MayFail)]
+               public static int WaitAny(WaitHandle[] waitHandles, TimeSpan timeout)
+               {
+                       return WaitAny (waitHandles, timeout, false);
+               }
+
+               [ReliabilityContract (Consistency.WillNotCorruptState, Cer.MayFail)]
+               public static int WaitAny(WaitHandle[] waitHandles, int millisecondsTimeout)
+               {
+                       return WaitAny (waitHandles, millisecondsTimeout, false);
+               }
+#endif
+#if NET_2_0
+               [ReliabilityContract (Consistency.WillNotCorruptState, Cer.MayFail)]
+#endif
                public static int WaitAny(WaitHandle[] waitHandles,
                                          TimeSpan timeout, bool exitContext)
                {
@@ -176,8 +203,12 @@ namespace System.Threading
                        }
                }
 
-               [MonoTODO]
-               public WaitHandle() {
+#if NET_2_0
+               protected
+#else
+               public
+#endif
+               WaitHandle() {
                        // FIXME
                }
 
@@ -203,12 +234,10 @@ namespace System.Threading
                        [SecurityPermission (SecurityAction.LinkDemand, UnmanagedCode = true)]
                        [SecurityPermission (SecurityAction.InheritanceDemand, UnmanagedCode = true)]
                        set {
-                               //
-                               // Notice, from the 2.x documentation:
-                               //    Assigning a new value to the Handle property, will not release
-                               //    the previous handle, this could lead to a leak
-                               //
-                               safe_wait_handle = new SafeWaitHandle (value, false);
+                               if (value == InvalidHandle)
+                                       safe_wait_handle = new SafeWaitHandle (InvalidHandle, false);
+                               else
+                                       safe_wait_handle = new SafeWaitHandle (value, true);
                        }
                }
                
@@ -222,7 +251,7 @@ namespace System.Threading
 
                                //
                                // This is only the case if the handle was never properly initialized
-                               // most likely a but in the derived class
+                               // most likely a bug in the derived class
                                //
                                if (safe_wait_handle == null)
                                        return;
@@ -235,18 +264,57 @@ namespace System.Threading
                }
 
                public SafeWaitHandle SafeWaitHandle {
+                       [ReliabilityContract (Consistency.WillNotCorruptState, Cer.MayFail)]
                        get {
                                return safe_wait_handle;
                        }
 
+                       [ReliabilityContract (Consistency.WillNotCorruptState, Cer.Success)]
                        set {
-                               if (safe_wait_handle != null)
-                                       safe_wait_handle.Close ();
-                               
-                               safe_wait_handle = value;
+                               if (value == null)
+                                       safe_wait_handle = new SafeWaitHandle (InvalidHandle, false);
+                               else
+                                       safe_wait_handle = value;
                        }
                }
 
+               public static bool SignalAndWait (WaitHandle toSignal,
+                                                 WaitHandle toWaitOn)
+               {
+                       return SignalAndWait (toSignal, toWaitOn, -1, false);
+               }
+               
+               public static bool SignalAndWait (WaitHandle toSignal,
+                                                 WaitHandle toWaitOn,
+                                                 int millisecondsTimeout,
+                                                 bool exitContext)
+               {
+                       if (toSignal == null)
+                               throw new ArgumentNullException ("toSignal");
+                       if (toWaitOn == null)
+                               throw new ArgumentNullException ("toWaitOn");
+
+                       if (millisecondsTimeout < -1)
+                               throw new ArgumentOutOfRangeException ("millisecondsTimeout");
+
+                       return SignalAndWait_Internal (toSignal.Handle, toWaitOn.Handle, millisecondsTimeout, exitContext);
+               }
+               
+               public static bool SignalAndWait (WaitHandle toSignal,
+                                                 WaitHandle toWaitOn,
+                                                 TimeSpan timeout,
+                                                 bool exitContext)
+               {
+                       double ms = timeout.TotalMilliseconds;
+                       if (ms > Int32.MaxValue)
+                               throw new ArgumentOutOfRangeException ("timeout");
+
+                       return SignalAndWait (toSignal, toWaitOn, Convert.ToInt32 (ms), false);
+               }
+
+               [MethodImplAttribute(MethodImplOptions.InternalCall)]
+               static extern bool SignalAndWait_Internal (IntPtr toSignal, IntPtr toWaitOn, int ms, bool exitContext);
+
                public virtual bool WaitOne()
                {
                        CheckDisposed ();
@@ -277,6 +345,16 @@ namespace System.Threading
                        }
                }
 
+               public virtual bool WaitOne (int millisecondsTimeout)
+               {
+                       return WaitOne (millisecondsTimeout, false);
+               }
+
+               public virtual bool WaitOne (TimeSpan timeout)
+               {
+                       return WaitOne (timeout, false);
+               }
+
                public virtual bool WaitOne(TimeSpan timeout, bool exitContext)
                {
                        CheckDisposed ();
@@ -304,6 +382,24 @@ namespace System.Threading
                        if (disposed || safe_wait_handle == null)
                                throw new ObjectDisposedException (GetType ().FullName);
                }
+
+               public static bool WaitAll(WaitHandle[] waitHandles, int millisecondsTimeout)
+               {
+                       CheckArray (waitHandles, true);
+                       return WaitAll_internal (waitHandles, millisecondsTimeout, false);
+               }
+
+               public static bool WaitAll(WaitHandle[] waitHandles, TimeSpan timeout)
+               {
+                       CheckArray (waitHandles, true);
+                       long ms = (long) timeout.TotalMilliseconds;
+                       
+                       if (ms < -1 || ms > Int32.MaxValue)
+                               throw new ArgumentOutOfRangeException ("timeout");
+
+                       return (WaitAll_internal (waitHandles, (int) ms, false));
+               }
+               
 #else
                private IntPtr os_handle = InvalidHandle;
                
@@ -379,7 +475,7 @@ namespace System.Threading
                }
 #endif
 
-               protected static readonly IntPtr InvalidHandle = IntPtr.Zero;
+               protected static readonly IntPtr InvalidHandle = (IntPtr) (-1);
                bool disposed = false;
 
                void IDisposable.Dispose() {