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

Move call to CopyFrom in SocketOutput.WriteAsync inside lock to make writes atomic

This commit is contained in:
Stephen Halter 2016-01-07 15:28:35 -08:00
parent 63e39a257e
commit e90b61e6c5
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Microsoft.AspNet.Server.Kestrel/Http/SocketOutput.cs
View File

@ -82,6 +82,11 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
bool immediate = true, bool immediate = true,
bool socketShutdownSend = false, bool socketShutdownSend = false,
bool socketDisconnect = false) bool socketDisconnect = false)
{
TaskCompletionSource<object> tcs = null;
var scheduleWrite = false;
lock (_contextLock)
{ {
if (buffer.Count > 0) if (buffer.Count > 0)
{ {
@ -90,12 +95,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
// We do our own accounting below // We do our own accounting below
ProducingCompleteNoPreComplete(tail); ProducingCompleteNoPreComplete(tail);
} }
TaskCompletionSource<object> tcs = null;
var scheduleWrite = false;
lock (_contextLock)
{
if (_nextWriteContext == null) if (_nextWriteContext == null)
{ {
if (_writeContextPool.Count > 0) if (_writeContextPool.Count > 0)
@ -253,9 +253,9 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
// This is called on the libuv event loop // This is called on the libuv event loop
private void WriteAllPending() private void WriteAllPending()
{ {
WriteContext writingContext; WriteContext writingContext = null;
lock (_contextLock) if (Monitor.TryEnter(_contextLock))
{ {
_writePending = false; _writePending = false;
@ -264,14 +264,19 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
writingContext = _nextWriteContext; writingContext = _nextWriteContext;
_nextWriteContext = null; _nextWriteContext = null;
} }
Monitor.Exit(_contextLock);
}
else else
{ {
return; ScheduleWrite();
}
} }
if (writingContext != null)
{
writingContext.DoWriteIfNeeded(); writingContext.DoWriteIfNeeded();
} }
}
// This is called on the libuv event loop // This is called on the libuv event loop
private void OnWriteCompleted(WriteContext writeContext) private void OnWriteCompleted(WriteContext writeContext)