2006-03-06 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* RecordProtocol.cs: avoid creating the ManualResetEvent whenever
	possible. Don't lock on an instance of an object that the user can get.

svn path=/trunk/mcs/; revision=57625

diff --git a/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/ChangeLog b/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/ChangeLog
index 44e48abc43b41d95be90adadabba2882e3f6c12d..5ec11bc6b1feb47bdddcbdca3d7b833b93a18241 100644 (file)
--- a/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/ChangeLog
+++ b/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-06 Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * RecordProtocol.cs: avoid creating the ManualResetEvent whenever
+       possible. Don't lock on an instance of an object that the user can get.
+
 2006-03-02  Sebastien Pouliot  <sebastien@ximian.com>
 
        * RecordProtocol.cs: Fix possible endless loop (#77663). Remove hack

diff --git a/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/RecordProtocol.cs b/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/RecordProtocol.cs
index 3bd18cf9496ad19d30566c94b6fb0a214f529b8e..79e37745bc332e923e0e94a69585be178c726060 100644 (file)
--- a/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/RecordProtocol.cs
+++ b/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/RecordProtocol.cs
@@ -87,12 +87,14 @@ namespace Mono.Security.Protocol.Tls
                #region Receive Record Async Result
                private class ReceiveRecordAsyncResult : IAsyncResult
                {
+                       private object locker = new object ();
                        private AsyncCallback _userCallback;
                        private object _userState;
                        private Exception _asyncException;
-                       private ManualResetEvent _complete;
+                       private ManualResetEvent handle;
                        private byte[] _resultingBuffer;
                        private Stream _record;
+                       private bool completed;
 
                        private byte[] _initialBuffer;
 
@@ -100,7 +102,6 @@ namespace Mono.Security.Protocol.Tls
                        {
                                _userCallback = userCallback;
                                _userState = userState;
-                               _complete = new ManualResetEvent(false);
                                _initialBuffer = initialBuffer;
                                _record = record;
                        }
@@ -132,12 +133,24 @@ namespace Mono.Security.Protocol.Tls
 
                        public bool CompletedWithError
                        {
-                               get { return null != _asyncException; }
+                               get {
+                                       if (!IsCompleted)
+                                               return false; // Perhaps throw InvalidOperationExcetion?
+
+                                       return null != _asyncException;
+                               }
                        }
 
                        public WaitHandle AsyncWaitHandle
                        {
-                               get { return _complete; }
+                               get {
+                                       lock (locker) {
+                                               if (handle == null)
+                                                       handle = new ManualResetEvent (completed);
+                                       }
+                                       return handle;
+                               }
+                               
                        }
 
                        public bool CompletedSynchronously
@@ -147,27 +160,29 @@ namespace Mono.Security.Protocol.Tls
 
                        public bool IsCompleted
                        {
-                               get { return _complete.WaitOne(0, false); }
+                               get {
+                                       lock (locker) {
+                                               return completed;
+                                       }
+                               }
                        }
 
                        private void SetComplete(Exception ex, byte[] resultingBuffer)
                        {
-                               if (this.IsCompleted)
-                                       return;
-
-                               lock (this)
-                               {
-                                       if (this.IsCompleted)
+                               lock (locker) {
+                                       if (completed)
                                                return;
 
+                                       completed = true;
+                                       if (handle != null)
+                                               handle.Set ();
+
+                                       if (_userCallback != null)
+                                               _userCallback.BeginInvoke (this, null, null);
+
                                        _asyncException = ex;
                                        _resultingBuffer = resultingBuffer;
-                                       _complete.Set();
                                }
-
-                               if (null != _userCallback)
-                                       _userCallback (this);
-
                        }
 
                        public void SetComplete(Exception ex)
@@ -190,17 +205,18 @@ namespace Mono.Security.Protocol.Tls
                #region Receive Record Async Result
                private class SendRecordAsyncResult : IAsyncResult
                {
+                       private object locker = new object ();
                        private AsyncCallback _userCallback;
                        private object _userState;
                        private Exception _asyncException;
-                       private ManualResetEvent _complete;
+                       private ManualResetEvent handle;
                        private HandshakeMessage _message;
+                       private bool completed;
 
                        public SendRecordAsyncResult(AsyncCallback userCallback, object userState, HandshakeMessage message)
                        {
                                _userCallback = userCallback;
                                _userState = userState;
-                               _complete = new ManualResetEvent(false);
                                _message = message;
                        }
 
@@ -221,12 +237,24 @@ namespace Mono.Security.Protocol.Tls
 
                        public bool CompletedWithError
                        {
-                               get { return null != _asyncException; }
+                               get {
+                                       if (!IsCompleted)
+                                               return false; // Perhaps throw InvalidOperationExcetion?
+
+                                       return null != _asyncException;
+                               }
                        }
 
                        public WaitHandle AsyncWaitHandle
                        {
-                               get { return _complete; }
+                               get {
+                                       lock (locker) {
+                                               if (handle == null)
+                                                       handle = new ManualResetEvent (completed);
+                                       }
+                                       return handle;
+                               }
+                               
                        }
 
                        public bool CompletedSynchronously
@@ -236,26 +264,28 @@ namespace Mono.Security.Protocol.Tls
 
                        public bool IsCompleted
                        {
-                               get { return _complete.WaitOne(0, false); }
+                               get {
+                                       lock (locker) {
+                                               return completed;
+                                       }
+                               }
                        }
 
                        public void SetComplete(Exception ex)
                        {
-                               if (this.IsCompleted)
-                                       return;
-
-                               lock (this)
-                               {
-                                       if (this.IsCompleted)
+                               lock (locker) {
+                                       if (completed)
                                                return;
 
-                                       _asyncException = ex;
-                                       _complete.Set();
-                               }
+                                       completed = true;
+                                       if (handle != null)
+                                               handle.Set ();
 
-                               if (null != _userCallback)
-                                       _userCallback (this);
+                                       if (_userCallback != null)
+                                               _userCallback.BeginInvoke (this, null, null);
 
+                                       _asyncException = ex;
+                               }
                        }
 
                        public void SetComplete()
@@ -385,7 +415,8 @@ namespace Mono.Security.Protocol.Tls
                        if (null == internalResult)
                                throw new ArgumentException("Either the provided async result is null or was not created by this RecordProtocol.");
 
-                       internalResult.AsyncWaitHandle.WaitOne();
+                       if (!internalResult.IsCompleted)
+                               internalResult.AsyncWaitHandle.WaitOne();
 
                        if (internalResult.CompletedWithError)
                                throw internalResult.AsyncException;
@@ -662,7 +693,8 @@ namespace Mono.Security.Protocol.Tls
                        if (asyncResult is SendRecordAsyncResult)
                        {
                                SendRecordAsyncResult internalResult = asyncResult as SendRecordAsyncResult;
-                               internalResult.AsyncWaitHandle.WaitOne();
+                               if (!internalResult.IsCompleted)
+                                       internalResult.AsyncWaitHandle.WaitOne();
                                if (internalResult.CompletedWithError)
                                        throw internalResult.AsyncException;
                        }