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

Respond to corefxlab rename (build break) (#1529)

This commit is contained in:
Ben Adams 2017-03-21 15:43:49 +00:00 committed by David Fowler
parent 24ed93288e
commit 32d6b42964
5 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNetCore.Server.Kestrel/Adapter/Internal/AdaptedPipeline.cs
View File

@ -67,7 +67,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Adapter.Internal
try try
{ {
var array = block.Memory.GetArray(); var array = block.Buffer.GetArray();
try try
{ {
bytesRead = await _filteredStream.ReadAsync(array.Array, array.Offset, array.Count); bytesRead = await _filteredStream.ReadAsync(array.Array, array.Offset, array.Count);

4
src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/Connection.cs
View File

@ -234,12 +234,12 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http
var currentWritableBuffer = Input.Writer.Alloc(MinAllocBufferSize); var currentWritableBuffer = Input.Writer.Alloc(MinAllocBufferSize);
_currentWritableBuffer = currentWritableBuffer; _currentWritableBuffer = currentWritableBuffer;
void* dataPtr; void* dataPtr;
var tryGetPointer = currentWritableBuffer.Memory.TryGetPointer(out dataPtr); var tryGetPointer = currentWritableBuffer.Buffer.TryGetPointer(out dataPtr);
Debug.Assert(tryGetPointer); Debug.Assert(tryGetPointer);
return handle.Libuv.buf_init( return handle.Libuv.buf_init(
(IntPtr)dataPtr, (IntPtr)dataPtr,
currentWritableBuffer.Memory.Length); currentWritableBuffer.Buffer.Length);
} }
private static void ReadCallback(UvStreamHandle handle, int status, object state) private static void ReadCallback(UvStreamHandle handle, int status, object state)

34
src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/PipelineExtensions.cs
View File

@ -2,11 +2,9 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
using System.Diagnostics; using System.Buffers;
using System.IO.Pipelines; using System.IO.Pipelines;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Text;
using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http
@ -85,12 +83,12 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http
return buffer.ToArray(); return buffer.ToArray();
} }
public static ArraySegment<byte> GetArray(this Memory<byte> memory) public static ArraySegment<byte> GetArray(this Buffer<byte> buffer)
{ {
ArraySegment<byte> result; ArraySegment<byte> result;
if (!memory.TryGetArray(out result)) if (!buffer.TryGetArray(out result))
{ {
throw new InvalidOperationException("Memory backed by array was expected"); throw new InvalidOperationException("Buffer backed by array was expected");
} }
return result; return result;
} }
@ -98,7 +96,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http
// Temporary until the fast write implementation propagates from corefx // Temporary until the fast write implementation propagates from corefx
public unsafe static void WriteFast(this WritableBuffer buffer, ReadOnlySpan<byte> source) public unsafe static void WriteFast(this WritableBuffer buffer, ReadOnlySpan<byte> source)
{ {
var dest = buffer.Memory.Span; var dest = buffer.Buffer.Span;
var destLength = dest.Length; var destLength = dest.Length;
if (destLength == 0) if (destLength == 0)
@ -106,7 +104,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http
buffer.Ensure(); buffer.Ensure();
// Get the new span and length // Get the new span and length
dest = buffer.Memory.Span; dest = buffer.Buffer.Span;
destLength = dest.Length; destLength = dest.Length;
} }
@ -132,7 +130,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http
{ {
while (remaining > 0) while (remaining > 0)
{ {
var writable = Math.Min(remaining, buffer.Memory.Length); var writable = Math.Min(remaining, buffer.Buffer.Length);
buffer.Ensure(writable); buffer.Ensure(writable);
@ -141,7 +139,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http
continue; continue;
} }
fixed (byte* pDest = &buffer.Memory.Span.DangerousGetPinnableReference()) fixed (byte* pDest = &buffer.Buffer.Span.DangerousGetPinnableReference())
{ {
Unsafe.CopyBlockUnaligned(pDest, pSource + offset, (uint)writable); Unsafe.CopyBlockUnaligned(pDest, pSource + offset, (uint)writable);
} }
@ -158,16 +156,16 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http
{ {
if (!string.IsNullOrEmpty(data)) if (!string.IsNullOrEmpty(data))
{ {
if (buffer.Memory.IsEmpty) if (buffer.Buffer.IsEmpty)
{ {
buffer.Ensure(); buffer.Ensure();
} }
// Fast path, try copying to the available memory directly // Fast path, try copying to the available memory directly
if (data.Length <= buffer.Memory.Length) if (data.Length <= buffer.Buffer.Length)
{ {
fixed (char* input = data) fixed (char* input = data)
fixed (byte* output = &buffer.Memory.Span.DangerousGetPinnableReference()) fixed (byte* output = &buffer.Buffer.Span.DangerousGetPinnableReference())
{ {
EncodeAsciiCharsToBytes(input, output, data.Length); EncodeAsciiCharsToBytes(input, output, data.Length);
} }
@ -186,15 +184,15 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http
{ {
const byte AsciiDigitStart = (byte)'0'; const byte AsciiDigitStart = (byte)'0';
if (buffer.Memory.IsEmpty) if (buffer.Buffer.IsEmpty)
{ {
buffer.Ensure(); buffer.Ensure();
} }
// Fast path, try copying to the available memory directly // Fast path, try copying to the available memory directly
var bytesLeftInBlock = buffer.Memory.Length; var bytesLeftInBlock = buffer.Buffer.Length;
var simpleWrite = true; var simpleWrite = true;
fixed (byte* output = &buffer.Memory.Span.DangerousGetPinnableReference()) fixed (byte* output = &buffer.Buffer.Span.DangerousGetPinnableReference())
{ {
var start = output; var start = output;
if (number < 10 && bytesLeftInBlock >= 1) if (number < 10 && bytesLeftInBlock >= 1)
@ -266,7 +264,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http
while (remaining > 0) while (remaining > 0)
{ {
var writable = Math.Min(remaining, buffer.Memory.Length); var writable = Math.Min(remaining, buffer.Buffer.Length);
buffer.Ensure(writable); buffer.Ensure(writable);
@ -275,7 +273,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http
continue; continue;
} }
fixed (byte* output = &buffer.Memory.Span.DangerousGetPinnableReference()) fixed (byte* output = &buffer.Buffer.Span.DangerousGetPinnableReference())
{ {
EncodeAsciiCharsToBytes(inputSlice, output, writable); EncodeAsciiCharsToBytes(inputSlice, output, writable);
} }

2
src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/UvWriteReq.cs
View File

@ -26,7 +26,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Networking
private LibuvAwaitable<UvWriteReq> _awaitable = new LibuvAwaitable<UvWriteReq>(); private LibuvAwaitable<UvWriteReq> _awaitable = new LibuvAwaitable<UvWriteReq>();
private List<GCHandle> _pins = new List<GCHandle>(BUFFER_COUNT + 1); private List<GCHandle> _pins = new List<GCHandle>(BUFFER_COUNT + 1);
private List<MemoryHandle> _handles = new List<MemoryHandle>(BUFFER_COUNT + 1); private List<BufferHandle> _handles = new List<BufferHandle>(BUFFER_COUNT + 1);
public UvWriteReq(IKestrelTrace logger) : base(logger) public UvWriteReq(IKestrelTrace logger) : base(logger)
{ {

4
test/Microsoft.AspNetCore.Server.KestrelTests/MessageBodyTests.cs
View File

@ -285,7 +285,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
var bytes = Encoding.ASCII.GetBytes(data[0]); var bytes = Encoding.ASCII.GetBytes(data[0]);
var buffer = socketInput.Writer.Alloc(2048); var buffer = socketInput.Writer.Alloc(2048);
ArraySegment<byte> block; ArraySegment<byte> block;
Assert.True(buffer.Memory.TryGetArray(out block)); Assert.True(buffer.Buffer.TryGetArray(out block));
Buffer.BlockCopy(bytes, 0, block.Array, block.Offset, bytes.Length); Buffer.BlockCopy(bytes, 0, block.Array, block.Offset, bytes.Length);
buffer.Advance(bytes.Length); buffer.Advance(bytes.Length);
await buffer.FlushAsync(); await buffer.FlushAsync();
@ -296,7 +296,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
writeTcs = new TaskCompletionSource<byte[]>(); writeTcs = new TaskCompletionSource<byte[]>();
bytes = Encoding.ASCII.GetBytes(data[1]); bytes = Encoding.ASCII.GetBytes(data[1]);
buffer = socketInput.Writer.Alloc(2048); buffer = socketInput.Writer.Alloc(2048);
Assert.True(buffer.Memory.TryGetArray(out block)); Assert.True(buffer.Buffer.TryGetArray(out block));
Buffer.BlockCopy(bytes, 0, block.Array, block.Offset, bytes.Length); Buffer.BlockCopy(bytes, 0, block.Array, block.Offset, bytes.Length);
buffer.Advance(bytes.Length); buffer.Advance(bytes.Length);
await buffer.FlushAsync(); await buffer.FlushAsync();