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

Consolidate write flags and counting logic

This commit is contained in:
Chris R 2016-09-01 12:00:05 -07:00
parent 8105a272d2
commit 1e59352466
1 changed files with 25 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/Microsoft.Net.Http.Server/RequestProcessing/ResponseStream.cs
View File

@ -40,7 +40,6 @@ namespace Microsoft.Net.Http.Server
private long _leftToWrite = long.MinValue; private long _leftToWrite = long.MinValue;
private bool _skipWrites; private bool _skipWrites;
private bool _disposed; private bool _disposed;
private bool _inOpaqueMode;
// The last write needs special handling to cancel. // The last write needs special handling to cancel.
private ResponseStreamAsyncResult _lastWrite; private ResponseStreamAsyncResult _lastWrite;
@ -138,7 +137,7 @@ namespace Microsoft.Net.Http.Server
// Make sure all validation is performed before this computes the headers // Make sure all validation is performed before this computes the headers
var flags = ComputeLeftToWrite(data.Count, endOfRequest); var flags = ComputeLeftToWrite(data.Count, endOfRequest);
if (!_inOpaqueMode && endOfRequest && _leftToWrite > 0) if (endOfRequest && _leftToWrite > 0)
{ {
_requestContext.Abort(); _requestContext.Abort();
// This is logged rather than thrown because it is too late for an exception to be visible in user code. // This is logged rather than thrown because it is too late for an exception to be visible in user code.
@ -146,16 +145,6 @@ namespace Microsoft.Net.Http.Server
return; return;
} }
if (endOfRequest && _requestContext.Response.BoundaryType == BoundaryType.Close)
{
flags |= HttpApi.HTTP_FLAGS.HTTP_SEND_RESPONSE_FLAG_DISCONNECT;
}
else if (!endOfRequest && _leftToWrite != data.Count)
{
flags |= HttpApi.HTTP_FLAGS.HTTP_SEND_RESPONSE_FLAG_MORE_DATA;
}
UpdateWritenCount((uint)data.Count);
uint statusCode = 0; uint statusCode = 0;
HttpApi.HTTP_DATA_CHUNK[] dataChunks; HttpApi.HTTP_DATA_CHUNK[] dataChunks;
var pinnedBuffers = PinDataBuffers(endOfRequest, data, out dataChunks); var pinnedBuffers = PinDataBuffers(endOfRequest, data, out dataChunks);
@ -316,12 +305,6 @@ namespace Microsoft.Net.Http.Server
// Make sure all validation is performed before this computes the headers // Make sure all validation is performed before this computes the headers
var flags = ComputeLeftToWrite(data.Count); var flags = ComputeLeftToWrite(data.Count);
if (_leftToWrite != data.Count)
{
flags |= HttpApi.HTTP_FLAGS.HTTP_SEND_RESPONSE_FLAG_MORE_DATA;
}
UpdateWritenCount((uint)data.Count);
uint statusCode = 0; uint statusCode = 0;
var chunked = _requestContext.Response.BoundaryType == BoundaryType.Chunked; var chunked = _requestContext.Response.BoundaryType == BoundaryType.Chunked;
var asyncResult = new ResponseStreamAsyncResult(this, data, chunked, cancellationToken); var asyncResult = new ResponseStreamAsyncResult(this, data, chunked, cancellationToken);
@ -460,6 +443,29 @@ namespace Microsoft.Net.Http.Server
_leftToWrite = -1; // unlimited _leftToWrite = -1; // unlimited
} }
} }
if (endOfRequest && _requestContext.Response.BoundaryType == BoundaryType.Close)
{
flags |= HttpApi.HTTP_FLAGS.HTTP_SEND_RESPONSE_FLAG_DISCONNECT;
}
else if (!endOfRequest && _leftToWrite != writeCount)
{
flags |= HttpApi.HTTP_FLAGS.HTTP_SEND_RESPONSE_FLAG_MORE_DATA;
}
// Update _leftToWrite now so we can queue up additional async writes.
if (_leftToWrite > 0)
{
// keep track of the data transferred
_leftToWrite -= writeCount;
}
if (_leftToWrite == 0)
{
// in this case we already passed 0 as the flag, so we don't need to call HttpSendResponseEntityBody() when we Close()
_disposed = true;
}
// else -1 unlimited
return flags; return flags;
} }
@ -597,20 +603,6 @@ namespace Microsoft.Net.Http.Server
var chunked = _requestContext.Response.BoundaryType == BoundaryType.Chunked; var chunked = _requestContext.Response.BoundaryType == BoundaryType.Chunked;
var asyncResult = new ResponseStreamAsyncResult(this, fileStream, offset, count.Value, chunked, cancellationToken); var asyncResult = new ResponseStreamAsyncResult(this, fileStream, offset, count.Value, chunked, cancellationToken);
long bytesWritten;
if (chunked)
{
bytesWritten = 0;
}
else
{
bytesWritten = count.Value;
}
// Update _leftToWrite now so we can queue up additional calls to SendFileAsync.
flags |= _leftToWrite == bytesWritten ? HttpApi.HTTP_FLAGS.NONE : HttpApi.HTTP_FLAGS.HTTP_SEND_RESPONSE_FLAG_MORE_DATA;
UpdateWritenCount((uint)bytesWritten);
try try
{ {
if (!started) if (!started)
@ -680,23 +672,6 @@ namespace Microsoft.Net.Http.Server
return asyncResult.Task; return asyncResult.Task;
} }
private void UpdateWritenCount(uint dataWritten)
{
if (!_inOpaqueMode)
{
if (_leftToWrite > 0)
{
// keep track of the data transferred
_leftToWrite -= dataWritten;
}
if (_leftToWrite == 0)
{
// in this case we already passed 0 as the flag, so we don't need to call HttpSendResponseEntityBody() when we Close()
_disposed = true;
}
}
}
protected override unsafe void Dispose(bool disposing) protected override unsafe void Dispose(bool disposing)
{ {
try try
@ -719,8 +694,7 @@ namespace Microsoft.Net.Http.Server
internal void SwitchToOpaqueMode() internal void SwitchToOpaqueMode()
{ {
_inOpaqueMode = true; _leftToWrite = -1;
_leftToWrite = long.MaxValue;
} }
// The final Content-Length async write can only be Canceled by CancelIoEx. // The final Content-Length async write can only be Canceled by CancelIoEx.