Merge pull request #2310 from lambdageek/dev/bug-36305

[mono.git] / mcs / class / corlib / System.Runtime.Remoting.Contexts / SynchronizationAttribute.cs

diff --git a/mcs/class/corlib/System.Runtime.Remoting.Contexts/SynchronizationAttribute.cs b/mcs/class/corlib/System.Runtime.Remoting.Contexts/SynchronizationAttribute.cs
index d1f47199bbce44409e29cee1ad4a05323cdabcc4..7ef860da45f1725dd95121b1d8a8473e9bdc6cc7 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting.Contexts/SynchronizationAttribute.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting.Contexts/SynchronizationAttribute.cs
@@ -5,6 +5,26 @@
 //   Lluis Sanchez Gual (lluis@ximian.com)
 //
 // (C) Novell, Inc.  http://www.ximian.com
+// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.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 in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
 using System.Threading;
@@ -15,6 +35,7 @@ namespace System.Runtime.Remoting.Contexts
 {
        [AttributeUsage(AttributeTargets.Class)]
        [Serializable]
+       [System.Runtime.InteropServices.ComVisible (true)]
        public class SynchronizationAttribute: ContextAttribute, IContributeClientContextSink, IContributeServerContextSink
        {
                public const int NOT_SUPPORTED = 1;
@@ -22,12 +43,18 @@ namespace System.Runtime.Remoting.Contexts
                public const int REQUIRED = 4;
                public const int REQUIRES_NEW = 8;
                
-               bool _isReentrant;
+               bool _bReEntrant;
+               int _flavor;
+
+               [NonSerialized]
                bool _locked;
-               int _flag;
-               int _lockCount = 0;
+               [NonSerialized]
+               int _lockCount;
                
-               Mutex _mutex = new Mutex ();
+               [NonSerialized]
+               Mutex _mutex = new Mutex (false);
+               [NonSerialized]
+               Thread _ownerThread;
                
                public SynchronizationAttribute ()
                : this (REQUIRES_NEW, false)
@@ -50,13 +77,13 @@ namespace System.Runtime.Remoting.Contexts
                        if (flag != NOT_SUPPORTED && flag != REQUIRED && flag != REQUIRES_NEW && flag != SUPPORTED)
                                throw new ArgumentException ("flag");
                                
-                       _isReentrant = reEntrant;
-                       _flag = flag;
+                       _bReEntrant = reEntrant;
+                       _flavor = flag;
                }
                
                public virtual bool IsReEntrant
                {
-                       get { return _isReentrant; }
+                       get { return _bReEntrant; }
                }
                
                public virtual bool Locked
@@ -73,20 +100,22 @@ namespace System.Runtime.Remoting.Contexts
                                        _mutex.WaitOne ();
                                        lock (this)
                                        {
-                                               if (_lockCount > 0)
+                                               _lockCount++;
+                                               if (_lockCount > 1)
                                                        ReleaseLock (); // Thread already had the lock
-                                               else
-                                                       _lockCount++;
+                                                       
+                                               _ownerThread = Thread.CurrentThread;
                                        }
                                }
                                else
                                {
                                        lock (this)
                                        {
-                                               while (_lockCount > 0)
+                                               while (_lockCount > 0 && _ownerThread == Thread.CurrentThread)
                                                {
                                                        _lockCount--;
                                                        _mutex.ReleaseMutex ();
+                                                       _ownerThread = null;
                                                }
                                        }
                                }
@@ -99,6 +128,7 @@ namespace System.Runtime.Remoting.Contexts
                        
                        lock (this)
                        {
+                               _ownerThread = Thread.CurrentThread;
                                _lockCount++;
                        }
                }
@@ -107,17 +137,20 @@ namespace System.Runtime.Remoting.Contexts
                {
                        lock (this)
                        {
-                               if (_lockCount > 0) {
+                               if (_lockCount > 0 && _ownerThread == Thread.CurrentThread) {
                                        _lockCount--;
                                        _mutex.ReleaseMutex ();
+                                       _ownerThread = null;
                                }
                        }
                }
                
+               [System.Runtime.InteropServices.ComVisible (true)]
                public override void GetPropertiesForNewContext (IConstructionCallMessage ctorMsg)
                {
-                       if (_flag != NOT_SUPPORTED)
+                       if (_flavor != NOT_SUPPORTED) {
                                ctorMsg.ContextProperties.Add (this);
+                       }
                }
                
                public virtual IMessageSink GetClientContextSink (IMessageSink nextSink)
@@ -130,10 +163,11 @@ namespace System.Runtime.Remoting.Contexts
                        return new SynchronizedServerContextSink (nextSink, this);
                }
                
+               [System.Runtime.InteropServices.ComVisible (true)]
                public override bool IsContextOK (Context ctx, IConstructionCallMessage msg)
                {
                        SynchronizationAttribute prop = ctx.GetProperty ("Synchronization") as SynchronizationAttribute;
-                       switch (_flag)
+                       switch (_flavor)
                        {
                                case NOT_SUPPORTED: return (prop == null);
                                case REQUIRED: return (prop != null);