Skip to content

pool async state in SslStream #69418

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

Merged
merged 4 commits into from
May 26, 2022
Merged

pool async state in SslStream #69418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b6b81af
pool async state in SslStream
wfurt May 17, 2022
2968754
fix tests
wfurt May 17, 2022
0e75329
remove GetAwaiter from test
wfurt May 23, 2022
f2a302b
Merge branch 'main' of https://github.com/dotnet/runtime into asyncPool
wfurt May 25, 2022
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
5 changes: 3 additions & 2 deletions src/libraries/System.Net.Security/src/System/Net/Security/SslStream.IO.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
// The .NET Foundation licenses this file to you under the MIT license.

using System.Buffers;
using System.ComponentModel;
using System.Diagnostics;
using System.IO;
using System.Runtime.CompilerServices;
using System.Runtime.ExceptionServices;
using System.Security.Authentication;
using System.Security.Cryptography.X509Certificates;
Expand Down Expand Up @@ -675,7 +675,7 @@ private bool HaveFullTlsFrame(out int frameSize)
return _buffer.EncryptedLength >= frameSize;
}


[AsyncMethodBuilder(typeof(PoolingAsyncValueTaskMethodBuilder<>))]
private async ValueTask<int> EnsureFullTlsFrameAsync<TIOAdapter>(CancellationToken cancellationToken)
where TIOAdapter : IReadWriteAdapter
{
Expand Down Expand Up @@ -760,6 +760,7 @@ private SecurityStatusPal DecryptData(int frameSize)
return status;
}

[AsyncMethodBuilder(typeof(PoolingAsyncValueTaskMethodBuilder<>))]
private async ValueTask<int> ReadAsyncInternal<TIOAdapter>(Memory<byte> buffer, CancellationToken cancellationToken)
where TIOAdapter : IReadWriteAdapter
{
Expand Down
10 changes: 6 additions & 4 deletions src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamNetworkStreamTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -961,19 +961,20 @@ public async Task SslStream_RandomSizeWrites_OK(int bufferSize, int readBufferSi

await TestConfiguration.WhenAllOrAnyFailedWithTimeout(t1, t2);

Task writer = Task.Run(() =>
Task writer = Task.Run(async () =>
{
Memory<byte> data = new Memory<byte>(dataToCopy);
while (data.Length > 0)
{
int writeLength = Math.Min(data.Length, writeBufferSize);
if (useAsync)
{
server.WriteAsync(data.Slice(0, writeLength)).GetAwaiter().GetResult();
await server.WriteAsync(data.Slice(0, writeLength));
}
else
{
server.Write(data.Span.Slice(0, writeLength));
await Task.CompletedTask;
}

data = data.Slice(Math.Min(writeBufferSize, data.Length));
Expand All @@ -982,7 +983,7 @@ public async Task SslStream_RandomSizeWrites_OK(int bufferSize, int readBufferSi
server.ShutdownAsync().GetAwaiter().GetResult();
});

Task reader = Task.Run(() =>
Task reader = Task.Run(async () =>
{
Memory<byte> readBuffer = new Memory<byte>(dataReceived);
int totalLength = 0;
Expand All @@ -992,11 +993,12 @@ public async Task SslStream_RandomSizeWrites_OK(int bufferSize, int readBufferSi
{
if (useAsync)
{
readLength = client.ReadAsync(readBuffer.Slice(totalLength, readBufferSize)).GetAwaiter().GetResult();
readLength = await client.ReadAsync(readBuffer.Slice(totalLength, readBufferSize));
}
else
{
readLength = client.Read(readBuffer.Span.Slice(totalLength, readBufferSize));
await Task.CompletedTask;
}

if (readLength == 0)
Expand Down