Skip to content

[release/7.0-staging] Fix AwaitableSocketAsyncEventArgs reorderings on weaker memory models #84641

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 1 commit into from
Apr 14, 2023
Merged

[release/7.0-staging] Fix AwaitableSocketAsyncEventArgs reorderings on weaker memory models #84641

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 11 additions & 11 deletions src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.Tasks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -934,7 +934,7 @@ internal sealed class AwaitableSocketAsyncEventArgs : SocketAsyncEventArgs, IVal
/// <see cref="s_completedSentinel"/> if it has completed. Another delegate if OnCompleted was called before the operation could complete,
/// in which case it's the delegate to invoke when the operation does complete.
/// </summary>
private Action<object?>? _continuation;
private volatile Action<object?>? _continuation;
private ExecutionContext? _executionContext;
private object? _scheduler;
/// <summary>Current token value given to a ValueTask and then verified against the value it passes back to us.</summary>
Expand Down Expand Up @@ -1007,7 +1007,7 @@ protected override void OnCompleted(SocketAsyncEventArgs _)
/// <returns>This instance.</returns>
public ValueTask<Socket> AcceptAsync(Socket socket, CancellationToken cancellationToken)
{
Debug.Assert(Volatile.Read(ref _continuation) == null, "Expected null continuation to indicate reserved for use");
Debug.Assert(_continuation == null, "Expected null continuation to indicate reserved for use");

if (socket.AcceptAsync(this, cancellationToken))
{
Expand All @@ -1031,7 +1031,7 @@ public ValueTask<Socket> AcceptAsync(Socket socket, CancellationToken cancellati
/// <returns>This instance.</returns>
public ValueTask<int> ReceiveAsync(Socket socket, CancellationToken cancellationToken)
{
Debug.Assert(Volatile.Read(ref _continuation) == null, "Expected null continuation to indicate reserved for use");
Debug.Assert(_continuation == null, "Expected null continuation to indicate reserved for use");

if (socket.ReceiveAsync(this, cancellationToken))
{
Expand All @@ -1051,7 +1051,7 @@ public ValueTask<int> ReceiveAsync(Socket socket, CancellationToken cancellation

public ValueTask<SocketReceiveFromResult> ReceiveFromAsync(Socket socket, CancellationToken cancellationToken)
{
Debug.Assert(Volatile.Read(ref _continuation) == null, "Expected null continuation to indicate reserved for use");
Debug.Assert(_continuation == null, "Expected null continuation to indicate reserved for use");

if (socket.ReceiveFromAsync(this, cancellationToken))
{
Expand All @@ -1072,7 +1072,7 @@ public ValueTask<SocketReceiveFromResult> ReceiveFromAsync(Socket socket, Cancel

public ValueTask<SocketReceiveMessageFromResult> ReceiveMessageFromAsync(Socket socket, CancellationToken cancellationToken)
{
Debug.Assert(Volatile.Read(ref _continuation) == null, "Expected null continuation to indicate reserved for use");
Debug.Assert(_continuation == null, "Expected null continuation to indicate reserved for use");

if (socket.ReceiveMessageFromAsync(this, cancellationToken))
{
Expand All @@ -1097,7 +1097,7 @@ public ValueTask<SocketReceiveMessageFromResult> ReceiveMessageFromAsync(Socket
/// <returns>This instance.</returns>
public ValueTask<int> SendAsync(Socket socket, CancellationToken cancellationToken)
{
Debug.Assert(Volatile.Read(ref _continuation) == null, "Expected null continuation to indicate reserved for use");
Debug.Assert(_continuation == null, "Expected null continuation to indicate reserved for use");

if (socket.SendAsync(this, cancellationToken))
{
Expand All @@ -1117,7 +1117,7 @@ public ValueTask<int> SendAsync(Socket socket, CancellationToken cancellationTok

public ValueTask SendAsyncForNetworkStream(Socket socket, CancellationToken cancellationToken)
{
Debug.Assert(Volatile.Read(ref _continuation) == null, "Expected null continuation to indicate reserved for use");
Debug.Assert(_continuation == null, "Expected null continuation to indicate reserved for use");

if (socket.SendAsync(this, cancellationToken))
{
Expand All @@ -1136,7 +1136,7 @@ public ValueTask SendAsyncForNetworkStream(Socket socket, CancellationToken canc

public ValueTask SendPacketsAsync(Socket socket, CancellationToken cancellationToken)
{
Debug.Assert(Volatile.Read(ref _continuation) == null, "Expected null continuation to indicate reserved for use");
Debug.Assert(_continuation == null, "Expected null continuation to indicate reserved for use");

if (socket.SendPacketsAsync(this, cancellationToken))
{
Expand All @@ -1155,7 +1155,7 @@ public ValueTask SendPacketsAsync(Socket socket, CancellationToken cancellationT

public ValueTask<int> SendToAsync(Socket socket, CancellationToken cancellationToken)
{
Debug.Assert(Volatile.Read(ref _continuation) == null, "Expected null continuation to indicate reserved for use");
Debug.Assert(_continuation == null, "Expected null continuation to indicate reserved for use");

if (socket.SendToAsync(this, cancellationToken))
{
Expand All @@ -1175,7 +1175,7 @@ public ValueTask<int> SendToAsync(Socket socket, CancellationToken cancellationT

public ValueTask ConnectAsync(Socket socket)
{
Debug.Assert(Volatile.Read(ref _continuation) == null, "Expected null continuation to indicate reserved for use");
Debug.Assert(_continuation == null, "Expected null continuation to indicate reserved for use");

try
{
Expand All @@ -1201,7 +1201,7 @@ public ValueTask ConnectAsync(Socket socket)

public ValueTask DisconnectAsync(Socket socket, CancellationToken cancellationToken)
{
Debug.Assert(Volatile.Read(ref _continuation) == null, $"Expected null continuation to indicate reserved for use");
Debug.Assert(_continuation == null, $"Expected null continuation to indicate reserved for use");

if (socket.DisconnectAsync(this, cancellationToken))
{
Expand Down