Merge pull request #463 from strawd/concurrent-requests

Handle multiple concurrent calls to BeginTryReceiveRequest

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels.Http/HttpReplyChannel.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels.Http/HttpReplyChannel.cs
index 16c38c77932c39409c4349ee2ea501d67051c820..03e7cad1f1c4f7eff0afaab6e7c41ebd1801f848 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels.Http/HttpReplyChannel.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels.Http/HttpReplyChannel.cs
@@ -92,8 +92,8 @@ namespace System.ServiceModel.Channels.Http
                        AbortConnections (timeout);
                        // FIXME: this wait is sort of hack (because it should not be required), but without it some tests are blocked.
                        // This hack even had better be moved to base.CancelAsync().
-                       if (CurrentAsyncResult != null)
-                               CurrentAsyncResult.AsyncWaitHandle.WaitOne (TimeSpan.FromMilliseconds (300));
+//                     if (CurrentAsyncResult != null)
+//                             CurrentAsyncResult.AsyncWaitHandle.WaitOne (TimeSpan.FromMilliseconds (300));
                        return base.CancelAsync (timeout);
                }
 

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ReplyChannelBase.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ReplyChannelBase.cs
index d73b0866495cf0a32fe3ef8b2796ea619e8a36f2..4e47ecf0035d8fda5470806c3f5ad8686b0c21f7 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ReplyChannelBase.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ReplyChannelBase.cs
@@ -87,15 +87,16 @@ namespace System.ServiceModel.Channels
 
                protected override void OnClose (TimeSpan timeout)
                {
-                       if (CurrentAsyncThread != null)
+                       if (currentAsyncThreads.Count > 0)
                                if (!CancelAsync (timeout))
-                                       CurrentAsyncThread.Abort ();
+                                       foreach (Thread asyncThread in currentAsyncThreads)
+                                               asyncThread.Abort ();
                }
 
                public virtual bool CancelAsync (TimeSpan timeout)
                {
                        // FIXME: It should wait for the actual completion.
-                       return CurrentAsyncResult == null;
+                       return currentAsyncResults.Count > 0;
                        //return CurrentAsyncResult == null || CurrentAsyncResult.AsyncWaitHandle.WaitOne (timeout);
                }
 
@@ -111,18 +112,18 @@ namespace System.ServiceModel.Channels
                TryReceiveDelegate try_recv_delegate;
 
                object async_result_lock = new object ();
-               protected Thread CurrentAsyncThread { get; private set; }
-               protected IAsyncResult CurrentAsyncResult { get; private set; }
+               HashSet<Thread> currentAsyncThreads = new HashSet<Thread>();
+               HashSet<IAsyncResult> currentAsyncResults = new HashSet<IAsyncResult>();
 
                public virtual IAsyncResult BeginTryReceiveRequest (TimeSpan timeout, AsyncCallback callback, object state)
                {
-                       if (CurrentAsyncResult != null)
-                               throw new InvalidOperationException ("Another async TryReceiveRequest operation is in progress");
+                       IAsyncResult result = null;
+
                        if (try_recv_delegate == null)
                                try_recv_delegate = new TryReceiveDelegate (delegate (TimeSpan tout, out RequestContext ctx) {
                                        lock (async_result_lock) {
-                                               if (CurrentAsyncResult != null)
-                                                       CurrentAsyncThread = Thread.CurrentThread;
+                                               if (currentAsyncResults.Contains (result))
+                                                       currentAsyncThreads.Add (Thread.CurrentThread);
                                        }
                                        try {
                                                return TryReceiveRequest (tout, out ctx);
@@ -143,19 +144,19 @@ namespace System.ServiceModel.Channels
                                                //the whole app.  Ignore for now
                                        } finally {
                                                lock (async_result_lock) {
-                                                       CurrentAsyncResult = null;
-                                                       CurrentAsyncThread = null;
+                                                       currentAsyncResults.Remove (result);
+                                                       currentAsyncThreads.Remove (Thread.CurrentThread);
                                                }
                                        }
                                        ctx = null;
                                        return false;
                                        });
                        RequestContext dummy;
-                       IAsyncResult result;
                        lock (async_result_lock) {
-                               result = CurrentAsyncResult = try_recv_delegate.BeginInvoke (timeout, out dummy, callback, state);
+                               result = try_recv_delegate.BeginInvoke (timeout, out dummy, callback, state);
+                               currentAsyncResults.Add (result);
                        }
-                       // Note that at this point CurrentAsyncResult can be null here if delegate has run to completion
+                       // Note that at this point result can be missing from currentAsyncResults here if delegate has run to completion
                        return result;
                }