Merge pull request #481 from SteamRE/fix/480-deadlock

Invoke AsyncJob continuations asynchronously
SteamRE · Oct 25, 2017 · 9677726 · 9677726
2 parents 2787d46 + dd1ecb9
commit 9677726
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 2 deletions.
diff --git a/SteamKit2/SteamKit2/Types/JobID.cs b/SteamKit2/SteamKit2/Types/JobID.cs
@@ -177,7 +177,7 @@ public sealed class AsyncJob<T> : AsyncJob
         public AsyncJob( SteamClient client, JobID jobId )
             : base( client, jobId )
         {
-            tcs = new TaskCompletionSource<T>();
+            tcs = new TaskCompletionSource<T>( TaskCreationOptions.RunContinuationsAsynchronously );
         }
 
 
@@ -287,7 +287,7 @@ public sealed class ResultSet
         public AsyncJobMultiple( SteamClient client, JobID jobId, Predicate<T> finishCondition )
                     : base( client, jobId )
         {
-            tcs = new TaskCompletionSource<ResultSet>();
+            tcs = new TaskCompletionSource<ResultSet>( TaskCreationOptions.RunContinuationsAsynchronously );
 
             this.finishCondition = finishCondition;
         }

diff --git a/SteamKit2/Tests/AsyncJobFacts.cs b/SteamKit2/Tests/AsyncJobFacts.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using SteamKit2;
 using Xunit;
@@ -360,5 +361,51 @@ public async Task AsyncJobMultipleThrowsFailureExceptionOnFailure()
 
             await Assert.ThrowsAsync( typeof( AsyncJobFailedException ), async () => await asyncTask );
         }
+
+        [Fact]
+        public async Task AsyncJobContinuesAsynchronously()
+        {
+            SteamClient client = new SteamClient();
+
+            var asyncJob = new AsyncJob<Callback>( client, 123 );
+            var asyncTask = asyncJob.ToTask();
+
+            var continuationThreadID = -1;
+            var continuation = asyncTask.ContinueWith( t =>
+            {
+                continuationThreadID = Thread.CurrentThread.ManagedThreadId;
+            }, TaskContinuationOptions.ExecuteSynchronously );
+
+            var completionThreadID = Thread.CurrentThread.ManagedThreadId;
+            asyncJob.AddResult( new Callback { JobID = 123 } );
+
+            await continuation;
+
+            Assert.NotEqual( -1, continuationThreadID );
+            Assert.NotEqual( completionThreadID, continuationThreadID );
+        }
+
+        [Fact]
+        public async Task AsyncJobMultipleContinuesAsynchronously()
+        {
+            SteamClient client = new SteamClient();
+
+            var asyncJob = new AsyncJobMultiple<Callback>( client, 123, call => true );
+            var asyncTask = asyncJob.ToTask();
+
+            var continuationThreadID = -1;
+            var continuation = asyncTask.ContinueWith( t =>
+            {
+                continuationThreadID = Thread.CurrentThread.ManagedThreadId;
+            }, TaskContinuationOptions.ExecuteSynchronously );
+
+            var completionThreadID = Thread.CurrentThread.ManagedThreadId;
+            asyncJob.AddResult( new Callback { JobID = 123 } );
+
+            await continuation;
+
+            Assert.NotEqual( -1, continuationThreadID );
+            Assert.NotEqual( completionThreadID, continuationThreadID );
+        }
     }
 }