Merge pull request #1991 from esdrubal/seq_test_fix

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

diff --git a/mcs/class/corlib/System.Threading/Monitor.cs b/mcs/class/corlib/System.Threading/Monitor.cs
index 4188c0a001ae7419f423a4f003f220f7d9dff0c2..c5cda6920d2edc3729e325bd3228629350ef94ae 100644 (file)
--- a/mcs/class/corlib/System.Threading/Monitor.cs
+++ b/mcs/class/corlib/System.Threading/Monitor.cs
@@ -159,7 +159,13 @@ namespace System.Threading
 
                public static bool Wait(object obj, int millisecondsTimeout, bool exitContext) {
                        try {
-                               if (exitContext) SynchronizationAttribute.ExitContext ();
+                               if (exitContext) {
+#if MONOTOUCH
+                                       throw new NotSupportedException ("exitContext == true is not supported");
+#else
+                                       SynchronizationAttribute.ExitContext ();
+#endif
+                               }
                                return Wait (obj, millisecondsTimeout);
                        }
                        finally {
@@ -169,7 +175,13 @@ namespace System.Threading
 
                public static bool Wait(object obj, TimeSpan timeout, bool exitContext) {
                        try {
-                               if (exitContext) SynchronizationAttribute.ExitContext ();
+                               if (exitContext) {
+#if MONOTOUCH
+                                       throw new NotSupportedException ("exitContext == true is not supported");
+#else
+                                       SynchronizationAttribute.ExitContext ();
+#endif
+                               }
                                return Wait (obj, timeout);
                        }
                        finally {
@@ -177,13 +189,17 @@ namespace System.Threading
                        }
                }
 
-#if NET_4_0 || MOONLIGHT || MOBILE
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                extern static void try_enter_with_atomic_var (object obj, int millisecondsTimeout, ref bool lockTaken);
 
+               [MethodImplAttribute(MethodImplOptions.InternalCall)]
+               extern static void enter_with_atomic_var (object obj, ref bool lockTaken);
+
+               // Can't make this an icall since it has the same name as the other Enter method
+               [MethodImpl(MethodImplOptions.AggressiveInlining)]
                public static void Enter (object obj, ref bool lockTaken)
                {
-                       TryEnter (obj, Timeout.Infinite, ref lockTaken);
+                       enter_with_atomic_var (obj, ref lockTaken);
                }
 
                public static void TryEnter (object obj, ref bool lockTaken)
@@ -212,6 +228,14 @@ namespace System.Threading
                        try_enter_with_atomic_var (obj, millisecondsTimeout, ref lockTaken);
                }               
 
-#endif
+
+               [MethodImplAttribute(MethodImplOptions.InternalCall)]
+               extern static bool Monitor_test_owner (object obj);
+
+               public
+               static bool IsEntered (object obj)
+               {
+                       return Monitor_test_owner(obj);
+               }
        }
 }