From daa2b7e383d22ba0bbd901ef10374fb714c2a952 Mon Sep 17 00:00:00 2001 From: Stephen Halter Date: Thu, 7 Jan 2016 16:10:05 -0800 Subject: [PATCH] Remove _tasksCompleted from SocketOutput - _tasksCompleted no longer helps avoid locking longer --- .../Http/SocketOutput.cs | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/SocketOutput.cs b/src/Microsoft.AspNet.Server.Kestrel/Http/SocketOutput.cs index 202a340c26..49f3a33eaf 100644 --- a/src/Microsoft.AspNet.Server.Kestrel/Http/SocketOutput.cs +++ b/src/Microsoft.AspNet.Server.Kestrel/Http/SocketOutput.cs @@ -49,7 +49,6 @@ namespace Microsoft.AspNet.Server.Kestrel.Http private Exception _lastWriteError; private WriteContext _nextWriteContext; private readonly Queue> _tasksPending; - private readonly Queue> _tasksCompleted; private readonly Queue _writeContextPool; private readonly Queue _writeReqPool; @@ -70,7 +69,6 @@ namespace Microsoft.AspNet.Server.Kestrel.Http _log = log; _threadPool = threadPool; _tasksPending = new Queue>(_initialTaskQueues); - _tasksCompleted = new Queue>(_initialTaskQueues); _writeContextPool = new Queue(_maxPooledWriteContexts); _writeReqPool = writeReqPool; @@ -287,7 +285,6 @@ namespace Microsoft.AspNet.Server.Kestrel.Http var status = writeContext.WriteStatus; var error = writeContext.WriteError; - if (error != null) { _lastWriteError = new IOException(error.Message, error); @@ -314,12 +311,6 @@ namespace Microsoft.AspNet.Server.Kestrel.Http _numBytesPreCompleted += bytesToWrite; bytesLeftToBuffer -= bytesToWrite; - _tasksCompleted.Enqueue(tcs); - } - - while (_tasksCompleted.Count > 0) - { - var tcs = _tasksCompleted.Dequeue(); if (_lastWriteError == null) { _threadPool.Complete(tcs); @@ -331,7 +322,6 @@ namespace Microsoft.AspNet.Server.Kestrel.Http } _log.ConnectionWriteCallback(_connectionId, status); - _tasksCompleted.Clear(); } // This is called on the libuv event loop