Implemenent v4 Monitor::TryEnter overloads.

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

diff --git a/mcs/class/corlib/System.Threading/CountdownEvent.cs b/mcs/class/corlib/System.Threading/CountdownEvent.cs
index c12c85ed67c632f7ae45f44c10e0d45630cdf851..eaeb3ac6e14e8a087bbadfc7f4ba70609cc53599 100644 (file)
--- a/mcs/class/corlib/System.Threading/CountdownEvent.cs
+++ b/mcs/class/corlib/System.Threading/CountdownEvent.cs
@@ -22,17 +22,17 @@
 //
 //
 
-using System;
-
 #if NET_4_0 || BOOTSTRAP_NET_4_0
 
+using System;
+
 namespace System.Threading
 {      
        public class CountdownEvent : IDisposable
        {
                int count;
                readonly int initial;
-               ManualResetEvent evt = new ManualResetEvent (false);
+               ManualResetEventSlim evt = new ManualResetEventSlim (false);
                
                public CountdownEvent (int count)
                {
@@ -122,72 +122,34 @@ namespace System.Threading
                
                public void Wait ()
                {
-                       SpinWait wait = new SpinWait ();
-                       while (!IsSet) {
-                               wait.SpinOnce ();
-                       }
+                       evt.Wait ();
                }
                
                public void Wait (CancellationToken token)
                {
-                       Wait (() => token.IsCancellationRequested);
+                       evt.Wait (token);
                }
                
                public bool Wait (int timeoutMilli)
                {
-                       if (timeoutMilli == -1) {
-                               Wait ();
-                               return true;
-                       }
-                       
-                       Watch sw = Watch.StartNew ();
-                       long timeout = (long)timeoutMilli;
-                       
-                       bool result = Wait (() => sw.ElapsedMilliseconds > timeout);
-                       sw.Stop ();
-                       
-                       return result;
+                       return evt.Wait (timeoutMilli);
                }
                
                public bool Wait(TimeSpan span)
                {
-                       return Wait ((int)span.TotalMilliseconds);
+                       return evt.Wait (span);
                }
                
                public bool Wait (int timeoutMilli, CancellationToken token)
                {
-                       if (timeoutMilli == -1) {
-                               Wait ();
-                               return true;
-                       }
-                       
-                       Watch sw = Watch.StartNew ();
-                       long timeout = (long)timeoutMilli;
-                       
-                       bool result = Wait (() => sw.ElapsedMilliseconds > timeout || token.IsCancellationRequested);
-                       sw.Stop ();
-                       
-                       return result;
+                       return evt.Wait (timeoutMilli, token);
                }
                
                public bool Wait(TimeSpan span, CancellationToken token)
                {
-                       return Wait ((int)span.TotalMilliseconds, token);
-               }
-               
-               bool Wait (Func<bool> waitPredicate)
-               {
-                       SpinWait wait = new SpinWait ();
-                       
-                       while (!IsSet) {
-                               if (waitPredicate ())
-                                       return false;
-                               wait.SpinOnce ();
-                       }
-                       
-                       return true;
+                       return evt.Wait (span, token);
                }
-               
+
                public void Reset ()
                {
                        Reset (initial);
@@ -219,7 +181,7 @@ namespace System.Threading
                
                public WaitHandle WaitHandle {
                        get {
-                               return evt;
+                               return evt.WaitHandle;
                        }
                }