huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'benaadams/return-blocks-out-of-lock' into dev

This commit is contained in:
Stephen Halter 2016-05-18 17:03:24 -07:00
parent e1c64d2119 0e8cbe5df6
commit 369512369f
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Microsoft.AspNetCore.Server.Kestrel/Http/SocketInput.cs
View File

@ -174,12 +174,12 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
public void ConsumingComplete(
MemoryPoolIterator consumed,
MemoryPoolIterator examined)
{
lock (_sync)
{
MemoryPoolBlock returnStart = null;
MemoryPoolBlock returnEnd = null;
lock (_sync)
{
if (!consumed.IsDefault)
{
returnStart = _head;
@ -200,6 +200,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
_awaitableIsNotCompleted,
_awaitableIsCompleted);
}
}
while (returnStart != returnEnd)
{
@ -213,7 +214,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
throw new InvalidOperationException("No ongoing consuming operation to complete.");
}
}
}
public void CompleteAwaiting()
{