#602 Invoke APM callbacks on the threadpool.

aspnet · Mar 31, 2016 · 3a97a6b · 3a97a6b
1 parent 6725d68
commit 3a97a6b
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 22 deletions.
diff --git a/src/Microsoft.AspNetCore.Http/Internal/ReferenceReadStream.cs b/src/Microsoft.AspNetCore.Http/Internal/ReferenceReadStream.cs
@@ -139,19 +139,28 @@ private async void BeginRead(byte[] buffer, int offset, int count, AsyncCallback
 
             if (callback != null)
             {
-                try
+                // Offload callbacks to avoid stack dives on sync completions.
+                var ignored = Task.Run(() =>
                 {
-                    callback(tcs.Task);
-                }
-                catch (Exception)
-                {
-                    // Suppress exceptions on background threads.
-                }
+                    try
+                    {
+                        callback(tcs.Task);
+                    }
+                    catch (Exception)
+                    {
+                        // Suppress exceptions on background threads.
+                    }
+                });
             }
         }
 
         public override int EndRead(IAsyncResult asyncResult)
         {
+            if (asyncResult == null)
+            {
+                throw new ArgumentNullException(nameof(asyncResult));
+            }
+
             var task = (Task<int>)asyncResult;
             return task.GetAwaiter().GetResult();
         }

diff --git a/src/Microsoft.AspNetCore.WebUtilities/BufferedReadStream.cs b/src/Microsoft.AspNetCore.WebUtilities/BufferedReadStream.cs
@@ -229,7 +229,18 @@ public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, Asy
                 tcs.TrySetResult(toCopy);
                 if (callback != null)
                 {
-                    callback(tcs.Task);
+                    // Offload callbacks to avoid stack dives on sync completions.
+                    var ignored = Task.Run(() =>
+                    {
+                        try
+                        {
+                            callback(tcs.Task);
+                        }
+                        catch (Exception)
+                        {
+                            // Suppress exceptions on background threads.
+                        }
+                    });
                 }
                 return tcs.Task;
             }
@@ -239,6 +250,11 @@ public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, Asy
 
         public override int EndRead(IAsyncResult asyncResult)
         {
+            if (asyncResult == null)
+            {
+                throw new ArgumentNullException(nameof(asyncResult));
+            }
+
             Task<int> task = asyncResult as Task<int>;
             if (task != null)
             {

diff --git a/src/Microsoft.AspNetCore.WebUtilities/FileBufferingReadStream.cs b/src/Microsoft.AspNetCore.WebUtilities/FileBufferingReadStream.cs
@@ -232,19 +232,28 @@ private async void BeginRead(byte[] buffer, int offset, int count, AsyncCallback
 
             if (callback != null)
             {
-                try
+                // Offload callbacks to avoid stack dives on sync completions.
+                var ignored = Task.Run(() =>
                 {
-                    callback(tcs.Task);
-                }
-                catch (Exception)
-                {
-                    // Suppress exceptions on background threads.
-                }
+                    try
+                    {
+                        callback(tcs.Task);
+                    }
+                    catch (Exception)
+                    {
+                        // Suppress exceptions on background threads.
+                    }
+                });
             }
         }
 
         public override int EndRead(IAsyncResult asyncResult)
         {
+            if (asyncResult == null)
+            {
+                throw new ArgumentNullException(nameof(asyncResult));
+            }
+
             var task = (Task<int>)asyncResult;
             return task.GetAwaiter().GetResult();
         }

diff --git a/src/Microsoft.AspNetCore.WebUtilities/MultipartReaderStream.cs b/src/Microsoft.AspNetCore.WebUtilities/MultipartReaderStream.cs
@@ -184,19 +184,28 @@ private async void InternalReadAsync(byte[] buffer, int offset, int size, AsyncC
 
             if (callback != null)
             {
-                try
+                // Offload callbacks to avoid stack dives on sync completions.
+                var ignored = Task.Run(() =>
                 {
-                    callback(tcs.Task);
-                }
-                catch (Exception)
-                {
-                    // Suppress exceptions on background threads.
-                }
+                    try
+                    {
+                        callback(tcs.Task);
+                    }
+                    catch (Exception)
+                    {
+                        // Suppress exceptions on background threads.
+                    }
+                });
             }
         }
 
         public override int EndRead(IAsyncResult asyncResult)
         {
+            if (asyncResult == null)
+            {
+                throw new ArgumentNullException(nameof(asyncResult));
+            }
+
             var task = (Task<int>)asyncResult;
             return task.GetAwaiter().GetResult();
         }