Merge pull request #1072 from esdrubal/bug19862
[mono.git] / mcs / class / corlib / System.Threading / ManualResetEventSlim.cs
index e2ebb34bf9b09823c0fb544cda6a3f57da404261..a34370d460be051bbdaf54315d093cb8f573b037 100644 (file)
@@ -1,6 +1,10 @@
-// ManuelResetEventSlim.cs
+// ManualResetEventSlim.cs
+//
+// Authors:
+//    Marek Safar  <marek.safar@gmail.com>
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval
+// Copyright 2011 Xamarin Inc (http://www.xamarin.com).
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 //
 //
 
-#if NET_4_0 || MOBILE
-
-using System;
+#if NET_4_0
 
 namespace System.Threading
 {
        [System.Diagnostics.DebuggerDisplayAttribute ("Set = {IsSet}")]
        public class ManualResetEventSlim : IDisposable
        {
-               const int isSet    = 1;
-               const int isNotSet = 0;
-               const int defaultSpinCount = 100;
-
-               int state;
                readonly int spinCount;
 
                ManualResetEvent handle;
                internal AtomicBooleanValue disposed;
-               bool used;
-
-               readonly static Watch sw = Watch.StartNew ();
+               int used;
+               int state;
 
-               public ManualResetEventSlim () : this (false, defaultSpinCount)
+               public ManualResetEventSlim ()
+                       : this (false, 10)
                {
                }
 
-               public ManualResetEventSlim (bool initialState) : this (initialState, defaultSpinCount)
+               public ManualResetEventSlim (bool initialState)
+                       : this (initialState, 10)
                {
                }
 
                public ManualResetEventSlim (bool initialState, int spinCount)
                {
-                       if (spinCount < 0)
-                               throw new ArgumentOutOfRangeException ("spinCount is less than 0", "spinCount");
+                       if (spinCount < 0 || spinCount > 2047)
+                               throw new ArgumentOutOfRangeException ("spinCount");
 
-                       this.state = initialState ? isSet : isNotSet;
+                       this.state = initialState ? 1 : 0;
                        this.spinCount = spinCount;
                }
 
                public bool IsSet {
                        get {
-                               return state == isSet;
+                               return (state & 1) == 1;
                        }
                }
 
@@ -75,30 +73,64 @@ namespace System.Threading
 
                public void Reset ()
                {
-                       state = isNotSet;
-                       if (handle != null) {
-                               used = true;
-                               Thread.MemoryBarrier ();
-                               var tmpHandle = handle;
-                               if (tmpHandle != null)
-                                       tmpHandle.Reset ();
-                               Thread.MemoryBarrier ();
-                               used = false;
-                       }
+                       ThrowIfDisposed ();
+
+                       var stamp = UpdateStateWithOp (false);
+                       if (handle != null)
+                               CommitChangeToHandle (stamp);
                }
 
                public void Set ()
                {
-                       state = isSet;
-                       if (handle != null) {
-                               used = true;
-                               Thread.MemoryBarrier ();
-                               var tmpHandle = handle;
-                               if (tmpHandle != null)
+                       var stamp = UpdateStateWithOp (true);
+                       if (handle != null)
+                               CommitChangeToHandle (stamp);
+               }
+
+               long UpdateStateWithOp (bool set)
+               {
+                       int oldValue, newValue;
+                       do {
+                               oldValue = state;
+                               newValue = (int)(((oldValue >> 1) + 1) << 1) | (set ? 1 : 0);
+                       } while (Interlocked.CompareExchange (ref state, newValue, oldValue) != oldValue);
+                       return newValue;
+               }
+
+               void CommitChangeToHandle (long stamp)
+               {
+                       Interlocked.Increment (ref used);
+                       var tmpHandle = handle;
+                       if (tmpHandle != null) {
+                               // First in all case we carry the operation we were called for
+                               if ((stamp & 1) == 1)
                                        tmpHandle.Set ();
-                               Thread.MemoryBarrier ();
-                               used = false;
+                               else
+                                       tmpHandle.Reset ();
+
+                               /* Then what may happen is that the two suboperations (state change and handle change)
+                                * overlapped with others. In our case it doesn't matter if the two suboperations aren't
+                                * executed together at the same time, the only thing we have to make sure of is that both
+                                * state and handle are synchronized on the last visible state change.
+                                *
+                                * For instance if S is state change and H is handle change, for 3 concurrent operations
+                                * we may have the following serialized timeline: S1 S2 H2 S3 H3 H1
+                                * Which is perfectly fine (all S were converted to H at some stage) but in that case
+                                * we have a mismatch between S and H at the end because the last operations done were
+                                * S3/H1. We thus need to repeat H3 to get to the desired final state.
+                                */
+                               int currentState;
+                               do {
+                                       currentState = state;
+                                       if (currentState != stamp && (stamp & 1) != (currentState & 1)) {
+                                               if ((currentState & 1) == 1)
+                                                       tmpHandle.Set ();
+                                               else
+                                                       tmpHandle.Reset ();
+                                       }
+                               } while (currentState != state);
                        }
+                       Interlocked.Decrement (ref used);
                }
 
                public void Wait ()
@@ -124,35 +156,38 @@ namespace System.Threading
                public bool Wait (int millisecondsTimeout, CancellationToken cancellationToken)
                {
                        if (millisecondsTimeout < -1)
-                               throw new ArgumentOutOfRangeException ("millisecondsTimeout",
-                                                                      "millisecondsTimeout is a negative number other than -1");
+                               throw new ArgumentOutOfRangeException ("millisecondsTimeout");
+
                        ThrowIfDisposed ();
 
-                       long start = millisecondsTimeout == -1 ? 0 : sw.ElapsedMilliseconds;
-                       SpinWait wait = new SpinWait ();
+                       if (!IsSet) {
+                               SpinWait wait = new SpinWait ();
+
+                               while (!IsSet) {
+                                       if (wait.Count < spinCount) {
+                                               wait.SpinOnce ();
+                                               continue;
+                                       }
+
+                                       break;
+                               }
 
-                       while (state == isNotSet) {
                                cancellationToken.ThrowIfCancellationRequested ();
 
-                               if (millisecondsTimeout > -1 && (sw.ElapsedMilliseconds - start) > millisecondsTimeout)
-                                       return false;
+                               if (IsSet)
+                                       return true;
 
-                               if (wait.Count < spinCount) {
-                                       wait.SpinOnce ();
+                               WaitHandle handle = WaitHandle;
+
+                               if (cancellationToken.CanBeCanceled) {
+                                       var result = WaitHandle.WaitAny (new[] { handle, cancellationToken.WaitHandle }, millisecondsTimeout, false);
+                                       if (result == 1)
+                                               throw new OperationCanceledException (cancellationToken);
+                                       if (result == WaitHandle.WaitTimeout)
+                                               return false;
                                } else {
-                                       int waitTime = millisecondsTimeout == -1 ? -1 : Math.Max (millisecondsTimeout - (int)(sw.ElapsedMilliseconds - start) , 1);
-                                       ThrowIfDisposed ();
-                                       WaitHandle handle = WaitHandle;
-                                       if (state == isSet)
-                                               return true;
-                                       ThrowIfDisposed ();
-
-                                       if (cancellationToken.CanBeCanceled)
-                                               if (WaitHandle.WaitAny (new[] { handle, cancellationToken.WaitHandle }, waitTime, false) == 0)
-                                                       return true;
-                                       else
-                                               if (handle.WaitOne (waitTime, false))
-                                                       return true;
+                                       if (!handle.WaitOne (millisecondsTimeout, false))
+                                               return false;
                                }
                        }
 
@@ -166,19 +201,32 @@ namespace System.Threading
 
                public WaitHandle WaitHandle {
                        get {
-                               if (handle != null) {
-                                       if (state == isSet)
-                                               handle.Set ();
+                               ThrowIfDisposed ();
 
+                               if (handle != null)
                                        return handle;
-                               }
 
-                               var result = LazyInitializer.EnsureInitialized (ref handle,
-                                                                               () => new ManualResetEvent (state == isSet ? true : false));
-                               if (state == isSet)
-                                       result.Set ();
+                               var isSet = IsSet;
+                               var mre = new ManualResetEvent (IsSet);
+                               if (Interlocked.CompareExchange (ref handle, mre, null) == null) {
+                                       //
+                                       // Ensure the Set has not ran meantime
+                                       //
+                                       if (isSet != IsSet) {
+                                               if (IsSet) {
+                                                       mre.Set ();
+                                               } else {
+                                                       mre.Reset ();
+                                               }
+                                       }
+                               } else {
+                                       //
+                                       // Release the event when other thread was faster
+                                       //
+                                       mre.Dispose ();
+                               }
 
-                               return result;
+                               return handle;
                        }
                }
 
@@ -191,12 +239,13 @@ namespace System.Threading
                {
                        if (!disposed.TryRelaxedSet ())
                                return;
+
                        if (handle != null) {
                                var tmpHandle = Interlocked.Exchange (ref handle, null);
-                               if (used) {
+                               if (used > 0) {
                                        // A tiny wait (just a few cycles normally) before releasing
                                        SpinWait wait = new SpinWait ();
-                                       while (used)
+                                       while (used > 0)
                                                wait.SpinOnce ();
                                }
                                tmpHandle.Dispose ();