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

Remove async from OnRead (#1746) 

- Remove async from fast path.
- Added ApplyBackpressureAsync that pauses and resumes reading
This commit is contained in:
David Fowler 2017-04-24 11:58:52 -07:00 committed by GitHub
parent df9e48b1f0
commit 7e5604b2f5
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/LibuvConnection.cs
View File

@ -122,7 +122,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal
((LibuvConnection)state).OnRead(handle, status); ((LibuvConnection)state).OnRead(handle, status);
} }
private async void OnRead(UvStreamHandle handle, int status) private void OnRead(UvStreamHandle handle, int status)
{ {
var normalRead = status >= 0; var normalRead = status >= 0;
var normalDone = status == LibuvConstants.EOF; var normalDone = status == LibuvConstants.EOF;
@ -175,20 +175,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal
_currentWritableBuffer = null; _currentWritableBuffer = null;
_bufferHandle.Free(); _bufferHandle.Free();
if (flushTask?.IsCompleted == false)
{
Log.ConnectionPause(ConnectionId);
StopReading();
var result = await flushTask.Value;
// If the reader isn't complete then resume
if (!result.IsCompleted && !result.IsCancelled)
{
Log.ConnectionResume(ConnectionId);
StartReading();
}
}
if (!normalRead) if (!normalRead)
{ {
_connectionContext.Abort(error); _connectionContext.Abort(error);
@ -196,6 +182,27 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal
// Complete after aborting the connection // Complete after aborting the connection
Input.Complete(error); Input.Complete(error);
} }
else if (flushTask?.IsCompleted == false)
{
// We wrote too many bytes too the reader so pause reading and resume when
// we hit the low water mark
_ = ApplyBackpressureAsync(flushTask.Value);
}
}
private async Task ApplyBackpressureAsync(WritableBufferAwaitable flushTask)
{
Log.ConnectionPause(ConnectionId);
StopReading();
var result = await flushTask;
// If the reader isn't complete or cancelled then resume reading
if (!result.IsCompleted && !result.IsCancelled)
{
Log.ConnectionResume(ConnectionId);
StartReading();
}
} }
private void StopReading() private void StopReading()