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

Merge pull request #335 from benaadams/used-pool-array 

Consume body without allocating or reading
This commit is contained in:
David Fowler 2015-11-16 11:47:18 -08:00
parent 2e2dfd87c1 7691a7cc23
commit e3a62ff09f
5 changed files with 52 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNet.Server.Kestrel/Filter/LibuvStream.cs
View File

@ -85,7 +85,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Filter
private Task<int> ReadAsync(ArraySegment<byte> buffer) private Task<int> ReadAsync(ArraySegment<byte> buffer)
{ {
return _input.ReadAsync(buffer); return _input.ReadAsync(buffer.Array, buffer.Offset, buffer.Count);
} }
} }
} }

6
src/Microsoft.AspNet.Server.Kestrel/Http/Frame.cs
View File

@ -234,10 +234,8 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
await ProduceEnd(); await ProduceEnd();
while (await RequestBody.ReadAsync(_nullBuffer, 0, _nullBuffer.Length) != 0) // Finish reading the request body in case the app did not.
{ await MessageBody.Consume();
// Finish reading the request body in case the app did not.
}
} }
terminated = !_keepAlive; terminated = !_keepAlive;

40
src/Microsoft.AspNet.Server.Kestrel/Http/MessageBody.cs
View File

@ -38,6 +38,37 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
return result; return result;
} }
public async Task Consume(CancellationToken cancellationToken = default(CancellationToken))
{
Task<int> result;
var send100checked = false;
do
{
result = ReadAsyncImplementation(default(ArraySegment<byte>), cancellationToken);
if (!result.IsCompleted)
{
if (!send100checked)
{
if (Interlocked.Exchange(ref _send100Continue, 0) == 1)
{
_context.FrameControl.ProduceContinue();
}
send100checked = true;
}
}
else if (result.GetAwaiter().GetResult() == 0)
{
// Completed Task, end of stream
return;
}
else
{
// Completed Task, get next Task rather than await
continue;
}
} while (await result != 0);
}
public abstract Task<int> ReadAsyncImplementation(ArraySegment<byte> buffer, CancellationToken cancellationToken); public abstract Task<int> ReadAsyncImplementation(ArraySegment<byte> buffer, CancellationToken cancellationToken);
public static MessageBody For( public static MessageBody For(
@ -108,7 +139,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
public override Task<int> ReadAsyncImplementation(ArraySegment<byte> buffer, CancellationToken cancellationToken) public override Task<int> ReadAsyncImplementation(ArraySegment<byte> buffer, CancellationToken cancellationToken)
{ {
return _context.SocketInput.ReadAsync(buffer); return _context.SocketInput.ReadAsync(buffer.Array, buffer.Offset, buffer.Array == null ? 8192 : buffer.Count);
} }
} }
@ -129,14 +160,13 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
{ {
var input = _context.SocketInput; var input = _context.SocketInput;
var limit = Math.Min(buffer.Count, _inputLength); var limit = buffer.Array == null ? _inputLength : Math.Min(buffer.Count, _inputLength);
if (limit == 0) if (limit == 0)
{ {
return 0; return 0;
} }
var limitedBuffer = new ArraySegment<byte>(buffer.Array, buffer.Offset, limit); var actual = await _context.SocketInput.ReadAsync(buffer.Array, buffer.Offset, limit);
var actual = await _context.SocketInput.ReadAsync(limitedBuffer);
_inputLength -= actual; _inputLength -= actual;
if (actual == 0) if (actual == 0)
@ -189,7 +219,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
} }
while (_mode == Mode.ChunkData) while (_mode == Mode.ChunkData)
{ {
var limit = Math.Min(buffer.Count, _inputLength); var limit = buffer.Array == null ? _inputLength : Math.Min(buffer.Count, _inputLength);
if (limit != 0) if (limit != 0)
{ {
await input; await input;

4
src/Microsoft.AspNet.Server.Kestrel/Http/SocketInputExtensions.cs
View File

@ -8,7 +8,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
{ {
public static class SocketInputExtensions public static class SocketInputExtensions
{ {
public static async Task<int> ReadAsync(this SocketInput input, ArraySegment<byte> buffer) public static async Task<int> ReadAsync(this SocketInput input, byte[] buffer, int offset, int count)
{ {
while (true) while (true)
{ {
@ -16,7 +16,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
var begin = input.ConsumingStart(); var begin = input.ConsumingStart();
int actual; int actual;
var end = begin.CopyTo(buffer.Array, buffer.Offset, buffer.Count, out actual); var end = begin.CopyTo(buffer, offset, count, out actual);
input.ConsumingComplete(end, end); input.ConsumingComplete(end, end);
if (actual != 0) if (actual != 0)

15
src/Microsoft.AspNet.Server.Kestrel/Infrastructure/MemoryPoolIterator2.cs
View File

@ -600,18 +600,27 @@ namespace Microsoft.AspNet.Server.Kestrel.Infrastructure
if (remaining <= following) if (remaining <= following)
{ {
actual = count; actual = count;
Buffer.BlockCopy(block.Array, index, array, offset, remaining); if (array != null)
{
Buffer.BlockCopy(block.Array, index, array, offset, remaining);
}
return new MemoryPoolIterator2(block, index + remaining); return new MemoryPoolIterator2(block, index + remaining);
} }
else if (block.Next == null) else if (block.Next == null)
{ {
actual = count - remaining + following; actual = count - remaining + following;
Buffer.BlockCopy(block.Array, index, array, offset, following); if (array != null)
{
Buffer.BlockCopy(block.Array, index, array, offset, following);
}
return new MemoryPoolIterator2(block, index + following); return new MemoryPoolIterator2(block, index + following);
} }
else else
{ {
Buffer.BlockCopy(block.Array, index, array, offset, following); if (array != null)
{
Buffer.BlockCopy(block.Array, index, array, offset, following);
}
offset += following; offset += following;
remaining -= following; remaining -= following;
block = block.Next; block = block.Next;