Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use .NET Core SequenceReader #7003

Merged
merged 2 commits into from
Feb 20, 2019
Merged

Use .NET Core SequenceReader #7003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c649b2
Use .NET Core SequenceReader
JeremyKuhne Jan 24, 2019
a02ac20
Use var
JeremyKuhne Feb 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
153 changes: 0 additions & 153 deletions src/Servers/Kestrel/Core/src/Internal/BufferReader.cs
View file
Open in desktop

This file was deleted.

15 changes: 6 additions & 9 deletions src/Servers/Kestrel/Core/src/Internal/Http/Http1MessageBody.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,11 +528,9 @@ private void ParseChunkedPrefix(ReadOnlySequence<byte> buffer, out SequencePosit
{
consumed = buffer.Start;
examined = buffer.Start;
var reader = new BufferReader(buffer);
var ch1 = reader.Read();
var ch2 = reader.Read();
var reader = new SequenceReader<byte>(buffer);

if (ch1 == -1 || ch2 == -1)
if (!reader.TryRead(out var ch1) || !reader.TryRead(out var ch2))
{
examined = reader.Position;
return;
Expand All @@ -541,21 +539,20 @@ private void ParseChunkedPrefix(ReadOnlySequence<byte> buffer, out SequencePosit
var chunkSize = CalculateChunkSize(ch1, 0);
ch1 = ch2;

while (reader.ConsumedBytes < MaxChunkPrefixBytes)
while (reader.Consumed < MaxChunkPrefixBytes)
{
if (ch1 == ';')
{
consumed = reader.Position;
examined = reader.Position;

AddAndCheckConsumedBytes(reader.ConsumedBytes);
AddAndCheckConsumedBytes(reader.Consumed);
_inputLength = chunkSize;
_mode = Mode.Extension;
return;
}

ch2 = reader.Read();
if (ch2 == -1)
if (!reader.TryRead(out ch2))
{
examined = reader.Position;
return;
Expand All @@ -566,7 +563,7 @@ private void ParseChunkedPrefix(ReadOnlySequence<byte> buffer, out SequencePosit
consumed = reader.Position;
examined = reader.Position;

AddAndCheckConsumedBytes(reader.ConsumedBytes);
AddAndCheckConsumedBytes(reader.Consumed);
_inputLength = chunkSize;
_mode = chunkSize > 0 ? Mode.Data : Mode.Trailer;
return;
Expand Down
25 changes: 13 additions & 12 deletions src/Servers/Kestrel/Core/src/Internal/Http/HttpParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,25 +182,26 @@ public unsafe bool ParseHeaders(TRequestHandler handler, in ReadOnlySequence<byt

var bufferEnd = buffer.End;

var reader = new BufferReader(buffer);
var start = default(BufferReader);
var reader = new SequenceReader<byte>(buffer);
var start = default(SequenceReader<byte>);
var done = false;

try
{
while (!reader.End)
{
var span = reader.CurrentSegment;
var remaining = span.Length - reader.CurrentSegmentIndex;
var span = reader.CurrentSpan;
var remaining = span.Length - reader.CurrentSpanIndex;

fixed (byte* pBuffer = span)
{
while (remaining > 0)
{
var index = reader.CurrentSegmentIndex;
int ch1;
int ch2;
var index = reader.CurrentSpanIndex;
byte ch1;
byte ch2;
var readAhead = false;
var readSecond = true;

// Fast path, we're still looking at the same span
if (remaining >= 2)
Expand All @@ -215,16 +216,16 @@ public unsafe bool ParseHeaders(TRequestHandler handler, in ReadOnlySequence<byt
start = reader;

// Possibly split across spans
ch1 = reader.Read();
ch2 = reader.Read();
reader.TryRead(out ch1);
readSecond = reader.TryRead(out ch2);

readAhead = true;
}

if (ch1 == ByteCR)
{
// Check for final CRLF.
if (ch2 == -1)
if (!readSecond)
{
// Reset the reader so we don't consume anything
reader = start;
Expand Down Expand Up @@ -252,7 +253,7 @@ public unsafe bool ParseHeaders(TRequestHandler handler, in ReadOnlySequence<byt
if (readAhead)
{
reader = start;
index = reader.CurrentSegmentIndex;
index = reader.CurrentSpanIndex;
}

var endIndex = new Span<byte>(pBuffer + index, remaining).IndexOf(ByteLF);
Expand Down Expand Up @@ -308,7 +309,7 @@ public unsafe bool ParseHeaders(TRequestHandler handler, in ReadOnlySequence<byt
finally
{
consumed = reader.Position;
consumedBytes = reader.ConsumedBytes;
consumedBytes = (int)reader.Consumed;

if (done)
{
Expand Down
Loading