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

address PR feedback

This commit is contained in:
arespr 2017-03-02 22:14:36 +01:00
parent bb74a6ce34
commit 346d8eaa03
2 changed files with 24 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/Microsoft.AspNetCore.Server.Kestrel.Performance/KnownStrings.cs
View File

@ -21,8 +21,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Performance
static byte[] _methodOptions = Encoding.ASCII.GetBytes("OPTIONS ");
static byte[] _methodTrace = Encoding.ASCII.GetBytes("TRACE \0\0");
static byte[] _version = Encoding.UTF8.GetBytes("HTTP/1.1\r\n");
const int loops = 1000;
@ -95,7 +93,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Performance
return GetKnownMethod(data);
}
private int GetKnownMethod(Span<byte> data)
{
int len = 0;
@ -127,7 +124,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Performance
return len;
}
[Benchmark(OperationsPerInvoke = loops * 10)]
public int GetKnownVersion_HTTP1_1()
{

53
test/Microsoft.AspNetCore.Server.KestrelTests/KnownStringsTests.cs
View File

@ -23,7 +23,6 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
static byte[] _methodOptions = Encoding.ASCII.GetBytes("OPTIONS ");
static byte[] _methodTrace = Encoding.ASCII.GetBytes("TRACE \0\0");
const int MagicNumer = 0x0600000C;
static byte[] _invalidMethod1 = BitConverter.GetBytes((ulong)MagicNumer);
static byte[] _invalidMethod2 = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
@ -38,43 +37,39 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
static byte[] _invalidMethod11 = Encoding.ASCII.GetBytes("OPTIONS_");
static byte[] _invalidMethod12 = Encoding.ASCII.GetBytes("TRACE_\0\0");
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static object[] CreateTestDataEntry(byte[] methodData, HttpMethod expectedMethod, int expectedLength, bool expectedResult)
{
return new object[] { methodData, expectedMethod, expectedLength, expectedResult };
}
private static readonly List<object[]> _testData
= new List<object[]>
{
CreateTestDataEntry(_methodGet, HttpMethod.Get, 3,true),
CreateTestDataEntry(_methodPut, HttpMethod.Put, 3,true),
CreateTestDataEntry(_methodPost, HttpMethod.Post, 4,true),
CreateTestDataEntry(_methodHead, HttpMethod.Head, 4,true),
CreateTestDataEntry(_methodTrace, HttpMethod.Trace, 5,true),
CreateTestDataEntry(_methodPatch, HttpMethod.Patch, 5,true),
CreateTestDataEntry(_methodDelete, HttpMethod.Delete, 6,true),
CreateTestDataEntry(_methodConnect, HttpMethod.Connect, 7,true),
CreateTestDataEntry(_methodOptions, HttpMethod.Options, 7,true),
CreateTestDataEntry(_invalidMethod1, HttpMethod.Custom, 0,false),
CreateTestDataEntry(_invalidMethod2, HttpMethod.Custom, 0,false),
CreateTestDataEntry(_invalidMethod3, HttpMethod.Custom, 0,false),
CreateTestDataEntry(_invalidMethod4, HttpMethod.Custom, 0,false),
CreateTestDataEntry(_invalidMethod5, HttpMethod.Custom, 0,false),
CreateTestDataEntry(_invalidMethod6, HttpMethod.Custom, 0,false),
CreateTestDataEntry(_invalidMethod7, HttpMethod.Custom, 0,false),
CreateTestDataEntry(_invalidMethod8, HttpMethod.Custom, 0,false),
CreateTestDataEntry(_invalidMethod9, HttpMethod.Custom, 0,false),
CreateTestDataEntry(_invalidMethod10, HttpMethod.Custom, 0,false),
CreateTestDataEntry(_invalidMethod11, HttpMethod.Custom, 0,false),
CreateTestDataEntry(_invalidMethod12, HttpMethod.Custom, 0,false),
};
private static readonly object[][] _testData = new object[][]
{
CreateTestDataEntry(_methodGet, HttpMethod.Get, 3, true),
CreateTestDataEntry(_methodPut, HttpMethod.Put, 3, true),
CreateTestDataEntry(_methodPost, HttpMethod.Post, 4, true),
CreateTestDataEntry(_methodHead, HttpMethod.Head, 4, true),
CreateTestDataEntry(_methodTrace, HttpMethod.Trace, 5, true),
CreateTestDataEntry(_methodPatch, HttpMethod.Patch, 5, true),
CreateTestDataEntry(_methodDelete, HttpMethod.Delete, 6, true),
CreateTestDataEntry(_methodConnect, HttpMethod.Connect, 7, true),
CreateTestDataEntry(_methodOptions, HttpMethod.Options, 7, true),
CreateTestDataEntry(_invalidMethod1, HttpMethod.Custom, 0, false),
CreateTestDataEntry(_invalidMethod2, HttpMethod.Custom, 0, false),
CreateTestDataEntry(_invalidMethod3, HttpMethod.Custom, 0, false),
CreateTestDataEntry(_invalidMethod4, HttpMethod.Custom, 0, false),
CreateTestDataEntry(_invalidMethod5, HttpMethod.Custom, 0, false),
CreateTestDataEntry(_invalidMethod6, HttpMethod.Custom, 0, false),
CreateTestDataEntry(_invalidMethod7, HttpMethod.Custom, 0, false),
CreateTestDataEntry(_invalidMethod8, HttpMethod.Custom, 0, false),
CreateTestDataEntry(_invalidMethod9, HttpMethod.Custom, 0, false),
CreateTestDataEntry(_invalidMethod10, HttpMethod.Custom, 0, false),
CreateTestDataEntry(_invalidMethod11, HttpMethod.Custom, 0, false),
CreateTestDataEntry(_invalidMethod12, HttpMethod.Custom, 0, false),
};
public static IEnumerable<object[]> TestData => _testData;
[Theory]
[MemberData(nameof(TestData), MemberType = typeof(KnownStringsTests))]
public void GetsKnownMethod(byte[] methodData, HttpMethod expectedMethod, int expectedLength, bool expectedResult)