Skip to content

Merge several version of MsQuicStream SendAsync code - #68772

Merged
rzikm merged 8 commits into
dotnet:mainfrom
rzikm:55818-sendasync-refactor
May 24, 2022
Merged

Merge several version of MsQuicStream SendAsync code#68772
rzikm merged 8 commits into
dotnet:mainfrom
rzikm:55818-sendasync-refactor

Conversation

@rzikm

@rzikmrzikm commented May 2, 2022•
edited
Loading

Copy link
Copy Markdown
Member

Fixes#55818.

This PR extracts common code from several Send*Async methods used to implement WriteAsync into a single WriteAsyncInternal method.

@ghostghost assigned rzikmMay 2, 2022
@ghost

ghost commented May 2, 2022

Copy link
Copy Markdown

Tagging subscribers to this area: @dotnet/ncl
See info in area-owners.md if you want to be subscribed.

Issue Details

Fixes #55818.

This PR extracts common code from several Send*Async methods

Author:rzikm
Assignees:-
Labels:

area-System.Net.Quic

Milestone:-

@runfoapprunfoappBot mentioned this pull request May 2, 2022
Closed
@rzikm

rzikm commented May 3, 2022

Copy link
Copy Markdown
MemberAuthor

Test failures seem to be all some permission errors, no actual test failures as far as I can see

@rzikm

rzikm commented May 3, 2022

Copy link
Copy Markdown
MemberAuthor

/azp run runtime

@azure-pipelines

azure-pipelinesBot commented May 3, 2022

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@rzikm
rzikm requested review from CarnaViire and ManickaPMay 3, 2022 13:50
CarnaViire
CarnaViire reviewed May 3, 2022
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/MsQuicStream.cs Outdated

@CarnaViireCarnaViireMay 3, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I haven't looked much into this yet, but it feels like it might be better to wait for #68288 to go in to be able to reuse stuff like MsQuicBuffers that was added there?

@rzikmrzikmMay 3, 2022•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

That PR does not use them for buffers inside MsQuicStream, and based on one of the comments it would be something for a follow-up PR. I probably don't mind much putting this on hold for a bit until that PR is merged, but that could take a while more.

Thoughts, @ManickaP?

@ManickaPManickaPMay 3, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Yes, please wait with this on my PR.

@rzikm

rzikm commented May 3, 2022

Copy link
Copy Markdown
MemberAuthor

Test failure is unrelated (System.Net.Primitives.UnitTests.Tests)

@rzikm
rzikm marked this pull request as draft May 3, 2022 16:47
@rzikm

rzikm commented May 3, 2022

Copy link
Copy Markdown
MemberAuthor

Putting this on hold until #68288 is in.

@rzikm
rzikm marked this pull request as ready for review May 5, 2022 12:55
@rzikm

rzikm commented May 5, 2022

Copy link
Copy Markdown
MemberAuthor

I reused the MsQuicBuffers struct @ManickaP added, but I think I still need to keep the adaptor structs, unless we are fine with replacing it with lambdas. I briefly tried managed function pointers, but they can't be used in non-unsafe context, and you can't await in unsafe context....

@rzikm
rzikm requested a review from CarnaViireMay 5, 2022 12:57
@rzikm

rzikm commented May 6, 2022

Copy link
Copy Markdown
MemberAuthor

Since #68288 got reverted in #68940, we need to put this PR on hold

@rzikm
rzikm marked this pull request as draft May 6, 2022 07:04
@rzikm
rzikmforce-pushed the 55818-sendasync-refactor branch from fcf5b8c to 491ce39CompareMay 12, 2022 13:53
@rzikm
rzikm marked this pull request as ready for review May 12, 2022 13:53
@rzikm

rzikm commented May 12, 2022

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-libraries-coreclr outerloop

@azure-pipelines

azure-pipelinesBot commented May 12, 2022

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@rzikm

rzikm commented May 13, 2022

Copy link
Copy Markdown
MemberAuthor

Test failures are unrelated:

  • System.Text.RegularExpressions.Tests.RegexIgnoreCaseTests.Unicode_IgnoreCase_Tests
  • LibraryImportGenerator.UnitTests.Compiles.ValidateSnippetsFallbackForwarder

ManickaP
ManickaP reviewed May 18, 2022
View reviewed changes

@ManickaPManickaP left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

In general looks good, thanks.

Comment thread...braries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/Internal/MsQuicBuffers.cs Outdated
Comment thread...braries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/Internal/MsQuicBuffers.cs Outdated
Comment thread...braries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/Internal/MsQuicBuffers.cs Outdated
Comment thread...braries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/Internal/MsQuicBuffers.cs
Comment thread...braries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/Internal/MsQuicBuffers.cs Outdated
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/MsQuicStream.cs Outdated
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/MsQuicStream.cs Outdated
@rzikmrzikm mentioned this pull request May 18, 2022
Closed
ManickaP
ManickaP approved these changes May 23, 2022
View reviewed changes

@ManickaPManickaP left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Looks good, thanks!

Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/MsQuicStream.cs Outdated
CarnaViire
CarnaViire approved these changes May 23, 2022
View reviewed changes

@CarnaViireCarnaViire left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM modulo nits, thanks!

Comment thread...braries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/Internal/MsQuicBuffers.cs Outdated
{
int count = buffers.Length;
Reserve(count);
_count = count;

@CarnaViireCarnaViireMay 23, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Nit: I believe it is already part of Reserve(count)

Suggested change
_count = count;

Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/MsQuicStream.cs

public State()
{
SendBuffers = new MsQuicBuffers();

@CarnaViireCarnaViireMay 23, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Any specific reason it should be in a constructor and not assigned on declaration as other fields?

@rzikmrzikmMay 23, 2022

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Putting = new MsQuicBuffers() in the field initializer triggers "Don't assign default values" or similar warning, and leaving it uninitialized breaks because the MsQuicBuffers._handles is null.

@rzikm
rzikm merged commit fff4ff0 into dotnet:mainMay 24, 2022
@ghostghost locked as resolved and limited conversation to collaborators Jun 23, 2022
@karelzkarelz added this to the 7.0.0 milestone Jul 19, 2022
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@CarnaViireCarnaViireCarnaViire approved these changes
@ManickaPManickaPManickaP approved these changes

Assignees

@rzikmrzikm

Labels

area-System.Net.Quic

Projects

None yet

Milestone

7.0.0

Development

Successfully merging this pull request may close these issues.

[QUIC] Merge several version of stream SendAsync

4 participants

@rzikm@CarnaViire@ManickaP@karelz