Removed the write callback function

Author: Kai Ruhnau

src/Microsoft.AspNet.Server.Kestrel/Http/Frame.cs

@@ -39,7 +39,7 @@ public FrameContext(ConnectionContext context) : base(context)
     public interface IFrameControl
     {
         Task ProduceContinueAsync();
-        Task WriteAsync(ArraySegment<byte> data, Action<Exception, object> callback, object state);
+        Task WriteAsync(ArraySegment<byte> data);
     }
 
     public class Frame : FrameContext, IFrameControl
@@ -235,10 +235,10 @@ private async Task ExecuteAsync()
         }
 
 
-        public async Task WriteAsync(ArraySegment<byte> data, Action<Exception, object> callback, object state)
+        public async Task WriteAsync(ArraySegment<byte> data)
         {
             await ProduceStartAsync();
-            await SocketOutput.WriteAsync(data, callback, state);
+            await SocketOutput.WriteAsync(data);
         }
 
         public Task Upgrade(IDictionary<string, object> options, Func<object, Task> callback)
@@ -263,24 +263,17 @@ public Task ProduceContinueAsync()
                 (expect.FirstOrDefault() ?? "").Equals("100-continue", StringComparison.OrdinalIgnoreCase))
             {
                 return SocketOutput.WriteAsync(
-                    new ArraySegment<byte>(_continueBytes, 0, _continueBytes.Length),
-                    (error, _) =>
-                    {
-                        if (error != null)
-                        {
-                            Trace.WriteLine("ProduceContinue " + error.ToString());
-                        }
-                    },
-                    null);
+                    new ArraySegment<byte>(_continueBytes, 0, _continueBytes.Length));
             }
 
             return Task.FromResult(0);
         }
 
-        public Task ProduceStartAsync()
+        public async Task ProduceStartAsync()
         {
             if (_resultStarted)
-                return Task.CompletedTask;
+                return;
+
             _resultStarted = true;
 
             FireOnSendingHeaders();
@@ -290,17 +283,14 @@ public Task ProduceStartAsync()
             var status = ReasonPhrases.ToStatus(StatusCode, ReasonPhrase);
 
             var responseHeader = CreateResponseHeader(status, ResponseHeaders);
-            return SocketOutput.WriteAsync(
-                responseHeader.Item1,
-                (error, x) =>
-                {
-                    if (error != null)
-                    {
-                        Trace.WriteLine("ProduceStart " + error.ToString());
-                    }
-                    ((IDisposable)x).Dispose();
-                },
-                responseHeader.Item2);
+            try
+            {
+                await SocketOutput.WriteAsync(responseHeader.Item1);
+            }
+            finally
+            {
+                responseHeader.Item2.Dispose();
+            }
         }
 
         public Task ProduceEndAsync(Exception ex)

src/Microsoft.AspNet.Server.Kestrel/Http/FrameResponseStream.cs

@@ -24,14 +24,7 @@ public override void Flush()
 
         public override Task FlushAsync(CancellationToken cancellationToken)
         {
-            return _context.FrameControl.WriteAsync(
-                new ArraySegment<byte>(new byte[0]),
-                (error, arg) =>
-                {
-                    if (error != null)
-                        throw error;
-                },
-                null);
+            return _context.FrameControl.WriteAsync(new ArraySegment<byte>(new byte[0]));
         }
 
         public override long Seek(long offset, SeekOrigin origin)
@@ -56,14 +49,7 @@ public override void Write(byte[] buffer, int offset, int count)
 
         public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
         {
-            return _context.FrameControl.WriteAsync(
-                new ArraySegment<byte>(buffer, offset, count),
-                (error, arg) =>
-                {
-                    if (error != null)
-                        throw error;
-                },
-                null);
+            return _context.FrameControl.WriteAsync(new ArraySegment<byte>(buffer, offset, count));
         }
 
         public override bool CanRead

src/Microsoft.AspNet.Server.Kestrel/Http/SocketOutput.cs

@@ -13,7 +13,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
     /// </summary>
     public interface ISocketOutput
     {
-        Task WriteAsync(ArraySegment<byte> buffer, Action<Exception, object> callback, object state);
+        Task WriteAsync(ArraySegment<byte> buffer);
     }
 
     public class SocketOutput : ISocketOutput
@@ -27,7 +27,7 @@ public SocketOutput(KestrelThread thread, UvTcpStreamHandle socket)
             _socket = socket;
         }
 
-        public Task WriteAsync(ArraySegment<byte> buffer, Action<Exception, object> callback, object state)
+        public Task WriteAsync(ArraySegment<byte> buffer)
         {
             //TODO: need buffering that works
             var copy = new byte[buffer.Count];
@@ -38,9 +38,7 @@ public Task WriteAsync(ArraySegment<byte> buffer, Action<Exception, object> call
             var req = new UvWriteReq(
                 _thread.Loop,
                 _socket,
-                arraySegment,
-                callback,
-                state);
+                arraySegment);
             return _thread.PostAsync(req.Write);
         }
 

src/Microsoft.AspNet.Server.Kestrel/Networking/UvWriteRequest.cs

@@ -15,8 +15,6 @@ public class UvWriteReq : UvMemoryResource
         private readonly uv_write_cb _uv_write_cb;
 
         private readonly UvTcpStreamHandle _stream;
-        private readonly Action<Exception, object> _callback;
-        private readonly object _state;
 
         private readonly UvBuffer[] _uvBuffers;
         private readonly GCHandle[] _bufferHandles;
@@ -25,15 +23,11 @@ public class UvWriteReq : UvMemoryResource
         public UvWriteReq(
             UvLoopHandle loop,
             UvTcpStreamHandle stream,
-            ArraySegment<byte> buffer,
-            Action<Exception, object> callback,
-            object state)
+            ArraySegment<byte> buffer)
             : base(loop.ThreadId, getSize())
         {
             _uv_write_cb = UvWriteCb;
             _stream = stream;
-            _callback = callback;
-            _state = state;
 
             _bufferHandles = new GCHandle[1];
             _uvBuffers = new UvBuffer[1];
@@ -72,13 +66,11 @@ public void Write()
 
         private void UvWriteCb(IntPtr ptr, int status)
         {
-            var error = Libuv.ExceptionForError(status);
-
             KestrelTrace.Log.ConnectionWriteCallback(0, status);
-            //NOTE: pool this?
 
             Dispose();
-            _callback(error, _state);
+
+            Libuv.ThrowOnError(status);
         }
 
         protected override bool ReleaseHandle()

test/Microsoft.AspNet.Server.KestrelTests/NetworkingTests.cs

@@ -215,9 +215,7 @@ public async Task SocketCanReadAndWrite()
                                             loop,
                                             tcp2,
                                             new ArraySegment<byte>(
-                                                new byte[] { 65, 66, 67, 68, 69 }),
-                                            (_1, _2) => { },
-                                            null
+                                                new byte[] { 65, 66, 67, 68, 69 })
                                         );
                                     }
                                 }

test/Microsoft.AspNet.Server.KestrelTests/TestInput.cs

@@ -46,7 +46,7 @@ public void Resume()
         {
         }
 
-        public Task WriteAsync(ArraySegment<byte> data, Action<Exception, object> callback, object state)
+        public Task WriteAsync(ArraySegment<byte> data)
         {
             return Task.CompletedTask;
         }