Skip to content

If not waiting for data, allocate memory before checking anything #22225

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

Closed
benaadams wants to merge 5 commits into from
Closed

If not waiting for data, allocate memory before checking anything #22225

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd71863
If not waiting for data, allocate memory before flush
benaadams May 25, 2020
ed40eac
Flush invalidates the memory
benaadams May 26, 2020
9d98835
Half size of min "no wait" buffer
benaadams May 27, 2020
1fbde96
Revert buffer size change
benaadams May 27, 2020
e864e2b
Use isMoreData FlushAsync overload
benaadams May 28, 2020
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
26 changes: 22 additions & 4 deletions src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,17 +187,24 @@ private async Task ProcessReceives()
{
// Resolve `input` PipeWriter via the IDuplexPipe interface prior to loop start for performance.
var input = Input;

Memory<byte> buffer = default;
if (!_waitForData)
{
// Ensure we have some reasonable amount of buffer space to start.
buffer = input.GetMemory(MinAllocBufferSize);
}

while (true)
{
if (_waitForData)
{
// Wait for data before allocating a buffer.
await _receiver.WaitForDataAsync();
// Data ready, allocate some memory to receive it.
buffer = input.GetMemory(MinAllocBufferSize);
}

// Ensure we have some reasonable amount of buffer space
var buffer = input.GetMemory(MinAllocBufferSize);

var bytesReceived = await _receiver.ReceiveAsync(buffer);

if (bytesReceived == 0)
Expand All @@ -209,7 +216,18 @@ private async Task ProcessReceives()

input.Advance(bytesReceived);

var flushTask = input.FlushAsync();
var flushTask = input.FlushAsync(isMoreData: !_waitForData);
Copy link
Copy Markdown
Member

@halter73 halter73 Jun 30, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@benaadams @davidfowl Any chance we're getting the isMoreData: API in .NET 5?

Copy link
Copy Markdown
Member Author

@benaadams benaadams Jun 30, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No; too soon

if (!_waitForData)
{
if (buffer.Length - bytesReceived >= MinAllocBufferSize)
{
buffer = buffer.Slice(bytesReceived);
Copy link
Copy Markdown
Member

@halter73 halter73 Jun 30, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The skipping of the call to GetMemory() doesn't even look like it should be allowed by the PipeWriter. Is this critical for perf?

Copy link
Copy Markdown
Member Author

@benaadams benaadams Jun 30, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Its what the api would allow

}
else
{
buffer = input.GetMemory(MinAllocBufferSize);
}
}

var paused = !flushTask.IsCompleted;

Expand Down