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

Jump to bottom

implement cancellation support for SendFileAsync and DisconnectAsync #53062

Merged
merged 3 commits into from
May 27, 2021
Merged

implement cancellation support for SendFileAsync and DisconnectAsync #53062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1497e95
implement cancellation support for SendFileAsync and DisconnectAsync,…
May 20, 2021
5229d22
Update src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket…
geoffkizer May 25, 2021
bfe062c
combine ProcessIOCPResultWithDeferredSingleBufferPinning and ProcessI…
May 25, 2021
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
8 changes: 5 additions & 3 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 @@ -1098,8 +1098,7 @@ public ValueTask SendPacketsAsync(Socket socket, CancellationToken cancellationT
{
Debug.Assert(Volatile.Read(ref _continuation) == null, "Expected null continuation to indicate reserved for use");

// TODO: Support cancellation by passing cancellationToken down through SendPacketsAsync, etc.
if (socket.SendPacketsAsync(this))
if (socket.SendPacketsAsync(this, cancellationToken))
{
_cancellationToken = cancellationToken;
return new ValueTask(this, _token);
Expand Down Expand Up @@ -1379,7 +1378,10 @@ SocketReceiveMessageFromResult IValueTaskSource<SocketReceiveMessageFromResult>.

private void ThrowException(SocketError error, CancellationToken cancellationToken)
{
if (error == SocketError.OperationAborted)
// Most operations will report OperationAborted when canceled.
// On Windows, SendFileAsync will report ConnectionAborted.
// There's a race here anyway, so there's no harm in also checking for ConnectionAborted in all cases.
if (error == SocketError.OperationAborted || error == SocketError.ConnectionAborted)
{
cancellationToken.ThrowIfCancellationRequested();
}
Expand Down
6 changes: 4 additions & 2 deletions src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3057,7 +3057,9 @@ private bool SendAsync(SocketAsyncEventArgs e, CancellationToken cancellationTok
return socketError == SocketError.IOPending;
}

public bool SendPacketsAsync(SocketAsyncEventArgs e)
public bool SendPacketsAsync(SocketAsyncEventArgs e) => SendPacketsAsync(e, default(CancellationToken));

private bool SendPacketsAsync(SocketAsyncEventArgs e, CancellationToken cancellationToken)
{
ThrowIfDisposed();

Expand All @@ -3079,7 +3081,7 @@ public bool SendPacketsAsync(SocketAsyncEventArgs e)
SocketError socketError;
try
{
socketError = e.DoOperationSendPackets(this, _handle);
socketError = e.DoOperationSendPackets(this, _handle, cancellationToken);
}
catch (Exception)
{
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncContext.Unix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2100,7 +2100,7 @@ public SocketError SendFile(SafeFileHandle fileHandle, long offset, long count,
return operation.ErrorCode;
}

public SocketError SendFileAsync(SafeFileHandle fileHandle, long offset, long count, out long bytesSent, Action<long, SocketError> callback)
public SocketError SendFileAsync(SafeFileHandle fileHandle, long offset, long count, out long bytesSent, Action<long, SocketError> callback, CancellationToken cancellationToken = default)
{
SetHandleNonBlocking();

Expand All @@ -2122,7 +2122,7 @@ public SocketError SendFileAsync(SafeFileHandle fileHandle, long offset, long co
BytesTransferred = bytesSent
};

if (!_sendQueue.StartAsyncOperation(this, operation, observedSequenceNumber))
if (!_sendQueue.StartAsyncOperation(this, operation, observedSequenceNumber, cancellationToken))
{
bytesSent = operation.BytesTransferred;
return operation.ErrorCode;
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.Unix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ internal unsafe SocketError DoOperationSend(SafeSocketHandle handle, Cancellatio
return errorCode;
}

internal SocketError DoOperationSendPackets(Socket socket, SafeSocketHandle handle)
internal SocketError DoOperationSendPackets(Socket socket, SafeSocketHandle handle, CancellationToken cancellationToken)
{
Debug.Assert(_sendPacketsElements != null);
SendPacketsElement[] elements = (SendPacketsElement[])_sendPacketsElements.Clone();
Expand Down Expand Up @@ -288,7 +288,7 @@ internal SocketError DoOperationSendPackets(Socket socket, SafeSocketHandle hand
throw;
}

SocketPal.SendPacketsAsync(socket, SendPacketsFlags, elements, files, (bytesTransferred, error) =>
SocketPal.SendPacketsAsync(socket, SendPacketsFlags, elements, files, cancellationToken, (bytesTransferred, error) =>
{
if (error == SocketError.Success)
{
Expand Down
Loading