add Task-based DisconnectAsync and refactor APM methods on top of it#51213

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
geoffkizer merged 3 commits into from
Apr 18, 2021
Merged

add Task-based DisconnectAsync and refactor APM methods on top of it #51213

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
fc9aedd
add Task-based DisconnectAsync and refactor APM methods on top of it
Jan 13, 2021
3eada45
fix BeginDisconnect to throw synchronously and add relevant tests
Apr 18, 2021
bf518ec
remove #region stuff in Socket.cs and add link to github issue
Apr 18, 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
1 change: 1 addition & 0 deletions src/libraries/System.Net.Sockets/ref/System.Net.Sockets.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -338,6 +338,7 @@ public void Connect(string host, int port) { }
public static bool ConnectAsync(System.Net.Sockets.SocketType socketType, System.Net.Sockets.ProtocolType protocolType, System.Net.Sockets.SocketAsyncEventArgs e) { throw null; }
public void Disconnect(bool reuseSocket) { }
public bool DisconnectAsync(System.Net.Sockets.SocketAsyncEventArgs e) { throw null; }
public System.Threading.Tasks.ValueTask DisconnectAsync(bool reuseSocket, System.Threading.CancellationToken cancellationToken = default) { throw null; }
public void Dispose() { }
protected virtual void Dispose(bool disposing) { }
[System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")]
Expand Down
2 changes: 0 additions & 2 deletions src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,6 @@
<Compile Include="System\Net\Sockets\UdpReceiveResult.cs" />
<Compile Include="System\Net\Sockets\AcceptOverlappedAsyncResult.cs" />
<Compile Include="System\Net\Sockets\BaseOverlappedAsyncResult.cs" />
<Compile Include="System\Net\Sockets\DisconnectOverlappedAsyncResult.cs" />
<Compile Include="System\Net\Sockets\UnixDomainSocketEndPoint.cs" />
<!-- Logging -->
<Compile Include="$(CommonPath)System\Net\Logging\NetEventSource.Common.cs"
Expand DownExpand Up@@ -187,7 +186,6 @@
<ItemGroup Condition="'$(TargetsUnix)' == 'true'">
<Compile Include="System\Net\Sockets\AcceptOverlappedAsyncResult.Unix.cs" />
<Compile Include="System\Net\Sockets\BaseOverlappedAsyncResult.Unix.cs" />
<Compile Include="System\Net\Sockets\DisconnectOverlappedAsyncResult.Unix.cs" />
<Compile Include="System\Net\Sockets\SafeSocketHandle.Unix.cs" />
<Compile Include="System\Net\Sockets\Socket.Unix.cs" />
<Compile Include="System\Net\Sockets\SocketAsyncContext.Unix.cs" />
Expand Down
11 changes: 0 additions & 11 deletions ...braries/System.Net.Sockets/src/System/Net/Sockets/DisconnectOverlappedAsyncResult.Unix.cs
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions src/libraries/System.Net.Sockets/src/System/Net/Sockets/DisconnectOverlappedAsyncResult.cs
View file
Open in desktop

This file was deleted.

42 changes: 42 additions & 0 deletions src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.Tasks.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -263,6 +263,29 @@ public ValueTask ConnectAsync(string host, int port, CancellationToken cancellat
return ConnectAsync(ep, cancellationToken);
}

/// <summary>
/// Disconnects a connected socket from the remote host.
/// </summary>
/// <param name="reuseSocket">Indicates whether the socket should be available for reuse after disconnect.</param>
/// <param name="cancellationToken">A cancellation token that can be used to cancel the asynchronous operation.</param>
/// <returns>An asynchronous task that completes when the socket is disconnected.</returns>
public ValueTask DisconnectAsync(bool reuseSocket, CancellationToken cancellationToken = default)
{
if (cancellationToken.IsCancellationRequested)
{
return ValueTask.FromCanceled(cancellationToken);
}

AwaitableSocketAsyncEventArgs saea =
Interlocked.Exchange(ref _singleBufferSendEventArgs, null) ??
new AwaitableSocketAsyncEventArgs(this, isReceiveForCaching: false);

saea.DisconnectReuseSocket = reuseSocket;
saea.WrapExceptionsForNetworkStream = false;

return saea.DisconnectAsync(this, cancellationToken);
}

/// <summary>
/// Receives data from a connected socket.
/// </summary>
Expand DownExpand Up@@ -1028,6 +1051,25 @@ public ValueTask ConnectAsync(Socket socket)
ValueTask.FromException(CreateException(error));
}

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

if (socket.DisconnectAsync(this, cancellationToken))
{
_cancellationToken = cancellationToken;
return new ValueTask(this, _token);
}

SocketError error = SocketError;

Release();

return error == SocketError.Success ?
ValueTask.CompletedTask :
ValueTask.FromException(CreateException(error));
}

/// <summary>Gets the status of the operation.</summary>
public ValueTaskSourceStatus GetStatus(short token)
{
Expand Down
119 changes: 36 additions & 83 deletions src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,6 @@ private sealed class CacheSet
private int _closeTimeout = Socket.DefaultCloseTimeout;
private int _disposed; // 0 == false, anything else == true

#region Constructors
public Socket(SocketType socketType, ProtocolType protocolType)
: this(OSSupportsIPv6 ? AddressFamily.InterNetworkV6 : AddressFamily.InterNetwork, socketType, protocolType)
{
Expand DownExpand Up@@ -242,9 +241,10 @@ private static SafeSocketHandle ValidateHandle(SafeSocketHandle handle) =>
handle is null ? throw new ArgumentNullException(nameof(handle)) :
handle.IsInvalid ? throw new ArgumentException(SR.Arg_InvalidHandle, nameof(handle)) :
handle;
#endregion

#region Properties
//
// Properties
//

// The CLR allows configuration of these properties, separately from whether the OS supports IPv4/6. We
// do not provide these config options, so SupportsIPvX === OSSupportsIPvX.
Expand DownExpand Up@@ -761,9 +761,10 @@ internal bool CanTryAddressFamily(AddressFamily family)
{
return (family == _addressFamily) || (family == AddressFamily.InterNetwork && IsDualMode);
}
#endregion

#region Public Methods
//
// Public Methods
//

// Associates a socket with an end point.
public void Bind(EndPoint localEP)
Expand DownExpand Up@@ -2116,43 +2117,14 @@ public IAsyncResult BeginConnect(IPAddress address, int port, AsyncCallback? req
public IAsyncResult BeginConnect(IPAddress[] addresses, int port, AsyncCallback? requestCallback, object? state) =>
TaskToApm.Begin(ConnectAsync(addresses, port), requestCallback, state);

public IAsyncResult BeginDisconnect(bool reuseSocket, AsyncCallback? callback, object? state)
public void EndConnect(IAsyncResult asyncResult)
{
ThrowIfDisposed();

// Start context-flowing op. No need to lock - we don't use the context till the callback.
DisconnectOverlappedAsyncResult asyncResult = new DisconnectOverlappedAsyncResult(this, state, callback);
asyncResult.StartPostingAsyncOp(false);

// Post the disconnect.
DoBeginDisconnect(reuseSocket, asyncResult);

// Finish flowing (or call the callback), and return.
asyncResult.FinishPostingAsyncOp();
return asyncResult;
TaskToApm.End(asyncResult);
}

private void DoBeginDisconnect(bool reuseSocket, DisconnectOverlappedAsyncResult asyncResult)
{
SocketError errorCode = SocketError.Success;

errorCode = SocketPal.DisconnectAsync(this, _handle, reuseSocket, asyncResult);

if (errorCode == SocketError.Success)
{
SetToDisconnected();
_remoteEndPoint = null;
_localEndPoint = null;
}

if (NetEventSource.Log.IsEnabled()) NetEventSource.Info(this, $"UnsafeNclNativeMethods.OSSOCK.DisConnectEx returns:{errorCode}");

// If the call failed, update our status and throw
if (!CheckErrorAndUpdateStatus(errorCode))
{
throw new SocketException((int)errorCode);
}
}
public IAsyncResult BeginDisconnect(bool reuseSocket, AsyncCallback? callback, object? state) =>
TaskToApmBeginWithSyncExceptions(DisconnectAsync(reuseSocket).AsTask(), callback, state);

public void Disconnect(bool reuseSocket)
{
Expand All@@ -2175,47 +2147,12 @@ public void Disconnect(bool reuseSocket)
_localEndPoint = null;
}

public void EndConnect(IAsyncResult asyncResult)
public void EndDisconnect(IAsyncResult asyncResult)
{
ThrowIfDisposed();
TaskToApm.End(asyncResult);
}

public void EndDisconnect(IAsyncResult asyncResult)
{
ThrowIfDisposed();

if (asyncResult == null)
{
throw new ArgumentNullException(nameof(asyncResult));
}

//get async result and check for errors
LazyAsyncResult? castedAsyncResult = asyncResult as LazyAsyncResult;
if (castedAsyncResult == null || castedAsyncResult.AsyncObject != this)
{
throw new ArgumentException(SR.net_io_invalidasyncresult, nameof(asyncResult));
}
if (castedAsyncResult.EndCalled)
{
throw new InvalidOperationException(SR.Format(SR.net_io_invalidendcall, nameof(EndDisconnect)));
}

//wait for completion if it hasn't occurred
castedAsyncResult.InternalWaitForCompletion();
castedAsyncResult.EndCalled = true;

if (NetEventSource.Log.IsEnabled()) NetEventSource.Info(this);

//
// if the asynchronous native call failed asynchronously
// we'll throw a SocketException
//
if ((SocketError)castedAsyncResult.ErrorCode != SocketError.Success)
{
UpdateStatusAfterSocketErrorAndThrowException((SocketError)castedAsyncResult.ErrorCode);
}
}

public IAsyncResult BeginSend(byte[] buffer, int offset, int size, SocketFlags socketFlags, AsyncCallback? callback, object? state)
{
Expand DownExpand Up@@ -2668,7 +2605,10 @@ public void Shutdown(SocketShutdown how)
InternalSetBlocking(_willBlockInternal);
}

#region Async methods
//
// Async methods
//

public bool AcceptAsync(SocketAsyncEventArgs e)
{
ThrowIfDisposed();
Expand DownExpand Up@@ -2889,7 +2829,9 @@ public static void CancelConnectAsync(SocketAsyncEventArgs e)
e.CancelConnectAsync();
}

public bool DisconnectAsync(SocketAsyncEventArgs e)
public bool DisconnectAsync(SocketAsyncEventArgs e) => DisconnectAsync(e, default);

private bool DisconnectAsync(SocketAsyncEventArgs e, CancellationToken cancellationToken)
{
// Throw if socket disposed
ThrowIfDisposed();
Expand All@@ -2904,7 +2846,7 @@ public bool DisconnectAsync(SocketAsyncEventArgs e)
SocketError socketError = SocketError.Success;
try
{
socketError = e.DoOperationDisconnect(this, _handle);
socketError = e.DoOperationDisconnect(this, _handle, cancellationToken);
}
catch
{
Expand DownExpand Up@@ -3155,10 +3097,10 @@ private bool SendToAsync(SocketAsyncEventArgs e, CancellationToken cancellationT

return socketError == SocketError.IOPending;
}
#endregion
#endregion

#region Internal and private properties
//
// Internal and private properties
//

private CacheSet Caches
{
Expand All@@ -3174,9 +3116,10 @@ private CacheSet Caches
}

internal bool Disposed => _disposed != 0;
#endregion

#region Internal and private methods
//
// Internal and private methods
//

internal static void GetIPProtocolInformation(AddressFamily addressFamily, Internals.SocketAddress socketAddress, out bool isIPv4, out bool isIPv6)
{
Expand DownExpand Up@@ -3889,6 +3832,16 @@ private static SocketError GetSocketErrorFromFaultedTask(Task t)
};
}

#endregion
// Helper to maintain existing behavior of Socket APM methods to throw synchronously from Begin*.
private static IAsyncResult TaskToApmBeginWithSyncExceptions(Task task, AsyncCallback? callback, object? state)
{
if (task.IsFaulted)
{
task.GetAwaiter().GetResult();
Debug.Fail("Task faulted but GetResult did not throw???");
}

return TaskToApm.Begin(task, callback, state);
}
}
}
2 changes: 1 addition & 1 deletion src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.Unix.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ internal unsafe SocketError DoOperationConnect(Socket socket, SafeSocketHandle h
return socketError;
}

internal SocketError DoOperationDisconnect(Socket socket, SafeSocketHandle handle)
internal SocketError DoOperationDisconnect(Socket socket, SafeSocketHandle handle, CancellationToken cancellationToken)
{
SocketError socketError = SocketPal.Disconnect(socket, handle, _disconnectReuseSocket);
FinishOperationSync(socketError, 0, SocketFlags.None);
Expand Down
10 changes: 9 additions & 1 deletion src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.Windows.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -364,8 +364,11 @@ internal unsafe SocketError DoOperationConnectEx(Socket socket, SafeSocketHandle
}
}

internal unsafe SocketError DoOperationDisconnect(Socket socket, SafeSocketHandle handle)
internal unsafe SocketError DoOperationDisconnect(Socket socket, SafeSocketHandle handle, CancellationToken cancellationToken)
{
// Note: CancellationToken is ignored for now.
Comment thread
geoffkizer marked this conversation as resolved.
// See https://github.com/dotnet/runtime/issues/51452

NativeOverlapped* overlapped = AllocateNativeOverlapped();
try
{
Expand DownExpand Up@@ -1188,6 +1191,7 @@ private unsafe SocketError FinishOperationConnect()
private void CompleteCore()
{
_strongThisRef.Value = null; // null out this reference from the overlapped so this isn't kept alive artificially

if (_singleBufferHandleState != SingleBufferHandleState.None)
{
// If the state isn't None, then either it's Set, in which case there's state to cleanup,
Expand All@@ -1213,6 +1217,8 @@ void CompleteCoreSpin()
sw.SpinOnce();
}

Debug.Assert(_singleBufferHandleState == SingleBufferHandleState.Set);

// Remove any cancellation registration. First dispose the registration
// to ensure that cancellation will either never fine or will have completed
// firing before we continue. Only then can we safely null out the overlapped.
Expand All@@ -1223,6 +1229,8 @@ void CompleteCoreSpin()
}

// Release any GC handles.
Debug.Assert(_singleBufferHandleState == SingleBufferHandleState.Set);

if (_singleBufferHandleState == SingleBufferHandleState.Set)
{
_singleBufferHandleState = SingleBufferHandleState.None;
Expand Down
7 changes: 0 additions & 7 deletions src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketPal.Unix.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1976,13 +1976,6 @@ public static SocketError AcceptAsync(Socket socket, SafeSocketHandle handle, Sa
return socketError;
}

internal static SocketError DisconnectAsync(Socket socket, SafeSocketHandle handle, bool reuseSocket, DisconnectOverlappedAsyncResult asyncResult)
{
SocketError socketError = Disconnect(socket, handle, reuseSocket);
asyncResult.PostCompletion(socketError);
return socketError;
}

internal static SocketError Disconnect(Socket socket, SafeSocketHandle handle, bool reuseSocket)
{
handle.SetToDisconnected();
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
add Task-based DisconnectAsync and refactor APM methods on top of it#51213

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

geoffkizer
merged 3 commits into

from

Apr 18, 2021
 Merged


add Task-based DisconnectAsync and refactor APM methods on top of it
#51213
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
fc9aedd

add Task-based DisconnectAsync and refactor APM methods on top of it

Jan 13, 2021
3eada45

fix BeginDisconnect to throw synchronously and add relevant tests

Apr 18, 2021
bf518ec

remove #region stuff in Socket.cs and add link to github issue

Apr 18, 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


1 change: 1 addition & 0 deletions
src/libraries/System.Net.Sockets/ref/System.Net.Sockets.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -338,6 +338,7 @@ public void Connect(string host, int port) { }
 public static bool ConnectAsync(System.Net.Sockets.SocketType socketType, System.Net.Sockets.ProtocolType protocolType, System.Net.Sockets.SocketAsyncEventArgs e) { throw null; }
 public void Disconnect(bool reuseSocket) { }
 public bool DisconnectAsync(System.Net.Sockets.SocketAsyncEventArgs e) { throw null; }
 public System.Threading.Tasks.ValueTask DisconnectAsync(bool reuseSocket, System.Threading.CancellationToken cancellationToken = default) { throw null; }
 public void Dispose() { }
 protected virtual void Dispose(bool disposing) { }
 [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")]
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,6 @@
 <Compile Include="System\Net\Sockets\UdpReceiveResult.cs" />
 <Compile Include="System\Net\Sockets\AcceptOverlappedAsyncResult.cs" />
 <Compile Include="System\Net\Sockets\BaseOverlappedAsyncResult.cs" />
 <Compile Include="System\Net\Sockets\DisconnectOverlappedAsyncResult.cs" />
 <Compile Include="System\Net\Sockets\UnixDomainSocketEndPoint.cs" />
 <!-- Logging -->
 <Compile Include="$(CommonPath)System\Net\Logging\NetEventSource.Common.cs"
Expand DownExpand Up@@ -187,7 +186,6 @@
 <ItemGroup Condition="'$(TargetsUnix)' == 'true'">
 <Compile Include="System\Net\Sockets\AcceptOverlappedAsyncResult.Unix.cs" />
 <Compile Include="System\Net\Sockets\BaseOverlappedAsyncResult.Unix.cs" />
 <Compile Include="System\Net\Sockets\DisconnectOverlappedAsyncResult.Unix.cs" />
 <Compile Include="System\Net\Sockets\SafeSocketHandle.Unix.cs" />
 <Compile Include="System\Net\Sockets\Socket.Unix.cs" />
 <Compile Include="System\Net\Sockets\SocketAsyncContext.Unix.cs" />
Expand Down

11 changes: 0 additions & 11 deletions
...braries/System.Net.Sockets/src/System/Net/Sockets/DisconnectOverlappedAsyncResult.Unix.cs

View file


Open in desktop


This file was deleted.


27 changes: 0 additions & 27 deletions
src/libraries/System.Net.Sockets/src/System/Net/Sockets/DisconnectOverlappedAsyncResult.cs

View file


Open in desktop


This file was deleted.


42 changes: 42 additions & 0 deletions
src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.Tasks.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -263,6 +263,29 @@ public ValueTask ConnectAsync(string host, int port, CancellationToken cancellat
 return ConnectAsync(ep, cancellationToken);
 }

 /// <summary>
 /// Disconnects a connected socket from the remote host.
 /// </summary>
 /// <param name="reuseSocket">Indicates whether the socket should be available for reuse after disconnect.</param>
 /// <param name="cancellationToken">A cancellation token that can be used to cancel the asynchronous operation.</param>
 /// <returns>An asynchronous task that completes when the socket is disconnected.</returns>
 public ValueTask DisconnectAsync(bool reuseSocket, CancellationToken cancellationToken = default)
 {
 if (cancellationToken.IsCancellationRequested)
 {
 return ValueTask.FromCanceled(cancellationToken);
 }

 AwaitableSocketAsyncEventArgs saea =
 Interlocked.Exchange(ref _singleBufferSendEventArgs, null) ??
 new AwaitableSocketAsyncEventArgs(this, isReceiveForCaching: false);

 saea.DisconnectReuseSocket = reuseSocket;
 saea.WrapExceptionsForNetworkStream = false;

 return saea.DisconnectAsync(this, cancellationToken);
 }

 /// <summary>
 /// Receives data from a connected socket.
 /// </summary>
Expand DownExpand Up@@ -1028,6 +1051,25 @@ public ValueTask ConnectAsync(Socket socket)
 ValueTask.FromException(CreateException(error));
 }

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

 if (socket.DisconnectAsync(this, cancellationToken))
 {
 _cancellationToken = cancellationToken;
 return new ValueTask(this, _token);
 }

 SocketError error = SocketError;

 Release();

 return error == SocketError.Success ?
 ValueTask.CompletedTask :
 ValueTask.FromException(CreateException(error));
 }

 /// <summary>Gets the status of the operation.</summary>
 public ValueTaskSourceStatus GetStatus(short token)
 {
Expand Down

119 changes: 36 additions & 83 deletions
src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,6 @@ private sealed class CacheSet
 private int _closeTimeout = Socket.DefaultCloseTimeout;
 private int _disposed; // 0 == false, anything else == true

 #region Constructors
 public Socket(SocketType socketType, ProtocolType protocolType)
 : this(OSSupportsIPv6 ? AddressFamily.InterNetworkV6 : AddressFamily.InterNetwork, socketType, protocolType)
 {
Expand DownExpand Up@@ -242,9 +241,10 @@ private static SafeSocketHandle ValidateHandle(SafeSocketHandle handle) =>
 handle is null ? throw new ArgumentNullException(nameof(handle)) :
 handle.IsInvalid ? throw new ArgumentException(SR.Arg_InvalidHandle, nameof(handle)) :
 handle;
 #endregion

 #region Properties
 //
 // Properties
 //

 // The CLR allows configuration of these properties, separately from whether the OS supports IPv4/6. We
 // do not provide these config options, so SupportsIPvX === OSSupportsIPvX.
Expand DownExpand Up@@ -761,9 +761,10 @@ internal bool CanTryAddressFamily(AddressFamily family)
 {
 return (family == _addressFamily) || (family == AddressFamily.InterNetwork && IsDualMode);
 }
 #endregion

 #region Public Methods
 //
 // Public Methods
 //

 // Associates a socket with an end point.
 public void Bind(EndPoint localEP)
Expand DownExpand Up@@ -2116,43 +2117,14 @@ public IAsyncResult BeginConnect(IPAddress address, int port, AsyncCallback? req
 public IAsyncResult BeginConnect(IPAddress[] addresses, int port, AsyncCallback? requestCallback, object? state) =>
 TaskToApm.Begin(ConnectAsync(addresses, port), requestCallback, state);

 public IAsyncResult BeginDisconnect(bool reuseSocket, AsyncCallback? callback, object? state)
 public void EndConnect(IAsyncResult asyncResult)
 {
 ThrowIfDisposed();

 // Start context-flowing op. No need to lock - we don't use the context till the callback.
 DisconnectOverlappedAsyncResult asyncResult = new DisconnectOverlappedAsyncResult(this, state, callback);
 asyncResult.StartPostingAsyncOp(false);

 // Post the disconnect.
 DoBeginDisconnect(reuseSocket, asyncResult);

 // Finish flowing (or call the callback), and return.
 asyncResult.FinishPostingAsyncOp();
 return asyncResult;
 TaskToApm.End(asyncResult);
 }

 private void DoBeginDisconnect(bool reuseSocket, DisconnectOverlappedAsyncResult asyncResult)
 {
 SocketError errorCode = SocketError.Success;

 errorCode = SocketPal.DisconnectAsync(this, _handle, reuseSocket, asyncResult);

 if (errorCode == SocketError.Success)
 {
 SetToDisconnected();
 _remoteEndPoint = null;
 _localEndPoint = null;
 }

 if (NetEventSource.Log.IsEnabled()) NetEventSource.Info(this, $"UnsafeNclNativeMethods.OSSOCK.DisConnectEx returns:{errorCode}");

 // If the call failed, update our status and throw
 if (!CheckErrorAndUpdateStatus(errorCode))
 {
 throw new SocketException((int)errorCode);
 }
 }
 public IAsyncResult BeginDisconnect(bool reuseSocket, AsyncCallback? callback, object? state) =>
 TaskToApmBeginWithSyncExceptions(DisconnectAsync(reuseSocket).AsTask(), callback, state);

 public void Disconnect(bool reuseSocket)
 {
Expand All@@ -2175,47 +2147,12 @@ public void Disconnect(bool reuseSocket)
 _localEndPoint = null;
 }

 public void EndConnect(IAsyncResult asyncResult)
 public void EndDisconnect(IAsyncResult asyncResult)
 {
 ThrowIfDisposed();
 TaskToApm.End(asyncResult);
 }

 public void EndDisconnect(IAsyncResult asyncResult)
 {
 ThrowIfDisposed();

 if (asyncResult == null)
 {
 throw new ArgumentNullException(nameof(asyncResult));
 }

 //get async result and check for errors
 LazyAsyncResult? castedAsyncResult = asyncResult as LazyAsyncResult;
 if (castedAsyncResult == null || castedAsyncResult.AsyncObject != this)
 {
 throw new ArgumentException(SR.net_io_invalidasyncresult, nameof(asyncResult));
 }
 if (castedAsyncResult.EndCalled)
 {
 throw new InvalidOperationException(SR.Format(SR.net_io_invalidendcall, nameof(EndDisconnect)));
 }

 //wait for completion if it hasn't occurred
 castedAsyncResult.InternalWaitForCompletion();
 castedAsyncResult.EndCalled = true;

 if (NetEventSource.Log.IsEnabled()) NetEventSource.Info(this);

 //
 // if the asynchronous native call failed asynchronously
 // we'll throw a SocketException
 //
 if ((SocketError)castedAsyncResult.ErrorCode != SocketError.Success)
 {
 UpdateStatusAfterSocketErrorAndThrowException((SocketError)castedAsyncResult.ErrorCode);
 }
 }

 public IAsyncResult BeginSend(byte[] buffer, int offset, int size, SocketFlags socketFlags, AsyncCallback? callback, object? state)
 {
Expand DownExpand Up@@ -2668,7 +2605,10 @@ public void Shutdown(SocketShutdown how)
 InternalSetBlocking(_willBlockInternal);
 }

 #region Async methods
 //
 // Async methods
 //

 public bool AcceptAsync(SocketAsyncEventArgs e)
 {
 ThrowIfDisposed();
Expand DownExpand Up@@ -2889,7 +2829,9 @@ public static void CancelConnectAsync(SocketAsyncEventArgs e)
 e.CancelConnectAsync();
 }

 public bool DisconnectAsync(SocketAsyncEventArgs e)
 public bool DisconnectAsync(SocketAsyncEventArgs e) => DisconnectAsync(e, default);

 private bool DisconnectAsync(SocketAsyncEventArgs e, CancellationToken cancellationToken)
 {
 // Throw if socket disposed
 ThrowIfDisposed();
Expand All@@ -2904,7 +2846,7 @@ public bool DisconnectAsync(SocketAsyncEventArgs e)
 SocketError socketError = SocketError.Success;
 try
 {
 socketError = e.DoOperationDisconnect(this, _handle);
 socketError = e.DoOperationDisconnect(this, _handle, cancellationToken);
 }
 catch
 {
Expand DownExpand Up@@ -3155,10 +3097,10 @@ private bool SendToAsync(SocketAsyncEventArgs e, CancellationToken cancellationT

 return socketError == SocketError.IOPending;
 }
 #endregion
 #endregion

 #region Internal and private properties
 //
 // Internal and private properties
 //

 private CacheSet Caches
 {
Expand All@@ -3174,9 +3116,10 @@ private CacheSet Caches
 }

 internal bool Disposed => _disposed != 0;
 #endregion

 #region Internal and private methods
 //
 // Internal and private methods
 //

 internal static void GetIPProtocolInformation(AddressFamily addressFamily, Internals.SocketAddress socketAddress, out bool isIPv4, out bool isIPv6)
 {
Expand DownExpand Up@@ -3889,6 +3832,16 @@ private static SocketError GetSocketErrorFromFaultedTask(Task t)
 };
 }

 #endregion
 // Helper to maintain existing behavior of Socket APM methods to throw synchronously from Begin*.
 private static IAsyncResult TaskToApmBeginWithSyncExceptions(Task task, AsyncCallback? callback, object? state)
 {
 if (task.IsFaulted)
 {
 task.GetAwaiter().GetResult();
 Debug.Fail("Task faulted but GetResult did not throw???");
 }

 return TaskToApm.Begin(task, callback, state);
 }
 }
}

2 changes: 1 addition & 1 deletion
src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ internal unsafe SocketError DoOperationConnect(Socket socket, SafeSocketHandle h
 return socketError;
 }

 internal SocketError DoOperationDisconnect(Socket socket, SafeSocketHandle handle)
 internal SocketError DoOperationDisconnect(Socket socket, SafeSocketHandle handle, CancellationToken cancellationToken)
 {
 SocketError socketError = SocketPal.Disconnect(socket, handle, _disconnectReuseSocket);
 FinishOperationSync(socketError, 0, SocketFlags.None);
Expand Down

10 changes: 9 additions & 1 deletion
src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -364,8 +364,11 @@ internal unsafe SocketError DoOperationConnectEx(Socket socket, SafeSocketHandle
 }
 }

 internal unsafe SocketError DoOperationDisconnect(Socket socket, SafeSocketHandle handle)
 internal unsafe SocketError DoOperationDisconnect(Socket socket, SafeSocketHandle handle, CancellationToken cancellationToken)
 {
 // Note: CancellationToken is ignored for now.
Comment thread
geoffkizer marked this conversation as resolved.

 // See https://github.com/dotnet/runtime/issues/51452

 NativeOverlapped* overlapped = AllocateNativeOverlapped();
 try
 {
Expand DownExpand Up@@ -1188,6 +1191,7 @@ private unsafe SocketError FinishOperationConnect()
 private void CompleteCore()
 {
 _strongThisRef.Value = null; // null out this reference from the overlapped so this isn't kept alive artificially

 if (_singleBufferHandleState != SingleBufferHandleState.None)
 {
 // If the state isn't None, then either it's Set, in which case there's state to cleanup,
Expand All@@ -1213,6 +1217,8 @@ void CompleteCoreSpin()
 sw.SpinOnce();
 }

 Debug.Assert(_singleBufferHandleState == SingleBufferHandleState.Set);

 // Remove any cancellation registration. First dispose the registration
 // to ensure that cancellation will either never fine or will have completed
 // firing before we continue. Only then can we safely null out the overlapped.
Expand All@@ -1223,6 +1229,8 @@ void CompleteCoreSpin()
 }

 // Release any GC handles.
 Debug.Assert(_singleBufferHandleState == SingleBufferHandleState.Set);

 if (_singleBufferHandleState == SingleBufferHandleState.Set)
 {
 _singleBufferHandleState = SingleBufferHandleState.None;
Expand Down

7 changes: 0 additions & 7 deletions
src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketPal.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1976,13 +1976,6 @@ public static SocketError AcceptAsync(Socket socket, SafeSocketHandle handle, Sa
 return socketError;
 }

 internal static SocketError DisconnectAsync(Socket socket, SafeSocketHandle handle, bool reuseSocket, DisconnectOverlappedAsyncResult asyncResult)
 {
 SocketError socketError = Disconnect(socket, handle, reuseSocket);
 asyncResult.PostCompletion(socketError);
 return socketError;
 }

 internal static SocketError Disconnect(Socket socket, SafeSocketHandle handle, bool reuseSocket)
 {
 handle.SetToDisconnected();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
add Task-based DisconnectAsync and refactor APM methods on top of it#51213

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

geoffkizer
merged 3 commits into

from

Apr 18, 2021
 Merged


add Task-based DisconnectAsync and refactor APM methods on top of it
#51213
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
fc9aedd

add Task-based DisconnectAsync and refactor APM methods on top of it

Jan 13, 2021
3eada45

fix BeginDisconnect to throw synchronously and add relevant tests

Apr 18, 2021
bf518ec

remove #region stuff in Socket.cs and add link to github issue

Apr 18, 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


1 change: 1 addition & 0 deletions
src/libraries/System.Net.Sockets/ref/System.Net.Sockets.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -338,6 +338,7 @@ public void Connect(string host, int port) { }
 public static bool ConnectAsync(System.Net.Sockets.SocketType socketType, System.Net.Sockets.ProtocolType protocolType, System.Net.Sockets.SocketAsyncEventArgs e) { throw null; }
 public void Disconnect(bool reuseSocket) { }
 public bool DisconnectAsync(System.Net.Sockets.SocketAsyncEventArgs e) { throw null; }
 public System.Threading.Tasks.ValueTask DisconnectAsync(bool reuseSocket, System.Threading.CancellationToken cancellationToken = default) { throw null; }
 public void Dispose() { }
 protected virtual void Dispose(bool disposing) { }
 [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")]
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,6 @@
 <Compile Include="System\Net\Sockets\UdpReceiveResult.cs" />
 <Compile Include="System\Net\Sockets\AcceptOverlappedAsyncResult.cs" />
 <Compile Include="System\Net\Sockets\BaseOverlappedAsyncResult.cs" />
 <Compile Include="System\Net\Sockets\DisconnectOverlappedAsyncResult.cs" />
 <Compile Include="System\Net\Sockets\UnixDomainSocketEndPoint.cs" />
 <!-- Logging -->
 <Compile Include="$(CommonPath)System\Net\Logging\NetEventSource.Common.cs"
Expand DownExpand Up@@ -187,7 +186,6 @@
 <ItemGroup Condition="'$(TargetsUnix)' == 'true'">
 <Compile Include="System\Net\Sockets\AcceptOverlappedAsyncResult.Unix.cs" />
 <Compile Include="System\Net\Sockets\BaseOverlappedAsyncResult.Unix.cs" />
 <Compile Include="System\Net\Sockets\DisconnectOverlappedAsyncResult.Unix.cs" />
 <Compile Include="System\Net\Sockets\SafeSocketHandle.Unix.cs" />
 <Compile Include="System\Net\Sockets\Socket.Unix.cs" />
 <Compile Include="System\Net\Sockets\SocketAsyncContext.Unix.cs" />
Expand Down

11 changes: 0 additions & 11 deletions
...braries/System.Net.Sockets/src/System/Net/Sockets/DisconnectOverlappedAsyncResult.Unix.cs

View file


Open in desktop


This file was deleted.


27 changes: 0 additions & 27 deletions
src/libraries/System.Net.Sockets/src/System/Net/Sockets/DisconnectOverlappedAsyncResult.cs

View file


Open in desktop


This file was deleted.


42 changes: 42 additions & 0 deletions
src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.Tasks.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -263,6 +263,29 @@ public ValueTask ConnectAsync(string host, int port, CancellationToken cancellat
 return ConnectAsync(ep, cancellationToken);
 }

 /// <summary>
 /// Disconnects a connected socket from the remote host.
 /// </summary>
 /// <param name="reuseSocket">Indicates whether the socket should be available for reuse after disconnect.</param>
 /// <param name="cancellationToken">A cancellation token that can be used to cancel the asynchronous operation.</param>
 /// <returns>An asynchronous task that completes when the socket is disconnected.</returns>
 public ValueTask DisconnectAsync(bool reuseSocket, CancellationToken cancellationToken = default)
 {
 if (cancellationToken.IsCancellationRequested)
 {
 return ValueTask.FromCanceled(cancellationToken);
 }

 AwaitableSocketAsyncEventArgs saea =
 Interlocked.Exchange(ref _singleBufferSendEventArgs, null) ??
 new AwaitableSocketAsyncEventArgs(this, isReceiveForCaching: false);

 saea.DisconnectReuseSocket = reuseSocket;
 saea.WrapExceptionsForNetworkStream = false;

 return saea.DisconnectAsync(this, cancellationToken);
 }

 /// <summary>
 /// Receives data from a connected socket.
 /// </summary>
Expand DownExpand Up@@ -1028,6 +1051,25 @@ public ValueTask ConnectAsync(Socket socket)
 ValueTask.FromException(CreateException(error));
 }

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

 if (socket.DisconnectAsync(this, cancellationToken))
 {
 _cancellationToken = cancellationToken;
 return new ValueTask(this, _token);
 }

 SocketError error = SocketError;

 Release();

 return error == SocketError.Success ?
 ValueTask.CompletedTask :
 ValueTask.FromException(CreateException(error));
 }

 /// <summary>Gets the status of the operation.</summary>
 public ValueTaskSourceStatus GetStatus(short token)
 {
Expand Down

119 changes: 36 additions & 83 deletions
src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,6 @@ private sealed class CacheSet
 private int _closeTimeout = Socket.DefaultCloseTimeout;
 private int _disposed; // 0 == false, anything else == true

 #region Constructors
 public Socket(SocketType socketType, ProtocolType protocolType)
 : this(OSSupportsIPv6 ? AddressFamily.InterNetworkV6 : AddressFamily.InterNetwork, socketType, protocolType)
 {
Expand DownExpand Up@@ -242,9 +241,10 @@ private static SafeSocketHandle ValidateHandle(SafeSocketHandle handle) =>
 handle is null ? throw new ArgumentNullException(nameof(handle)) :
 handle.IsInvalid ? throw new ArgumentException(SR.Arg_InvalidHandle, nameof(handle)) :
 handle;
 #endregion

 #region Properties
 //
 // Properties
 //

 // The CLR allows configuration of these properties, separately from whether the OS supports IPv4/6. We
 // do not provide these config options, so SupportsIPvX === OSSupportsIPvX.
Expand DownExpand Up@@ -761,9 +761,10 @@ internal bool CanTryAddressFamily(AddressFamily family)
 {
 return (family == _addressFamily) || (family == AddressFamily.InterNetwork && IsDualMode);
 }
 #endregion

 #region Public Methods
 //
 // Public Methods
 //

 // Associates a socket with an end point.
 public void Bind(EndPoint localEP)
Expand DownExpand Up@@ -2116,43 +2117,14 @@ public IAsyncResult BeginConnect(IPAddress address, int port, AsyncCallback? req
 public IAsyncResult BeginConnect(IPAddress[] addresses, int port, AsyncCallback? requestCallback, object? state) =>
 TaskToApm.Begin(ConnectAsync(addresses, port), requestCallback, state);

 public IAsyncResult BeginDisconnect(bool reuseSocket, AsyncCallback? callback, object? state)
 public void EndConnect(IAsyncResult asyncResult)
 {
 ThrowIfDisposed();

 // Start context-flowing op. No need to lock - we don't use the context till the callback.
 DisconnectOverlappedAsyncResult asyncResult = new DisconnectOverlappedAsyncResult(this, state, callback);
 asyncResult.StartPostingAsyncOp(false);

 // Post the disconnect.
 DoBeginDisconnect(reuseSocket, asyncResult);

 // Finish flowing (or call the callback), and return.
 asyncResult.FinishPostingAsyncOp();
 return asyncResult;
 TaskToApm.End(asyncResult);
 }

 private void DoBeginDisconnect(bool reuseSocket, DisconnectOverlappedAsyncResult asyncResult)
 {
 SocketError errorCode = SocketError.Success;

 errorCode = SocketPal.DisconnectAsync(this, _handle, reuseSocket, asyncResult);

 if (errorCode == SocketError.Success)
 {
 SetToDisconnected();
 _remoteEndPoint = null;
 _localEndPoint = null;
 }

 if (NetEventSource.Log.IsEnabled()) NetEventSource.Info(this, $"UnsafeNclNativeMethods.OSSOCK.DisConnectEx returns:{errorCode}");

 // If the call failed, update our status and throw
 if (!CheckErrorAndUpdateStatus(errorCode))
 {
 throw new SocketException((int)errorCode);
 }
 }
 public IAsyncResult BeginDisconnect(bool reuseSocket, AsyncCallback? callback, object? state) =>
 TaskToApmBeginWithSyncExceptions(DisconnectAsync(reuseSocket).AsTask(), callback, state);

 public void Disconnect(bool reuseSocket)
 {
Expand All@@ -2175,47 +2147,12 @@ public void Disconnect(bool reuseSocket)
 _localEndPoint = null;
 }

 public void EndConnect(IAsyncResult asyncResult)
 public void EndDisconnect(IAsyncResult asyncResult)
 {
 ThrowIfDisposed();
 TaskToApm.End(asyncResult);
 }

 public void EndDisconnect(IAsyncResult asyncResult)
 {
 ThrowIfDisposed();

 if (asyncResult == null)
 {
 throw new ArgumentNullException(nameof(asyncResult));
 }

 //get async result and check for errors
 LazyAsyncResult? castedAsyncResult = asyncResult as LazyAsyncResult;
 if (castedAsyncResult == null || castedAsyncResult.AsyncObject != this)
 {
 throw new ArgumentException(SR.net_io_invalidasyncresult, nameof(asyncResult));
 }
 if (castedAsyncResult.EndCalled)
 {
 throw new InvalidOperationException(SR.Format(SR.net_io_invalidendcall, nameof(EndDisconnect)));
 }

 //wait for completion if it hasn't occurred
 castedAsyncResult.InternalWaitForCompletion();
 castedAsyncResult.EndCalled = true;

 if (NetEventSource.Log.IsEnabled()) NetEventSource.Info(this);

 //
 // if the asynchronous native call failed asynchronously
 // we'll throw a SocketException
 //
 if ((SocketError)castedAsyncResult.ErrorCode != SocketError.Success)
 {
 UpdateStatusAfterSocketErrorAndThrowException((SocketError)castedAsyncResult.ErrorCode);
 }
 }

 public IAsyncResult BeginSend(byte[] buffer, int offset, int size, SocketFlags socketFlags, AsyncCallback? callback, object? state)
 {
Expand DownExpand Up@@ -2668,7 +2605,10 @@ public void Shutdown(SocketShutdown how)
 InternalSetBlocking(_willBlockInternal);
 }

 #region Async methods
 //
 // Async methods
 //

 public bool AcceptAsync(SocketAsyncEventArgs e)
 {
 ThrowIfDisposed();
Expand DownExpand Up@@ -2889,7 +2829,9 @@ public static void CancelConnectAsync(SocketAsyncEventArgs e)
 e.CancelConnectAsync();
 }

 public bool DisconnectAsync(SocketAsyncEventArgs e)
 public bool DisconnectAsync(SocketAsyncEventArgs e) => DisconnectAsync(e, default);

 private bool DisconnectAsync(SocketAsyncEventArgs e, CancellationToken cancellationToken)
 {
 // Throw if socket disposed
 ThrowIfDisposed();
Expand All@@ -2904,7 +2846,7 @@ public bool DisconnectAsync(SocketAsyncEventArgs e)
 SocketError socketError = SocketError.Success;
 try
 {
 socketError = e.DoOperationDisconnect(this, _handle);
 socketError = e.DoOperationDisconnect(this, _handle, cancellationToken);
 }
 catch
 {
Expand DownExpand Up@@ -3155,10 +3097,10 @@ private bool SendToAsync(SocketAsyncEventArgs e, CancellationToken cancellationT

 return socketError == SocketError.IOPending;
 }
 #endregion
 #endregion

 #region Internal and private properties
 //
 // Internal and private properties
 //

 private CacheSet Caches
 {
Expand All@@ -3174,9 +3116,10 @@ private CacheSet Caches
 }

 internal bool Disposed => _disposed != 0;
 #endregion

 #region Internal and private methods
 //
 // Internal and private methods
 //

 internal static void GetIPProtocolInformation(AddressFamily addressFamily, Internals.SocketAddress socketAddress, out bool isIPv4, out bool isIPv6)
 {
Expand DownExpand Up@@ -3889,6 +3832,16 @@ private static SocketError GetSocketErrorFromFaultedTask(Task t)
 };
 }

 #endregion
 // Helper to maintain existing behavior of Socket APM methods to throw synchronously from Begin*.
 private static IAsyncResult TaskToApmBeginWithSyncExceptions(Task task, AsyncCallback? callback, object? state)
 {
 if (task.IsFaulted)
 {
 task.GetAwaiter().GetResult();
 Debug.Fail("Task faulted but GetResult did not throw???");
 }

 return TaskToApm.Begin(task, callback, state);
 }
 }
}

2 changes: 1 addition & 1 deletion
src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ internal unsafe SocketError DoOperationConnect(Socket socket, SafeSocketHandle h
 return socketError;
 }

 internal SocketError DoOperationDisconnect(Socket socket, SafeSocketHandle handle)
 internal SocketError DoOperationDisconnect(Socket socket, SafeSocketHandle handle, CancellationToken cancellationToken)
 {
 SocketError socketError = SocketPal.Disconnect(socket, handle, _disconnectReuseSocket);
 FinishOperationSync(socketError, 0, SocketFlags.None);
Expand Down

10 changes: 9 additions & 1 deletion
src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -364,8 +364,11 @@ internal unsafe SocketError DoOperationConnectEx(Socket socket, SafeSocketHandle
 }
 }

 internal unsafe SocketError DoOperationDisconnect(Socket socket, SafeSocketHandle handle)
 internal unsafe SocketError DoOperationDisconnect(Socket socket, SafeSocketHandle handle, CancellationToken cancellationToken)
 {
 // Note: CancellationToken is ignored for now.
Comment thread
geoffkizer marked this conversation as resolved.

 // See https://github.com/dotnet/runtime/issues/51452

 NativeOverlapped* overlapped = AllocateNativeOverlapped();
 try
 {
Expand DownExpand Up@@ -1188,6 +1191,7 @@ private unsafe SocketError FinishOperationConnect()
 private void CompleteCore()
 {
 _strongThisRef.Value = null; // null out this reference from the overlapped so this isn't kept alive artificially

 if (_singleBufferHandleState != SingleBufferHandleState.None)
 {
 // If the state isn't None, then either it's Set, in which case there's state to cleanup,
Expand All@@ -1213,6 +1217,8 @@ void CompleteCoreSpin()
 sw.SpinOnce();
 }

 Debug.Assert(_singleBufferHandleState == SingleBufferHandleState.Set);

 // Remove any cancellation registration. First dispose the registration
 // to ensure that cancellation will either never fine or will have completed
 // firing before we continue. Only then can we safely null out the overlapped.
Expand All@@ -1223,6 +1229,8 @@ void CompleteCoreSpin()
 }

 // Release any GC handles.
 Debug.Assert(_singleBufferHandleState == SingleBufferHandleState.Set);

 if (_singleBufferHandleState == SingleBufferHandleState.Set)
 {
 _singleBufferHandleState = SingleBufferHandleState.None;
Expand Down

7 changes: 0 additions & 7 deletions
src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketPal.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1976,13 +1976,6 @@ public static SocketError AcceptAsync(Socket socket, SafeSocketHandle handle, Sa
 return socketError;
 }

 internal static SocketError DisconnectAsync(Socket socket, SafeSocketHandle handle, bool reuseSocket, DisconnectOverlappedAsyncResult asyncResult)
 {
 SocketError socketError = Disconnect(socket, handle, reuseSocket);
 asyncResult.PostCompletion(socketError);
 return socketError;
 }

 internal static SocketError Disconnect(Socket socket, SafeSocketHandle handle, bool reuseSocket)
 {
 handle.SetToDisconnected();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
add Task-based DisconnectAsync and refactor APM methods on top of it#51213

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

geoffkizer
merged 3 commits into

from

Apr 18, 2021
 Merged


add Task-based DisconnectAsync and refactor APM methods on top of it
#51213
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
fc9aedd

add Task-based DisconnectAsync and refactor APM methods on top of it

Jan 13, 2021
3eada45

fix BeginDisconnect to throw synchronously and add relevant tests

Apr 18, 2021
bf518ec

remove #region stuff in Socket.cs and add link to github issue

Apr 18, 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


1 change: 1 addition & 0 deletions
src/libraries/System.Net.Sockets/ref/System.Net.Sockets.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -338,6 +338,7 @@ public void Connect(string host, int port) { }
 public static bool ConnectAsync(System.Net.Sockets.SocketType socketType, System.Net.Sockets.ProtocolType protocolType, System.Net.Sockets.SocketAsyncEventArgs e) { throw null; }
 public void Disconnect(bool reuseSocket) { }
 public bool DisconnectAsync(System.Net.Sockets.SocketAsyncEventArgs e) { throw null; }
 public System.Threading.Tasks.ValueTask DisconnectAsync(bool reuseSocket, System.Threading.CancellationToken cancellationToken = default) { throw null; }
 public void Dispose() { }
 protected virtual void Dispose(bool disposing) { }
 [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")]
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,6 @@
 <Compile Include="System\Net\Sockets\UdpReceiveResult.cs" />
 <Compile Include="System\Net\Sockets\AcceptOverlappedAsyncResult.cs" />
 <Compile Include="System\Net\Sockets\BaseOverlappedAsyncResult.cs" />
 <Compile Include="System\Net\Sockets\DisconnectOverlappedAsyncResult.cs" />
 <Compile Include="System\Net\Sockets\UnixDomainSocketEndPoint.cs" />
 <!-- Logging -->
 <Compile Include="$(CommonPath)System\Net\Logging\NetEventSource.Common.cs"
Expand DownExpand Up@@ -187,7 +186,6 @@
 <ItemGroup Condition="'$(TargetsUnix)' == 'true'">
 <Compile Include="System\Net\Sockets\AcceptOverlappedAsyncResult.Unix.cs" />
 <Compile Include="System\Net\Sockets\BaseOverlappedAsyncResult.Unix.cs" />
 <Compile Include="System\Net\Sockets\DisconnectOverlappedAsyncResult.Unix.cs" />
 <Compile Include="System\Net\Sockets\SafeSocketHandle.Unix.cs" />
 <Compile Include="System\Net\Sockets\Socket.Unix.cs" />
 <Compile Include="System\Net\Sockets\SocketAsyncContext.Unix.cs" />
Expand Down

11 changes: 0 additions & 11 deletions
...braries/System.Net.Sockets/src/System/Net/Sockets/DisconnectOverlappedAsyncResult.Unix.cs

View file


Open in desktop


This file was deleted.


27 changes: 0 additions & 27 deletions
src/libraries/System.Net.Sockets/src/System/Net/Sockets/DisconnectOverlappedAsyncResult.cs

View file


Open in desktop


This file was deleted.


42 changes: 42 additions & 0 deletions
src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.Tasks.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -263,6 +263,29 @@ public ValueTask ConnectAsync(string host, int port, CancellationToken cancellat
 return ConnectAsync(ep, cancellationToken);
 }

 /// <summary>
 /// Disconnects a connected socket from the remote host.
 /// </summary>
 /// <param name="reuseSocket">Indicates whether the socket should be available for reuse after disconnect.</param>
 /// <param name="cancellationToken">A cancellation token that can be used to cancel the asynchronous operation.</param>
 /// <returns>An asynchronous task that completes when the socket is disconnected.</returns>
 public ValueTask DisconnectAsync(bool reuseSocket, CancellationToken cancellationToken = default)
 {
 if (cancellationToken.IsCancellationRequested)
 {
 return ValueTask.FromCanceled(cancellationToken);
 }

 AwaitableSocketAsyncEventArgs saea =
 Interlocked.Exchange(ref _singleBufferSendEventArgs, null) ??
 new AwaitableSocketAsyncEventArgs(this, isReceiveForCaching: false);

 saea.DisconnectReuseSocket = reuseSocket;
 saea.WrapExceptionsForNetworkStream = false;

 return saea.DisconnectAsync(this, cancellationToken);
 }

 /// <summary>
 /// Receives data from a connected socket.
 /// </summary>
Expand DownExpand Up@@ -1028,6 +1051,25 @@ public ValueTask ConnectAsync(Socket socket)
 ValueTask.FromException(CreateException(error));
 }

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

 if (socket.DisconnectAsync(this, cancellationToken))
 {
 _cancellationToken = cancellationToken;
 return new ValueTask(this, _token);
 }

 SocketError error = SocketError;

 Release();

 return error == SocketError.Success ?
 ValueTask.CompletedTask :
 ValueTask.FromException(CreateException(error));
 }

 /// <summary>Gets the status of the operation.</summary>
 public ValueTaskSourceStatus GetStatus(short token)
 {
Expand Down

119 changes: 36 additions & 83 deletions
src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,6 @@ private sealed class CacheSet
 private int _closeTimeout = Socket.DefaultCloseTimeout;
 private int _disposed; // 0 == false, anything else == true

 #region Constructors
 public Socket(SocketType socketType, ProtocolType protocolType)
 : this(OSSupportsIPv6 ? AddressFamily.InterNetworkV6 : AddressFamily.InterNetwork, socketType, protocolType)
 {
Expand DownExpand Up@@ -242,9 +241,10 @@ private static SafeSocketHandle ValidateHandle(SafeSocketHandle handle) =>
 handle is null ? throw new ArgumentNullException(nameof(handle)) :
 handle.IsInvalid ? throw new ArgumentException(SR.Arg_InvalidHandle, nameof(handle)) :
 handle;
 #endregion

 #region Properties
 //
 // Properties
 //

 // The CLR allows configuration of these properties, separately from whether the OS supports IPv4/6. We
 // do not provide these config options, so SupportsIPvX === OSSupportsIPvX.
Expand DownExpand Up@@ -761,9 +761,10 @@ internal bool CanTryAddressFamily(AddressFamily family)
 {
 return (family == _addressFamily) || (family == AddressFamily.InterNetwork && IsDualMode);
 }
 #endregion

 #region Public Methods
 //
 // Public Methods
 //

 // Associates a socket with an end point.
 public void Bind(EndPoint localEP)
Expand DownExpand Up@@ -2116,43 +2117,14 @@ public IAsyncResult BeginConnect(IPAddress address, int port, AsyncCallback? req
 public IAsyncResult BeginConnect(IPAddress[] addresses, int port, AsyncCallback? requestCallback, object? state) =>
 TaskToApm.Begin(ConnectAsync(addresses, port), requestCallback, state);

 public IAsyncResult BeginDisconnect(bool reuseSocket, AsyncCallback? callback, object? state)
 public void EndConnect(IAsyncResult asyncResult)
 {
 ThrowIfDisposed();

 // Start context-flowing op. No need to lock - we don't use the context till the callback.
 DisconnectOverlappedAsyncResult asyncResult = new DisconnectOverlappedAsyncResult(this, state, callback);
 asyncResult.StartPostingAsyncOp(false);

 // Post the disconnect.
 DoBeginDisconnect(reuseSocket, asyncResult);

 // Finish flowing (or call the callback), and return.
 asyncResult.FinishPostingAsyncOp();
 return asyncResult;
 TaskToApm.End(asyncResult);
 }

 private void DoBeginDisconnect(bool reuseSocket, DisconnectOverlappedAsyncResult asyncResult)
 {
 SocketError errorCode = SocketError.Success;

 errorCode = SocketPal.DisconnectAsync(this, _handle, reuseSocket, asyncResult);

 if (errorCode == SocketError.Success)
 {
 SetToDisconnected();
 _remoteEndPoint = null;
 _localEndPoint = null;
 }

 if (NetEventSource.Log.IsEnabled()) NetEventSource.Info(this, $"UnsafeNclNativeMethods.OSSOCK.DisConnectEx returns:{errorCode}");

 // If the call failed, update our status and throw
 if (!CheckErrorAndUpdateStatus(errorCode))
 {
 throw new SocketException((int)errorCode);
 }
 }
 public IAsyncResult BeginDisconnect(bool reuseSocket, AsyncCallback? callback, object? state) =>
 TaskToApmBeginWithSyncExceptions(DisconnectAsync(reuseSocket).AsTask(), callback, state);

 public void Disconnect(bool reuseSocket)
 {
Expand All@@ -2175,47 +2147,12 @@ public void Disconnect(bool reuseSocket)
 _localEndPoint = null;
 }

 public void EndConnect(IAsyncResult asyncResult)
 public void EndDisconnect(IAsyncResult asyncResult)
 {
 ThrowIfDisposed();
 TaskToApm.End(asyncResult);
 }

 public void EndDisconnect(IAsyncResult asyncResult)
 {
 ThrowIfDisposed();

 if (asyncResult == null)
 {
 throw new ArgumentNullException(nameof(asyncResult));
 }

 //get async result and check for errors
 LazyAsyncResult? castedAsyncResult = asyncResult as LazyAsyncResult;
 if (castedAsyncResult == null || castedAsyncResult.AsyncObject != this)
 {
 throw new ArgumentException(SR.net_io_invalidasyncresult, nameof(asyncResult));
 }
 if (castedAsyncResult.EndCalled)
 {
 throw new InvalidOperationException(SR.Format(SR.net_io_invalidendcall, nameof(EndDisconnect)));
 }

 //wait for completion if it hasn't occurred
 castedAsyncResult.InternalWaitForCompletion();
 castedAsyncResult.EndCalled = true;

 if (NetEventSource.Log.IsEnabled()) NetEventSource.Info(this);

 //
 // if the asynchronous native call failed asynchronously
 // we'll throw a SocketException
 //
 if ((SocketError)castedAsyncResult.ErrorCode != SocketError.Success)
 {
 UpdateStatusAfterSocketErrorAndThrowException((SocketError)castedAsyncResult.ErrorCode);
 }
 }

 public IAsyncResult BeginSend(byte[] buffer, int offset, int size, SocketFlags socketFlags, AsyncCallback? callback, object? state)
 {
Expand DownExpand Up@@ -2668,7 +2605,10 @@ public void Shutdown(SocketShutdown how)
 InternalSetBlocking(_willBlockInternal);
 }

 #region Async methods
 //
 // Async methods
 //

 public bool AcceptAsync(SocketAsyncEventArgs e)
 {
 ThrowIfDisposed();
Expand DownExpand Up@@ -2889,7 +2829,9 @@ public static void CancelConnectAsync(SocketAsyncEventArgs e)
 e.CancelConnectAsync();
 }

 public bool DisconnectAsync(SocketAsyncEventArgs e)
 public bool DisconnectAsync(SocketAsyncEventArgs e) => DisconnectAsync(e, default);

 private bool DisconnectAsync(SocketAsyncEventArgs e, CancellationToken cancellationToken)
 {
 // Throw if socket disposed
 ThrowIfDisposed();
Expand All@@ -2904,7 +2846,7 @@ public bool DisconnectAsync(SocketAsyncEventArgs e)
 SocketError socketError = SocketError.Success;
 try
 {
 socketError = e.DoOperationDisconnect(this, _handle);
 socketError = e.DoOperationDisconnect(this, _handle, cancellationToken);
 }
 catch
 {
Expand DownExpand Up@@ -3155,10 +3097,10 @@ private bool SendToAsync(SocketAsyncEventArgs e, CancellationToken cancellationT

 return socketError == SocketError.IOPending;
 }
 #endregion
 #endregion

 #region Internal and private properties
 //
 // Internal and private properties
 //

 private CacheSet Caches
 {
Expand All@@ -3174,9 +3116,10 @@ private CacheSet Caches
 }

 internal bool Disposed => _disposed != 0;
 #endregion

 #region Internal and private methods
 //
 // Internal and private methods
 //

 internal static void GetIPProtocolInformation(AddressFamily addressFamily, Internals.SocketAddress socketAddress, out bool isIPv4, out bool isIPv6)
 {
Expand DownExpand Up@@ -3889,6 +3832,16 @@ private static SocketError GetSocketErrorFromFaultedTask(Task t)
 };
 }

 #endregion
 // Helper to maintain existing behavior of Socket APM methods to throw synchronously from Begin*.
 private static IAsyncResult TaskToApmBeginWithSyncExceptions(Task task, AsyncCallback? callback, object? state)
 {
 if (task.IsFaulted)
 {
 task.GetAwaiter().GetResult();
 Debug.Fail("Task faulted but GetResult did not throw???");
 }

 return TaskToApm.Begin(task, callback, state);
 }
 }
}

2 changes: 1 addition & 1 deletion
src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ internal unsafe SocketError DoOperationConnect(Socket socket, SafeSocketHandle h
 return socketError;
 }

 internal SocketError DoOperationDisconnect(Socket socket, SafeSocketHandle handle)
 internal SocketError DoOperationDisconnect(Socket socket, SafeSocketHandle handle, CancellationToken cancellationToken)
 {
 SocketError socketError = SocketPal.Disconnect(socket, handle, _disconnectReuseSocket);
 FinishOperationSync(socketError, 0, SocketFlags.None);
Expand Down

10 changes: 9 additions & 1 deletion
src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -364,8 +364,11 @@ internal unsafe SocketError DoOperationConnectEx(Socket socket, SafeSocketHandle
 }
 }

 internal unsafe SocketError DoOperationDisconnect(Socket socket, SafeSocketHandle handle)
 internal unsafe SocketError DoOperationDisconnect(Socket socket, SafeSocketHandle handle, CancellationToken cancellationToken)
 {
 // Note: CancellationToken is ignored for now.
Comment thread
geoffkizer marked this conversation as resolved.

 // See https://github.com/dotnet/runtime/issues/51452

 NativeOverlapped* overlapped = AllocateNativeOverlapped();
 try
 {
Expand DownExpand Up@@ -1188,6 +1191,7 @@ private unsafe SocketError FinishOperationConnect()
 private void CompleteCore()
 {
 _strongThisRef.Value = null; // null out this reference from the overlapped so this isn't kept alive artificially

 if (_singleBufferHandleState != SingleBufferHandleState.None)
 {
 // If the state isn't None, then either it's Set, in which case there's state to cleanup,
Expand All@@ -1213,6 +1217,8 @@ void CompleteCoreSpin()
 sw.SpinOnce();
 }

 Debug.Assert(_singleBufferHandleState == SingleBufferHandleState.Set);

 // Remove any cancellation registration. First dispose the registration
 // to ensure that cancellation will either never fine or will have completed
 // firing before we continue. Only then can we safely null out the overlapped.
Expand All@@ -1223,6 +1229,8 @@ void CompleteCoreSpin()
 }

 // Release any GC handles.
 Debug.Assert(_singleBufferHandleState == SingleBufferHandleState.Set);

 if (_singleBufferHandleState == SingleBufferHandleState.Set)
 {
 _singleBufferHandleState = SingleBufferHandleState.None;
Expand Down

7 changes: 0 additions & 7 deletions
src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketPal.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1976,13 +1976,6 @@ public static SocketError AcceptAsync(Socket socket, SafeSocketHandle handle, Sa
 return socketError;
 }

 internal static SocketError DisconnectAsync(Socket socket, SafeSocketHandle handle, bool reuseSocket, DisconnectOverlappedAsyncResult asyncResult)
 {
 SocketError socketError = Disconnect(socket, handle, reuseSocket);
 asyncResult.PostCompletion(socketError);
 return socketError;
 }

 internal static SocketError Disconnect(Socket socket, SafeSocketHandle handle, bool reuseSocket)
 {
 handle.SetToDisconnected();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
add Task-based DisconnectAsync and refactor APM methods on top of it#51213

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

geoffkizer
merged 3 commits into

from

Apr 18, 2021
 Merged


add Task-based DisconnectAsync and refactor APM methods on top of it
#51213
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
fc9aedd

add Task-based DisconnectAsync and refactor APM methods on top of it

Jan 13, 2021
3eada45

fix BeginDisconnect to throw synchronously and add relevant tests

Apr 18, 2021
bf518ec

remove #region stuff in Socket.cs and add link to github issue

Apr 18, 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


1 change: 1 addition & 0 deletions
src/libraries/System.Net.Sockets/ref/System.Net.Sockets.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -338,6 +338,7 @@ public void Connect(string host, int port) { }
 public static bool ConnectAsync(System.Net.Sockets.SocketType socketType, System.Net.Sockets.ProtocolType protocolType, System.Net.Sockets.SocketAsyncEventArgs e) { throw null; }
 public void Disconnect(bool reuseSocket) { }
 public bool DisconnectAsync(System.Net.Sockets.SocketAsyncEventArgs e) { throw null; }
 public System.Threading.Tasks.ValueTask DisconnectAsync(bool reuseSocket, System.Threading.CancellationToken cancellationToken = default) { throw null; }
 public void Dispose() { }
 protected virtual void Dispose(bool disposing) { }
 [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")]
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,6 @@
 <Compile Include="System\Net\Sockets\UdpReceiveResult.cs" />
 <Compile Include="System\Net\Sockets\AcceptOverlappedAsyncResult.cs" />
 <Compile Include="System\Net\Sockets\BaseOverlappedAsyncResult.cs" />
 <Compile Include="System\Net\Sockets\DisconnectOverlappedAsyncResult.cs" />
 <Compile Include="System\Net\Sockets\UnixDomainSocketEndPoint.cs" />
 <!-- Logging -->
 <Compile Include="$(CommonPath)System\Net\Logging\NetEventSource.Common.cs"
Expand DownExpand Up@@ -187,7 +186,6 @@
 <ItemGroup Condition="'$(TargetsUnix)' == 'true'">
 <Compile Include="System\Net\Sockets\AcceptOverlappedAsyncResult.Unix.cs" />
 <Compile Include="System\Net\Sockets\BaseOverlappedAsyncResult.Unix.cs" />
 <Compile Include="System\Net\Sockets\DisconnectOverlappedAsyncResult.Unix.cs" />
 <Compile Include="System\Net\Sockets\SafeSocketHandle.Unix.cs" />
 <Compile Include="System\Net\Sockets\Socket.Unix.cs" />
 <Compile Include="System\Net\Sockets\SocketAsyncContext.Unix.cs" />
Expand Down

11 changes: 0 additions & 11 deletions
...braries/System.Net.Sockets/src/System/Net/Sockets/DisconnectOverlappedAsyncResult.Unix.cs

View file


Open in desktop


This file was deleted.


27 changes: 0 additions & 27 deletions
src/libraries/System.Net.Sockets/src/System/Net/Sockets/DisconnectOverlappedAsyncResult.cs

View file


Open in desktop


This file was deleted.


42 changes: 42 additions & 0 deletions
src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.Tasks.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -263,6 +263,29 @@ public ValueTask ConnectAsync(string host, int port, CancellationToken cancellat
 return ConnectAsync(ep, cancellationToken);
 }

 /// <summary>
 /// Disconnects a connected socket from the remote host.
 /// </summary>
 /// <param name="reuseSocket">Indicates whether the socket should be available for reuse after disconnect.</param>
 /// <param name="cancellationToken">A cancellation token that can be used to cancel the asynchronous operation.</param>
 /// <returns>An asynchronous task that completes when the socket is disconnected.</returns>
 public ValueTask DisconnectAsync(bool reuseSocket, CancellationToken cancellationToken = default)
 {
 if (cancellationToken.IsCancellationRequested)
 {
 return ValueTask.FromCanceled(cancellationToken);
 }

 AwaitableSocketAsyncEventArgs saea =
 Interlocked.Exchange(ref _singleBufferSendEventArgs, null) ??
 new AwaitableSocketAsyncEventArgs(this, isReceiveForCaching: false);

 saea.DisconnectReuseSocket = reuseSocket;
 saea.WrapExceptionsForNetworkStream = false;

 return saea.DisconnectAsync(this, cancellationToken);
 }

 /// <summary>
 /// Receives data from a connected socket.
 /// </summary>
Expand DownExpand Up@@ -1028,6 +1051,25 @@ public ValueTask ConnectAsync(Socket socket)
 ValueTask.FromException(CreateException(error));
 }

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

 if (socket.DisconnectAsync(this, cancellationToken))
 {
 _cancellationToken = cancellationToken;
 return new ValueTask(this, _token);
 }

 SocketError error = SocketError;

 Release();

 return error == SocketError.Success ?
 ValueTask.CompletedTask :
 ValueTask.FromException(CreateException(error));
 }

 /// <summary>Gets the status of the operation.</summary>
 public ValueTaskSourceStatus GetStatus(short token)
 {
Expand Down

119 changes: 36 additions & 83 deletions
src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,6 @@ private sealed class CacheSet
 private int _closeTimeout = Socket.DefaultCloseTimeout;
 private int _disposed; // 0 == false, anything else == true

 #region Constructors
 public Socket(SocketType socketType, ProtocolType protocolType)
 : this(OSSupportsIPv6 ? AddressFamily.InterNetworkV6 : AddressFamily.InterNetwork, socketType, protocolType)
 {
Expand DownExpand Up@@ -242,9 +241,10 @@ private static SafeSocketHandle ValidateHandle(SafeSocketHandle handle) =>
 handle is null ? throw new ArgumentNullException(nameof(handle)) :
 handle.IsInvalid ? throw new ArgumentException(SR.Arg_InvalidHandle, nameof(handle)) :
 handle;
 #endregion

 #region Properties
 //
 // Properties
 //

 // The CLR allows configuration of these properties, separately from whether the OS supports IPv4/6. We
 // do not provide these config options, so SupportsIPvX === OSSupportsIPvX.
Expand DownExpand Up@@ -761,9 +761,10 @@ internal bool CanTryAddressFamily(AddressFamily family)
 {
 return (family == _addressFamily) || (family == AddressFamily.InterNetwork && IsDualMode);
 }
 #endregion

 #region Public Methods
 //
 // Public Methods
 //

 // Associates a socket with an end point.
 public void Bind(EndPoint localEP)
Expand DownExpand Up@@ -2116,43 +2117,14 @@ public IAsyncResult BeginConnect(IPAddress address, int port, AsyncCallback? req
 public IAsyncResult BeginConnect(IPAddress[] addresses, int port, AsyncCallback? requestCallback, object? state) =>
 TaskToApm.Begin(ConnectAsync(addresses, port), requestCallback, state);

 public IAsyncResult BeginDisconnect(bool reuseSocket, AsyncCallback? callback, object? state)
 public void EndConnect(IAsyncResult asyncResult)
 {
 ThrowIfDisposed();

 // Start context-flowing op. No need to lock - we don't use the context till the callback.
 DisconnectOverlappedAsyncResult asyncResult = new DisconnectOverlappedAsyncResult(this, state, callback);
 asyncResult.StartPostingAsyncOp(false);

 // Post the disconnect.
 DoBeginDisconnect(reuseSocket, asyncResult);

 // Finish flowing (or call the callback), and return.
 asyncResult.FinishPostingAsyncOp();
 return asyncResult;
 TaskToApm.End(asyncResult);
 }

 private void DoBeginDisconnect(bool reuseSocket, DisconnectOverlappedAsyncResult asyncResult)
 {
 SocketError errorCode = SocketError.Success;

 errorCode = SocketPal.DisconnectAsync(this, _handle, reuseSocket, asyncResult);

 if (errorCode == SocketError.Success)
 {
 SetToDisconnected();
 _remoteEndPoint = null;
 _localEndPoint = null;
 }

 if (NetEventSource.Log.IsEnabled()) NetEventSource.Info(this, $"UnsafeNclNativeMethods.OSSOCK.DisConnectEx returns:{errorCode}");

 // If the call failed, update our status and throw
 if (!CheckErrorAndUpdateStatus(errorCode))
 {
 throw new SocketException((int)errorCode);
 }
 }
 public IAsyncResult BeginDisconnect(bool reuseSocket, AsyncCallback? callback, object? state) =>
 TaskToApmBeginWithSyncExceptions(DisconnectAsync(reuseSocket).AsTask(), callback, state);

 public void Disconnect(bool reuseSocket)
 {
Expand All@@ -2175,47 +2147,12 @@ public void Disconnect(bool reuseSocket)
 _localEndPoint = null;
 }

 public void EndConnect(IAsyncResult asyncResult)
 public void EndDisconnect(IAsyncResult asyncResult)
 {
 ThrowIfDisposed();
 TaskToApm.End(asyncResult);
 }

 public void EndDisconnect(IAsyncResult asyncResult)
 {
 ThrowIfDisposed();

 if (asyncResult == null)
 {
 throw new ArgumentNullException(nameof(asyncResult));
 }

 //get async result and check for errors
 LazyAsyncResult? castedAsyncResult = asyncResult as LazyAsyncResult;
 if (castedAsyncResult == null || castedAsyncResult.AsyncObject != this)
 {
 throw new ArgumentException(SR.net_io_invalidasyncresult, nameof(asyncResult));
 }
 if (castedAsyncResult.EndCalled)
 {
 throw new InvalidOperationException(SR.Format(SR.net_io_invalidendcall, nameof(EndDisconnect)));
 }

 //wait for completion if it hasn't occurred
 castedAsyncResult.InternalWaitForCompletion();
 castedAsyncResult.EndCalled = true;

 if (NetEventSource.Log.IsEnabled()) NetEventSource.Info(this);

 //
 // if the asynchronous native call failed asynchronously
 // we'll throw a SocketException
 //
 if ((SocketError)castedAsyncResult.ErrorCode != SocketError.Success)
 {
 UpdateStatusAfterSocketErrorAndThrowException((SocketError)castedAsyncResult.ErrorCode);
 }
 }

 public IAsyncResult BeginSend(byte[] buffer, int offset, int size, SocketFlags socketFlags, AsyncCallback? callback, object? state)
 {
Expand DownExpand Up@@ -2668,7 +2605,10 @@ public void Shutdown(SocketShutdown how)
 InternalSetBlocking(_willBlockInternal);
 }

 #region Async methods
 //
 // Async methods
 //

 public bool AcceptAsync(SocketAsyncEventArgs e)
 {
 ThrowIfDisposed();
Expand DownExpand Up@@ -2889,7 +2829,9 @@ public static void CancelConnectAsync(SocketAsyncEventArgs e)
 e.CancelConnectAsync();
 }

 public bool DisconnectAsync(SocketAsyncEventArgs e)
 public bool DisconnectAsync(SocketAsyncEventArgs e) => DisconnectAsync(e, default);

 private bool DisconnectAsync(SocketAsyncEventArgs e, CancellationToken cancellationToken)
 {
 // Throw if socket disposed
 ThrowIfDisposed();
Expand All@@ -2904,7 +2846,7 @@ public bool DisconnectAsync(SocketAsyncEventArgs e)
 SocketError socketError = SocketError.Success;
 try
 {
 socketError = e.DoOperationDisconnect(this, _handle);
 socketError = e.DoOperationDisconnect(this, _handle, cancellationToken);
 }
 catch
 {
Expand DownExpand Up@@ -3155,10 +3097,10 @@ private bool SendToAsync(SocketAsyncEventArgs e, CancellationToken cancellationT

 return socketError == SocketError.IOPending;
 }
 #endregion
 #endregion

 #region Internal and private properties
 //
 // Internal and private properties
 //

 private CacheSet Caches
 {
Expand All@@ -3174,9 +3116,10 @@ private CacheSet Caches
 }

 internal bool Disposed => _disposed != 0;
 #endregion

 #region Internal and private methods
 //
 // Internal and private methods
 //

 internal static void GetIPProtocolInformation(AddressFamily addressFamily, Internals.SocketAddress socketAddress, out bool isIPv4, out bool isIPv6)
 {
Expand DownExpand Up@@ -3889,6 +3832,16 @@ private static SocketError GetSocketErrorFromFaultedTask(Task t)
 };
 }

 #endregion
 // Helper to maintain existing behavior of Socket APM methods to throw synchronously from Begin*.
 private static IAsyncResult TaskToApmBeginWithSyncExceptions(Task task, AsyncCallback? callback, object? state)
 {
 if (task.IsFaulted)
 {
 task.GetAwaiter().GetResult();
 Debug.Fail("Task faulted but GetResult did not throw???");
 }

 return TaskToApm.Begin(task, callback, state);
 }
 }
}

2 changes: 1 addition & 1 deletion
src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ internal unsafe SocketError DoOperationConnect(Socket socket, SafeSocketHandle h
 return socketError;
 }

 internal SocketError DoOperationDisconnect(Socket socket, SafeSocketHandle handle)
 internal SocketError DoOperationDisconnect(Socket socket, SafeSocketHandle handle, CancellationToken cancellationToken)
 {
 SocketError socketError = SocketPal.Disconnect(socket, handle, _disconnectReuseSocket);
 FinishOperationSync(socketError, 0, SocketFlags.None);
Expand Down

10 changes: 9 additions & 1 deletion
src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -364,8 +364,11 @@ internal unsafe SocketError DoOperationConnectEx(Socket socket, SafeSocketHandle
 }
 }

 internal unsafe SocketError DoOperationDisconnect(Socket socket, SafeSocketHandle handle)
 internal unsafe SocketError DoOperationDisconnect(Socket socket, SafeSocketHandle handle, CancellationToken cancellationToken)
 {
 // Note: CancellationToken is ignored for now.
Comment thread
geoffkizer marked this conversation as resolved.

 // See https://github.com/dotnet/runtime/issues/51452

 NativeOverlapped* overlapped = AllocateNativeOverlapped();
 try
 {
Expand DownExpand Up@@ -1188,6 +1191,7 @@ private unsafe SocketError FinishOperationConnect()
 private void CompleteCore()
 {
 _strongThisRef.Value = null; // null out this reference from the overlapped so this isn't kept alive artificially

 if (_singleBufferHandleState != SingleBufferHandleState.None)
 {
 // If the state isn't None, then either it's Set, in which case there's state to cleanup,
Expand All@@ -1213,6 +1217,8 @@ void CompleteCoreSpin()
 sw.SpinOnce();
 }

 Debug.Assert(_singleBufferHandleState == SingleBufferHandleState.Set);

 // Remove any cancellation registration. First dispose the registration
 // to ensure that cancellation will either never fine or will have completed
 // firing before we continue. Only then can we safely null out the overlapped.
Expand All@@ -1223,6 +1229,8 @@ void CompleteCoreSpin()
 }

 // Release any GC handles.
 Debug.Assert(_singleBufferHandleState == SingleBufferHandleState.Set);

 if (_singleBufferHandleState == SingleBufferHandleState.Set)
 {
 _singleBufferHandleState = SingleBufferHandleState.None;
Expand Down

7 changes: 0 additions & 7 deletions
src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketPal.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1976,13 +1976,6 @@ public static SocketError AcceptAsync(Socket socket, SafeSocketHandle handle, Sa
 return socketError;
 }

 internal static SocketError DisconnectAsync(Socket socket, SafeSocketHandle handle, bool reuseSocket, DisconnectOverlappedAsyncResult asyncResult)
 {
 SocketError socketError = Disconnect(socket, handle, reuseSocket);
 asyncResult.PostCompletion(socketError);
 return socketError;
 }

 internal static SocketError Disconnect(Socket socket, SafeSocketHandle handle, bool reuseSocket)
 {
 handle.SetToDisconnected();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
add Task-based DisconnectAsync and refactor APM methods on top of it#51213

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

geoffkizer
merged 3 commits into

from

Apr 18, 2021
 Merged


add Task-based DisconnectAsync and refactor APM methods on top of it
#51213
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
fc9aedd

add Task-based DisconnectAsync and refactor APM methods on top of it

Jan 13, 2021
3eada45

fix BeginDisconnect to throw synchronously and add relevant tests

Apr 18, 2021
bf518ec

remove #region stuff in Socket.cs and add link to github issue

Apr 18, 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


1 change: 1 addition & 0 deletions
src/libraries/System.Net.Sockets/ref/System.Net.Sockets.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -338,6 +338,7 @@ public void Connect(string host, int port) { }
 public static bool ConnectAsync(System.Net.Sockets.SocketType socketType, System.Net.Sockets.ProtocolType protocolType, System.Net.Sockets.SocketAsyncEventArgs e) { throw null; }
 public void Disconnect(bool reuseSocket) { }
 public bool DisconnectAsync(System.Net.Sockets.SocketAsyncEventArgs e) { throw null; }
 public System.Threading.Tasks.ValueTask DisconnectAsync(bool reuseSocket, System.Threading.CancellationToken cancellationToken = default) { throw null; }
 public void Dispose() { }
 protected virtual void Dispose(bool disposing) { }
 [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")]
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,6 @@
 <Compile Include="System\Net\Sockets\UdpReceiveResult.cs" />
 <Compile Include="System\Net\Sockets\AcceptOverlappedAsyncResult.cs" />
 <Compile Include="System\Net\Sockets\BaseOverlappedAsyncResult.cs" />
 <Compile Include="System\Net\Sockets\DisconnectOverlappedAsyncResult.cs" />
 <Compile Include="System\Net\Sockets\UnixDomainSocketEndPoint.cs" />
 <!-- Logging -->
 <Compile Include="$(CommonPath)System\Net\Logging\NetEventSource.Common.cs"
Expand DownExpand Up@@ -187,7 +186,6 @@
 <ItemGroup Condition="'$(TargetsUnix)' == 'true'">
 <Compile Include="System\Net\Sockets\AcceptOverlappedAsyncResult.Unix.cs" />
 <Compile Include="System\Net\Sockets\BaseOverlappedAsyncResult.Unix.cs" />
 <Compile Include="System\Net\Sockets\DisconnectOverlappedAsyncResult.Unix.cs" />
 <Compile Include="System\Net\Sockets\SafeSocketHandle.Unix.cs" />
 <Compile Include="System\Net\Sockets\Socket.Unix.cs" />
 <Compile Include="System\Net\Sockets\SocketAsyncContext.Unix.cs" />
Expand Down

11 changes: 0 additions & 11 deletions
...braries/System.Net.Sockets/src/System/Net/Sockets/DisconnectOverlappedAsyncResult.Unix.cs

View file


Open in desktop


This file was deleted.


27 changes: 0 additions & 27 deletions
src/libraries/System.Net.Sockets/src/System/Net/Sockets/DisconnectOverlappedAsyncResult.cs

View file


Open in desktop


This file was deleted.


42 changes: 42 additions & 0 deletions
src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.Tasks.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -263,6 +263,29 @@ public ValueTask ConnectAsync(string host, int port, CancellationToken cancellat
 return ConnectAsync(ep, cancellationToken);
 }

 /// <summary>
 /// Disconnects a connected socket from the remote host.
 /// </summary>
 /// <param name="reuseSocket">Indicates whether the socket should be available for reuse after disconnect.</param>
 /// <param name="cancellationToken">A cancellation token that can be used to cancel the asynchronous operation.</param>
 /// <returns>An asynchronous task that completes when the socket is disconnected.</returns>
 public ValueTask DisconnectAsync(bool reuseSocket, CancellationToken cancellationToken = default)
 {
 if (cancellationToken.IsCancellationRequested)
 {
 return ValueTask.FromCanceled(cancellationToken);
 }

 AwaitableSocketAsyncEventArgs saea =
 Interlocked.Exchange(ref _singleBufferSendEventArgs, null) ??
 new AwaitableSocketAsyncEventArgs(this, isReceiveForCaching: false);

 saea.DisconnectReuseSocket = reuseSocket;
 saea.WrapExceptionsForNetworkStream = false;

 return saea.DisconnectAsync(this, cancellationToken);
 }

 /// <summary>
 /// Receives data from a connected socket.
 /// </summary>
Expand DownExpand Up@@ -1028,6 +1051,25 @@ public ValueTask ConnectAsync(Socket socket)
 ValueTask.FromException(CreateException(error));
 }

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

 if (socket.DisconnectAsync(this, cancellationToken))
 {
 _cancellationToken = cancellationToken;
 return new ValueTask(this, _token);
 }

 SocketError error = SocketError;

 Release();

 return error == SocketError.Success ?
 ValueTask.CompletedTask :
 ValueTask.FromException(CreateException(error));
 }

 /// <summary>Gets the status of the operation.</summary>
 public ValueTaskSourceStatus GetStatus(short token)
 {
Expand Down

119 changes: 36 additions & 83 deletions
src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,6 @@ private sealed class CacheSet
 private int _closeTimeout = Socket.DefaultCloseTimeout;
 private int _disposed; // 0 == false, anything else == true

 #region Constructors
 public Socket(SocketType socketType, ProtocolType protocolType)
 : this(OSSupportsIPv6 ? AddressFamily.InterNetworkV6 : AddressFamily.InterNetwork, socketType, protocolType)
 {
Expand DownExpand Up@@ -242,9 +241,10 @@ private static SafeSocketHandle ValidateHandle(SafeSocketHandle handle) =>
 handle is null ? throw new ArgumentNullException(nameof(handle)) :
 handle.IsInvalid ? throw new ArgumentException(SR.Arg_InvalidHandle, nameof(handle)) :
 handle;
 #endregion

 #region Properties
 //
 // Properties
 //

 // The CLR allows configuration of these properties, separately from whether the OS supports IPv4/6. We
 // do not provide these config options, so SupportsIPvX === OSSupportsIPvX.
Expand DownExpand Up@@ -761,9 +761,10 @@ internal bool CanTryAddressFamily(AddressFamily family)
 {
 return (family == _addressFamily) || (family == AddressFamily.InterNetwork && IsDualMode);
 }
 #endregion

 #region Public Methods
 //
 // Public Methods
 //

 // Associates a socket with an end point.
 public void Bind(EndPoint localEP)
Expand DownExpand Up@@ -2116,43 +2117,14 @@ public IAsyncResult BeginConnect(IPAddress address, int port, AsyncCallback? req
 public IAsyncResult BeginConnect(IPAddress[] addresses, int port, AsyncCallback? requestCallback, object? state) =>
 TaskToApm.Begin(ConnectAsync(addresses, port), requestCallback, state);

 public IAsyncResult BeginDisconnect(bool reuseSocket, AsyncCallback? callback, object? state)
 public void EndConnect(IAsyncResult asyncResult)
 {
 ThrowIfDisposed();

 // Start context-flowing op. No need to lock - we don't use the context till the callback.
 DisconnectOverlappedAsyncResult asyncResult = new DisconnectOverlappedAsyncResult(this, state, callback);
 asyncResult.StartPostingAsyncOp(false);

 // Post the disconnect.
 DoBeginDisconnect(reuseSocket, asyncResult);

 // Finish flowing (or call the callback), and return.
 asyncResult.FinishPostingAsyncOp();
 return asyncResult;
 TaskToApm.End(asyncResult);
 }

 private void DoBeginDisconnect(bool reuseSocket, DisconnectOverlappedAsyncResult asyncResult)
 {
 SocketError errorCode = SocketError.Success;

 errorCode = SocketPal.DisconnectAsync(this, _handle, reuseSocket, asyncResult);

 if (errorCode == SocketError.Success)
 {
 SetToDisconnected();
 _remoteEndPoint = null;
 _localEndPoint = null;
 }

 if (NetEventSource.Log.IsEnabled()) NetEventSource.Info(this, $"UnsafeNclNativeMethods.OSSOCK.DisConnectEx returns:{errorCode}");

 // If the call failed, update our status and throw
 if (!CheckErrorAndUpdateStatus(errorCode))
 {
 throw new SocketException((int)errorCode);
 }
 }
 public IAsyncResult BeginDisconnect(bool reuseSocket, AsyncCallback? callback, object? state) =>
 TaskToApmBeginWithSyncExceptions(DisconnectAsync(reuseSocket).AsTask(), callback, state);

 public void Disconnect(bool reuseSocket)
 {
Expand All@@ -2175,47 +2147,12 @@ public void Disconnect(bool reuseSocket)
 _localEndPoint = null;
 }

 public void EndConnect(IAsyncResult asyncResult)
 public void EndDisconnect(IAsyncResult asyncResult)
 {
 ThrowIfDisposed();
 TaskToApm.End(asyncResult);
 }

 public void EndDisconnect(IAsyncResult asyncResult)
 {
 ThrowIfDisposed();

 if (asyncResult == null)
 {
 throw new ArgumentNullException(nameof(asyncResult));
 }

 //get async result and check for errors
 LazyAsyncResult? castedAsyncResult = asyncResult as LazyAsyncResult;
 if (castedAsyncResult == null || castedAsyncResult.AsyncObject != this)
 {
 throw new ArgumentException(SR.net_io_invalidasyncresult, nameof(asyncResult));
 }
 if (castedAsyncResult.EndCalled)
 {
 throw new InvalidOperationException(SR.Format(SR.net_io_invalidendcall, nameof(EndDisconnect)));
 }

 //wait for completion if it hasn't occurred
 castedAsyncResult.InternalWaitForCompletion();
 castedAsyncResult.EndCalled = true;

 if (NetEventSource.Log.IsEnabled()) NetEventSource.Info(this);

 //
 // if the asynchronous native call failed asynchronously
 // we'll throw a SocketException
 //
 if ((SocketError)castedAsyncResult.ErrorCode != SocketError.Success)
 {
 UpdateStatusAfterSocketErrorAndThrowException((SocketError)castedAsyncResult.ErrorCode);
 }
 }

 public IAsyncResult BeginSend(byte[] buffer, int offset, int size, SocketFlags socketFlags, AsyncCallback? callback, object? state)
 {
Expand DownExpand Up@@ -2668,7 +2605,10 @@ public void Shutdown(SocketShutdown how)
 InternalSetBlocking(_willBlockInternal);
 }

 #region Async methods
 //
 // Async methods
 //

 public bool AcceptAsync(SocketAsyncEventArgs e)
 {
 ThrowIfDisposed();
Expand DownExpand Up@@ -2889,7 +2829,9 @@ public static void CancelConnectAsync(SocketAsyncEventArgs e)
 e.CancelConnectAsync();
 }

 public bool DisconnectAsync(SocketAsyncEventArgs e)
 public bool DisconnectAsync(SocketAsyncEventArgs e) => DisconnectAsync(e, default);

 private bool DisconnectAsync(SocketAsyncEventArgs e, CancellationToken cancellationToken)
 {
 // Throw if socket disposed
 ThrowIfDisposed();
Expand All@@ -2904,7 +2846,7 @@ public bool DisconnectAsync(SocketAsyncEventArgs e)
 SocketError socketError = SocketError.Success;
 try
 {
 socketError = e.DoOperationDisconnect(this, _handle);
 socketError = e.DoOperationDisconnect(this, _handle, cancellationToken);
 }
 catch
 {
Expand DownExpand Up@@ -3155,10 +3097,10 @@ private bool SendToAsync(SocketAsyncEventArgs e, CancellationToken cancellationT

 return socketError == SocketError.IOPending;
 }
 #endregion
 #endregion

 #region Internal and private properties
 //
 // Internal and private properties
 //

 private CacheSet Caches
 {
Expand All@@ -3174,9 +3116,10 @@ private CacheSet Caches
 }

 internal bool Disposed => _disposed != 0;
 #endregion

 #region Internal and private methods
 //
 // Internal and private methods
 //

 internal static void GetIPProtocolInformation(AddressFamily addressFamily, Internals.SocketAddress socketAddress, out bool isIPv4, out bool isIPv6)
 {
Expand DownExpand Up@@ -3889,6 +3832,16 @@ private static SocketError GetSocketErrorFromFaultedTask(Task t)
 };
 }

 #endregion
 // Helper to maintain existing behavior of Socket APM methods to throw synchronously from Begin*.
 private static IAsyncResult TaskToApmBeginWithSyncExceptions(Task task, AsyncCallback? callback, object? state)
 {
 if (task.IsFaulted)
 {
 task.GetAwaiter().GetResult();
 Debug.Fail("Task faulted but GetResult did not throw???");
 }

 return TaskToApm.Begin(task, callback, state);
 }
 }
}

2 changes: 1 addition & 1 deletion
src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ internal unsafe SocketError DoOperationConnect(Socket socket, SafeSocketHandle h
 return socketError;
 }

 internal SocketError DoOperationDisconnect(Socket socket, SafeSocketHandle handle)
 internal SocketError DoOperationDisconnect(Socket socket, SafeSocketHandle handle, CancellationToken cancellationToken)
 {
 SocketError socketError = SocketPal.Disconnect(socket, handle, _disconnectReuseSocket);
 FinishOperationSync(socketError, 0, SocketFlags.None);
Expand Down

10 changes: 9 additions & 1 deletion
src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -364,8 +364,11 @@ internal unsafe SocketError DoOperationConnectEx(Socket socket, SafeSocketHandle
 }
 }

 internal unsafe SocketError DoOperationDisconnect(Socket socket, SafeSocketHandle handle)
 internal unsafe SocketError DoOperationDisconnect(Socket socket, SafeSocketHandle handle, CancellationToken cancellationToken)
 {
 // Note: CancellationToken is ignored for now.
Comment thread
geoffkizer marked this conversation as resolved.

 // See https://github.com/dotnet/runtime/issues/51452

 NativeOverlapped* overlapped = AllocateNativeOverlapped();
 try
 {
Expand DownExpand Up@@ -1188,6 +1191,7 @@ private unsafe SocketError FinishOperationConnect()
 private void CompleteCore()
 {
 _strongThisRef.Value = null; // null out this reference from the overlapped so this isn't kept alive artificially

 if (_singleBufferHandleState != SingleBufferHandleState.None)
 {
 // If the state isn't None, then either it's Set, in which case there's state to cleanup,
Expand All@@ -1213,6 +1217,8 @@ void CompleteCoreSpin()
 sw.SpinOnce();
 }

 Debug.Assert(_singleBufferHandleState == SingleBufferHandleState.Set);

 // Remove any cancellation registration. First dispose the registration
 // to ensure that cancellation will either never fine or will have completed
 // firing before we continue. Only then can we safely null out the overlapped.
Expand All@@ -1223,6 +1229,8 @@ void CompleteCoreSpin()
 }

 // Release any GC handles.
 Debug.Assert(_singleBufferHandleState == SingleBufferHandleState.Set);

 if (_singleBufferHandleState == SingleBufferHandleState.Set)
 {
 _singleBufferHandleState = SingleBufferHandleState.None;
Expand Down

7 changes: 0 additions & 7 deletions
src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketPal.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1976,13 +1976,6 @@ public static SocketError AcceptAsync(Socket socket, SafeSocketHandle handle, Sa
 return socketError;
 }

 internal static SocketError DisconnectAsync(Socket socket, SafeSocketHandle handle, bool reuseSocket, DisconnectOverlappedAsyncResult asyncResult)
 {
 SocketError socketError = Disconnect(socket, handle, reuseSocket);
 asyncResult.PostCompletion(socketError);
 return socketError;
 }

 internal static SocketError Disconnect(Socket socket, SafeSocketHandle handle, bool reuseSocket)
 {
 handle.SetToDisconnected();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
add Task-based DisconnectAsync and refactor APM methods on top of it#51213

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

geoffkizer
merged 3 commits into

from

Apr 18, 2021
 Merged


add Task-based DisconnectAsync and refactor APM methods on top of it
#51213
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
fc9aedd

add Task-based DisconnectAsync and refactor APM methods on top of it

Jan 13, 2021
3eada45

fix BeginDisconnect to throw synchronously and add relevant tests

Apr 18, 2021
bf518ec

remove #region stuff in Socket.cs and add link to github issue

Apr 18, 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


1 change: 1 addition & 0 deletions
src/libraries/System.Net.Sockets/ref/System.Net.Sockets.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -338,6 +338,7 @@ public void Connect(string host, int port) { }
 public static bool ConnectAsync(System.Net.Sockets.SocketType socketType, System.Net.Sockets.ProtocolType protocolType, System.Net.Sockets.SocketAsyncEventArgs e) { throw null; }
 public void Disconnect(bool reuseSocket) { }
 public bool DisconnectAsync(System.Net.Sockets.SocketAsyncEventArgs e) { throw null; }
 public System.Threading.Tasks.ValueTask DisconnectAsync(bool reuseSocket, System.Threading.CancellationToken cancellationToken = default) { throw null; }
 public void Dispose() { }
 protected virtual void Dispose(bool disposing) { }
 [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")]
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,6 @@
 <Compile Include="System\Net\Sockets\UdpReceiveResult.cs" />
 <Compile Include="System\Net\Sockets\AcceptOverlappedAsyncResult.cs" />
 <Compile Include="System\Net\Sockets\BaseOverlappedAsyncResult.cs" />
 <Compile Include="System\Net\Sockets\DisconnectOverlappedAsyncResult.cs" />
 <Compile Include="System\Net\Sockets\UnixDomainSocketEndPoint.cs" />
 <!-- Logging -->
 <Compile Include="$(CommonPath)System\Net\Logging\NetEventSource.Common.cs"
Expand DownExpand Up@@ -187,7 +186,6 @@
 <ItemGroup Condition="'$(TargetsUnix)' == 'true'">
 <Compile Include="System\Net\Sockets\AcceptOverlappedAsyncResult.Unix.cs" />
 <Compile Include="System\Net\Sockets\BaseOverlappedAsyncResult.Unix.cs" />
 <Compile Include="System\Net\Sockets\DisconnectOverlappedAsyncResult.Unix.cs" />
 <Compile Include="System\Net\Sockets\SafeSocketHandle.Unix.cs" />
 <Compile Include="System\Net\Sockets\Socket.Unix.cs" />
 <Compile Include="System\Net\Sockets\SocketAsyncContext.Unix.cs" />
Expand Down

11 changes: 0 additions & 11 deletions
...braries/System.Net.Sockets/src/System/Net/Sockets/DisconnectOverlappedAsyncResult.Unix.cs

View file


Open in desktop


This file was deleted.


27 changes: 0 additions & 27 deletions
src/libraries/System.Net.Sockets/src/System/Net/Sockets/DisconnectOverlappedAsyncResult.cs

View file


Open in desktop


This file was deleted.


42 changes: 42 additions & 0 deletions
src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.Tasks.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -263,6 +263,29 @@ public ValueTask ConnectAsync(string host, int port, CancellationToken cancellat
 return ConnectAsync(ep, cancellationToken);
 }

 /// <summary>
 /// Disconnects a connected socket from the remote host.
 /// </summary>
 /// <param name="reuseSocket">Indicates whether the socket should be available for reuse after disconnect.</param>
 /// <param name="cancellationToken">A cancellation token that can be used to cancel the asynchronous operation.</param>
 /// <returns>An asynchronous task that completes when the socket is disconnected.</returns>
 public ValueTask DisconnectAsync(bool reuseSocket, CancellationToken cancellationToken = default)
 {
 if (cancellationToken.IsCancellationRequested)
 {
 return ValueTask.FromCanceled(cancellationToken);
 }

 AwaitableSocketAsyncEventArgs saea =
 Interlocked.Exchange(ref _singleBufferSendEventArgs, null) ??
 new AwaitableSocketAsyncEventArgs(this, isReceiveForCaching: false);

 saea.DisconnectReuseSocket = reuseSocket;
 saea.WrapExceptionsForNetworkStream = false;

 return saea.DisconnectAsync(this, cancellationToken);
 }

 /// <summary>
 /// Receives data from a connected socket.
 /// </summary>
Expand DownExpand Up@@ -1028,6 +1051,25 @@ public ValueTask ConnectAsync(Socket socket)
 ValueTask.FromException(CreateException(error));
 }

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

 if (socket.DisconnectAsync(this, cancellationToken))
 {
 _cancellationToken = cancellationToken;
 return new ValueTask(this, _token);
 }

 SocketError error = SocketError;

 Release();

 return error == SocketError.Success ?
 ValueTask.CompletedTask :
 ValueTask.FromException(CreateException(error));
 }

 /// <summary>Gets the status of the operation.</summary>
 public ValueTaskSourceStatus GetStatus(short token)
 {
Expand Down

119 changes: 36 additions & 83 deletions
src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,6 @@ private sealed class CacheSet
 private int _closeTimeout = Socket.DefaultCloseTimeout;
 private int _disposed; // 0 == false, anything else == true

 #region Constructors
 public Socket(SocketType socketType, ProtocolType protocolType)
 : this(OSSupportsIPv6 ? AddressFamily.InterNetworkV6 : AddressFamily.InterNetwork, socketType, protocolType)
 {
Expand DownExpand Up@@ -242,9 +241,10 @@ private static SafeSocketHandle ValidateHandle(SafeSocketHandle handle) =>
 handle is null ? throw new ArgumentNullException(nameof(handle)) :
 handle.IsInvalid ? throw new ArgumentException(SR.Arg_InvalidHandle, nameof(handle)) :
 handle;
 #endregion

 #region Properties
 //
 // Properties
 //

 // The CLR allows configuration of these properties, separately from whether the OS supports IPv4/6. We
 // do not provide these config options, so SupportsIPvX === OSSupportsIPvX.
Expand DownExpand Up@@ -761,9 +761,10 @@ internal bool CanTryAddressFamily(AddressFamily family)
 {
 return (family == _addressFamily) || (family == AddressFamily.InterNetwork && IsDualMode);
 }
 #endregion

 #region Public Methods
 //
 // Public Methods
 //

 // Associates a socket with an end point.
 public void Bind(EndPoint localEP)
Expand DownExpand Up@@ -2116,43 +2117,14 @@ public IAsyncResult BeginConnect(IPAddress address, int port, AsyncCallback? req
 public IAsyncResult BeginConnect(IPAddress[] addresses, int port, AsyncCallback? requestCallback, object? state) =>
 TaskToApm.Begin(ConnectAsync(addresses, port), requestCallback, state);

 public IAsyncResult BeginDisconnect(bool reuseSocket, AsyncCallback? callback, object? state)
 public void EndConnect(IAsyncResult asyncResult)
 {
 ThrowIfDisposed();

 // Start context-flowing op. No need to lock - we don't use the context till the callback.
 DisconnectOverlappedAsyncResult asyncResult = new DisconnectOverlappedAsyncResult(this, state, callback);
 asyncResult.StartPostingAsyncOp(false);

 // Post the disconnect.
 DoBeginDisconnect(reuseSocket, asyncResult);

 // Finish flowing (or call the callback), and return.
 asyncResult.FinishPostingAsyncOp();
 return asyncResult;
 TaskToApm.End(asyncResult);
 }

 private void DoBeginDisconnect(bool reuseSocket, DisconnectOverlappedAsyncResult asyncResult)
 {
 SocketError errorCode = SocketError.Success;

 errorCode = SocketPal.DisconnectAsync(this, _handle, reuseSocket, asyncResult);

 if (errorCode == SocketError.Success)
 {
 SetToDisconnected();
 _remoteEndPoint = null;
 _localEndPoint = null;
 }

 if (NetEventSource.Log.IsEnabled()) NetEventSource.Info(this, $"UnsafeNclNativeMethods.OSSOCK.DisConnectEx returns:{errorCode}");

 // If the call failed, update our status and throw
 if (!CheckErrorAndUpdateStatus(errorCode))
 {
 throw new SocketException((int)errorCode);
 }
 }
 public IAsyncResult BeginDisconnect(bool reuseSocket, AsyncCallback? callback, object? state) =>
 TaskToApmBeginWithSyncExceptions(DisconnectAsync(reuseSocket).AsTask(), callback, state);

 public void Disconnect(bool reuseSocket)
 {
Expand All@@ -2175,47 +2147,12 @@ public void Disconnect(bool reuseSocket)
 _localEndPoint = null;
 }

 public void EndConnect(IAsyncResult asyncResult)
 public void EndDisconnect(IAsyncResult asyncResult)
 {
 ThrowIfDisposed();
 TaskToApm.End(asyncResult);
 }

 public void EndDisconnect(IAsyncResult asyncResult)
 {
 ThrowIfDisposed();

 if (asyncResult == null)
 {
 throw new ArgumentNullException(nameof(asyncResult));
 }

 //get async result and check for errors
 LazyAsyncResult? castedAsyncResult = asyncResult as LazyAsyncResult;
 if (castedAsyncResult == null || castedAsyncResult.AsyncObject != this)
 {
 throw new ArgumentException(SR.net_io_invalidasyncresult, nameof(asyncResult));
 }
 if (castedAsyncResult.EndCalled)
 {
 throw new InvalidOperationException(SR.Format(SR.net_io_invalidendcall, nameof(EndDisconnect)));
 }

 //wait for completion if it hasn't occurred
 castedAsyncResult.InternalWaitForCompletion();
 castedAsyncResult.EndCalled = true;

 if (NetEventSource.Log.IsEnabled()) NetEventSource.Info(this);

 //
 // if the asynchronous native call failed asynchronously
 // we'll throw a SocketException
 //
 if ((SocketError)castedAsyncResult.ErrorCode != SocketError.Success)
 {
 UpdateStatusAfterSocketErrorAndThrowException((SocketError)castedAsyncResult.ErrorCode);
 }
 }

 public IAsyncResult BeginSend(byte[] buffer, int offset, int size, SocketFlags socketFlags, AsyncCallback? callback, object? state)
 {
Expand DownExpand Up@@ -2668,7 +2605,10 @@ public void Shutdown(SocketShutdown how)
 InternalSetBlocking(_willBlockInternal);
 }

 #region Async methods
 //
 // Async methods
 //

 public bool AcceptAsync(SocketAsyncEventArgs e)
 {
 ThrowIfDisposed();
Expand DownExpand Up@@ -2889,7 +2829,9 @@ public static void CancelConnectAsync(SocketAsyncEventArgs e)
 e.CancelConnectAsync();
 }

 public bool DisconnectAsync(SocketAsyncEventArgs e)
 public bool DisconnectAsync(SocketAsyncEventArgs e) => DisconnectAsync(e, default);

 private bool DisconnectAsync(SocketAsyncEventArgs e, CancellationToken cancellationToken)
 {
 // Throw if socket disposed
 ThrowIfDisposed();
Expand All@@ -2904,7 +2846,7 @@ public bool DisconnectAsync(SocketAsyncEventArgs e)
 SocketError socketError = SocketError.Success;
 try
 {
 socketError = e.DoOperationDisconnect(this, _handle);
 socketError = e.DoOperationDisconnect(this, _handle, cancellationToken);
 }
 catch
 {
Expand DownExpand Up@@ -3155,10 +3097,10 @@ private bool SendToAsync(SocketAsyncEventArgs e, CancellationToken cancellationT

 return socketError == SocketError.IOPending;
 }
 #endregion
 #endregion

 #region Internal and private properties
 //
 // Internal and private properties
 //

 private CacheSet Caches
 {
Expand All@@ -3174,9 +3116,10 @@ private CacheSet Caches
 }

 internal bool Disposed => _disposed != 0;
 #endregion

 #region Internal and private methods
 //
 // Internal and private methods
 //

 internal static void GetIPProtocolInformation(AddressFamily addressFamily, Internals.SocketAddress socketAddress, out bool isIPv4, out bool isIPv6)
 {
Expand DownExpand Up@@ -3889,6 +3832,16 @@ private static SocketError GetSocketErrorFromFaultedTask(Task t)
 };
 }

 #endregion
 // Helper to maintain existing behavior of Socket APM methods to throw synchronously from Begin*.
 private static IAsyncResult TaskToApmBeginWithSyncExceptions(Task task, AsyncCallback? callback, object? state)
 {
 if (task.IsFaulted)
 {
 task.GetAwaiter().GetResult();
 Debug.Fail("Task faulted but GetResult did not throw???");
 }

 return TaskToApm.Begin(task, callback, state);
 }
 }
}

2 changes: 1 addition & 1 deletion
src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ internal unsafe SocketError DoOperationConnect(Socket socket, SafeSocketHandle h
 return socketError;
 }

 internal SocketError DoOperationDisconnect(Socket socket, SafeSocketHandle handle)
 internal SocketError DoOperationDisconnect(Socket socket, SafeSocketHandle handle, CancellationToken cancellationToken)
 {
 SocketError socketError = SocketPal.Disconnect(socket, handle, _disconnectReuseSocket);
 FinishOperationSync(socketError, 0, SocketFlags.None);
Expand Down

10 changes: 9 additions & 1 deletion
src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -364,8 +364,11 @@ internal unsafe SocketError DoOperationConnectEx(Socket socket, SafeSocketHandle
 }
 }

 internal unsafe SocketError DoOperationDisconnect(Socket socket, SafeSocketHandle handle)
 internal unsafe SocketError DoOperationDisconnect(Socket socket, SafeSocketHandle handle, CancellationToken cancellationToken)
 {
 // Note: CancellationToken is ignored for now.
Comment thread
geoffkizer marked this conversation as resolved.

 // See https://github.com/dotnet/runtime/issues/51452

 NativeOverlapped* overlapped = AllocateNativeOverlapped();
 try
 {
Expand DownExpand Up@@ -1188,6 +1191,7 @@ private unsafe SocketError FinishOperationConnect()
 private void CompleteCore()
 {
 _strongThisRef.Value = null; // null out this reference from the overlapped so this isn't kept alive artificially

 if (_singleBufferHandleState != SingleBufferHandleState.None)
 {
 // If the state isn't None, then either it's Set, in which case there's state to cleanup,
Expand All@@ -1213,6 +1217,8 @@ void CompleteCoreSpin()
 sw.SpinOnce();
 }

 Debug.Assert(_singleBufferHandleState == SingleBufferHandleState.Set);

 // Remove any cancellation registration. First dispose the registration
 // to ensure that cancellation will either never fine or will have completed
 // firing before we continue. Only then can we safely null out the overlapped.
Expand All@@ -1223,6 +1229,8 @@ void CompleteCoreSpin()
 }

 // Release any GC handles.
 Debug.Assert(_singleBufferHandleState == SingleBufferHandleState.Set);

 if (_singleBufferHandleState == SingleBufferHandleState.Set)
 {
 _singleBufferHandleState = SingleBufferHandleState.None;
Expand Down

7 changes: 0 additions & 7 deletions
src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketPal.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1976,13 +1976,6 @@ public static SocketError AcceptAsync(Socket socket, SafeSocketHandle handle, Sa
 return socketError;
 }

 internal static SocketError DisconnectAsync(Socket socket, SafeSocketHandle handle, bool reuseSocket, DisconnectOverlappedAsyncResult asyncResult)
 {
 SocketError socketError = Disconnect(socket, handle, reuseSocket);
 asyncResult.PostCompletion(socketError);
 return socketError;
 }

 internal static SocketError Disconnect(Socket socket, SafeSocketHandle handle, bool reuseSocket)
 {
 handle.SetToDisconnected();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
add Task-based DisconnectAsync and refactor APM methods on top of it#51213

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

geoffkizer
merged 3 commits into

from

Apr 18, 2021
 Merged


add Task-based DisconnectAsync and refactor APM methods on top of it
#51213
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
fc9aedd

add Task-based DisconnectAsync and refactor APM methods on top of it

Jan 13, 2021
3eada45

fix BeginDisconnect to throw synchronously and add relevant tests

Apr 18, 2021
bf518ec

remove #region stuff in Socket.cs and add link to github issue

Apr 18, 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


1 change: 1 addition & 0 deletions
src/libraries/System.Net.Sockets/ref/System.Net.Sockets.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -338,6 +338,7 @@ public void Connect(string host, int port) { }
 public static bool ConnectAsync(System.Net.Sockets.SocketType socketType, System.Net.Sockets.ProtocolType protocolType, System.Net.Sockets.SocketAsyncEventArgs e) { throw null; }
 public void Disconnect(bool reuseSocket) { }
 public bool DisconnectAsync(System.Net.Sockets.SocketAsyncEventArgs e) { throw null; }
 public System.Threading.Tasks.ValueTask DisconnectAsync(bool reuseSocket, System.Threading.CancellationToken cancellationToken = default) { throw null; }
 public void Dispose() { }
 protected virtual void Dispose(bool disposing) { }
 [System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")]
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,6 @@
 <Compile Include="System\Net\Sockets\UdpReceiveResult.cs" />
 <Compile Include="System\Net\Sockets\AcceptOverlappedAsyncResult.cs" />
 <Compile Include="System\Net\Sockets\BaseOverlappedAsyncResult.cs" />
 <Compile Include="System\Net\Sockets\DisconnectOverlappedAsyncResult.cs" />
 <Compile Include="System\Net\Sockets\UnixDomainSocketEndPoint.cs" />
 <!-- Logging -->
 <Compile Include="$(CommonPath)System\Net\Logging\NetEventSource.Common.cs"
Expand DownExpand Up@@ -187,7 +186,6 @@
 <ItemGroup Condition="'$(TargetsUnix)' == 'true'">
 <Compile Include="System\Net\Sockets\AcceptOverlappedAsyncResult.Unix.cs" />
 <Compile Include="System\Net\Sockets\BaseOverlappedAsyncResult.Unix.cs" />
 <Compile Include="System\Net\Sockets\DisconnectOverlappedAsyncResult.Unix.cs" />
 <Compile Include="System\Net\Sockets\SafeSocketHandle.Unix.cs" />
 <Compile Include="System\Net\Sockets\Socket.Unix.cs" />
 <Compile Include="System\Net\Sockets\SocketAsyncContext.Unix.cs" />
Expand Down

11 changes: 0 additions & 11 deletions
...braries/System.Net.Sockets/src/System/Net/Sockets/DisconnectOverlappedAsyncResult.Unix.cs

View file


Open in desktop


This file was deleted.


27 changes: 0 additions & 27 deletions
src/libraries/System.Net.Sockets/src/System/Net/Sockets/DisconnectOverlappedAsyncResult.cs

View file


Open in desktop


This file was deleted.


42 changes: 42 additions & 0 deletions
src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.Tasks.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -263,6 +263,29 @@ public ValueTask ConnectAsync(string host, int port, CancellationToken cancellat
 return ConnectAsync(ep, cancellationToken);
 }

 /// <summary>
 /// Disconnects a connected socket from the remote host.
 /// </summary>
 /// <param name="reuseSocket">Indicates whether the socket should be available for reuse after disconnect.</param>
 /// <param name="cancellationToken">A cancellation token that can be used to cancel the asynchronous operation.</param>
 /// <returns>An asynchronous task that completes when the socket is disconnected.</returns>
 public ValueTask DisconnectAsync(bool reuseSocket, CancellationToken cancellationToken = default)
 {
 if (cancellationToken.IsCancellationRequested)
 {
 return ValueTask.FromCanceled(cancellationToken);
 }

 AwaitableSocketAsyncEventArgs saea =
 Interlocked.Exchange(ref _singleBufferSendEventArgs, null) ??
 new AwaitableSocketAsyncEventArgs(this, isReceiveForCaching: false);

 saea.DisconnectReuseSocket = reuseSocket;
 saea.WrapExceptionsForNetworkStream = false;

 return saea.DisconnectAsync(this, cancellationToken);
 }

 /// <summary>
 /// Receives data from a connected socket.
 /// </summary>
Expand DownExpand Up@@ -1028,6 +1051,25 @@ public ValueTask ConnectAsync(Socket socket)
 ValueTask.FromException(CreateException(error));
 }

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

 if (socket.DisconnectAsync(this, cancellationToken))
 {
 _cancellationToken = cancellationToken;
 return new ValueTask(this, _token);
 }

 SocketError error = SocketError;

 Release();

 return error == SocketError.Success ?
 ValueTask.CompletedTask :
 ValueTask.FromException(CreateException(error));
 }

 /// <summary>Gets the status of the operation.</summary>
 public ValueTaskSourceStatus GetStatus(short token)
 {
Expand Down

119 changes: 36 additions & 83 deletions
src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,6 @@ private sealed class CacheSet
 private int _closeTimeout = Socket.DefaultCloseTimeout;
 private int _disposed; // 0 == false, anything else == true

 #region Constructors
 public Socket(SocketType socketType, ProtocolType protocolType)
 : this(OSSupportsIPv6 ? AddressFamily.InterNetworkV6 : AddressFamily.InterNetwork, socketType, protocolType)
 {
Expand DownExpand Up@@ -242,9 +241,10 @@ private static SafeSocketHandle ValidateHandle(SafeSocketHandle handle) =>
 handle is null ? throw new ArgumentNullException(nameof(handle)) :
 handle.IsInvalid ? throw new ArgumentException(SR.Arg_InvalidHandle, nameof(handle)) :
 handle;
 #endregion

 #region Properties
 //
 // Properties
 //

 // The CLR allows configuration of these properties, separately from whether the OS supports IPv4/6. We
 // do not provide these config options, so SupportsIPvX === OSSupportsIPvX.
Expand DownExpand Up@@ -761,9 +761,10 @@ internal bool CanTryAddressFamily(AddressFamily family)
 {
 return (family == _addressFamily) || (family == AddressFamily.InterNetwork && IsDualMode);
 }
 #endregion

 #region Public Methods
 //
 // Public Methods
 //

 // Associates a socket with an end point.
 public void Bind(EndPoint localEP)
Expand DownExpand Up@@ -2116,43 +2117,14 @@ public IAsyncResult BeginConnect(IPAddress address, int port, AsyncCallback? req
 public IAsyncResult BeginConnect(IPAddress[] addresses, int port, AsyncCallback? requestCallback, object? state) =>
 TaskToApm.Begin(ConnectAsync(addresses, port), requestCallback, state);

 public IAsyncResult BeginDisconnect(bool reuseSocket, AsyncCallback? callback, object? state)
 public void EndConnect(IAsyncResult asyncResult)
 {
 ThrowIfDisposed();

 // Start context-flowing op. No need to lock - we don't use the context till the callback.
 DisconnectOverlappedAsyncResult asyncResult = new DisconnectOverlappedAsyncResult(this, state, callback);
 asyncResult.StartPostingAsyncOp(false);

 // Post the disconnect.
 DoBeginDisconnect(reuseSocket, asyncResult);

 // Finish flowing (or call the callback), and return.
 asyncResult.FinishPostingAsyncOp();
 return asyncResult;
 TaskToApm.End(asyncResult);
 }

 private void DoBeginDisconnect(bool reuseSocket, DisconnectOverlappedAsyncResult asyncResult)
 {
 SocketError errorCode = SocketError.Success;

 errorCode = SocketPal.DisconnectAsync(this, _handle, reuseSocket, asyncResult);

 if (errorCode == SocketError.Success)
 {
 SetToDisconnected();
 _remoteEndPoint = null;
 _localEndPoint = null;
 }

 if (NetEventSource.Log.IsEnabled()) NetEventSource.Info(this, $"UnsafeNclNativeMethods.OSSOCK.DisConnectEx returns:{errorCode}");

 // If the call failed, update our status and throw
 if (!CheckErrorAndUpdateStatus(errorCode))
 {
 throw new SocketException((int)errorCode);
 }
 }
 public IAsyncResult BeginDisconnect(bool reuseSocket, AsyncCallback? callback, object? state) =>
 TaskToApmBeginWithSyncExceptions(DisconnectAsync(reuseSocket).AsTask(), callback, state);

 public void Disconnect(bool reuseSocket)
 {
Expand All@@ -2175,47 +2147,12 @@ public void Disconnect(bool reuseSocket)
 _localEndPoint = null;
 }

 public void EndConnect(IAsyncResult asyncResult)
 public void EndDisconnect(IAsyncResult asyncResult)
 {
 ThrowIfDisposed();
 TaskToApm.End(asyncResult);
 }

 public void EndDisconnect(IAsyncResult asyncResult)
 {
 ThrowIfDisposed();

 if (asyncResult == null)
 {
 throw new ArgumentNullException(nameof(asyncResult));
 }

 //get async result and check for errors
 LazyAsyncResult? castedAsyncResult = asyncResult as LazyAsyncResult;
 if (castedAsyncResult == null || castedAsyncResult.AsyncObject != this)
 {
 throw new ArgumentException(SR.net_io_invalidasyncresult, nameof(asyncResult));
 }
 if (castedAsyncResult.EndCalled)
 {
 throw new InvalidOperationException(SR.Format(SR.net_io_invalidendcall, nameof(EndDisconnect)));
 }

 //wait for completion if it hasn't occurred
 castedAsyncResult.InternalWaitForCompletion();
 castedAsyncResult.EndCalled = true;

 if (NetEventSource.Log.IsEnabled()) NetEventSource.Info(this);

 //
 // if the asynchronous native call failed asynchronously
 // we'll throw a SocketException
 //
 if ((SocketError)castedAsyncResult.ErrorCode != SocketError.Success)
 {
 UpdateStatusAfterSocketErrorAndThrowException((SocketError)castedAsyncResult.ErrorCode);
 }
 }

 public IAsyncResult BeginSend(byte[] buffer, int offset, int size, SocketFlags socketFlags, AsyncCallback? callback, object? state)
 {
Expand DownExpand Up@@ -2668,7 +2605,10 @@ public void Shutdown(SocketShutdown how)
 InternalSetBlocking(_willBlockInternal);
 }

 #region Async methods
 //
 // Async methods
 //

 public bool AcceptAsync(SocketAsyncEventArgs e)
 {
 ThrowIfDisposed();
Expand DownExpand Up@@ -2889,7 +2829,9 @@ public static void CancelConnectAsync(SocketAsyncEventArgs e)
 e.CancelConnectAsync();
 }

 public bool DisconnectAsync(SocketAsyncEventArgs e)
 public bool DisconnectAsync(SocketAsyncEventArgs e) => DisconnectAsync(e, default);

 private bool DisconnectAsync(SocketAsyncEventArgs e, CancellationToken cancellationToken)
 {
 // Throw if socket disposed
 ThrowIfDisposed();
Expand All@@ -2904,7 +2846,7 @@ public bool DisconnectAsync(SocketAsyncEventArgs e)
 SocketError socketError = SocketError.Success;
 try
 {
 socketError = e.DoOperationDisconnect(this, _handle);
 socketError = e.DoOperationDisconnect(this, _handle, cancellationToken);
 }
 catch
 {
Expand DownExpand Up@@ -3155,10 +3097,10 @@ private bool SendToAsync(SocketAsyncEventArgs e, CancellationToken cancellationT

 return socketError == SocketError.IOPending;
 }
 #endregion
 #endregion

 #region Internal and private properties
 //
 // Internal and private properties
 //

 private CacheSet Caches
 {
Expand All@@ -3174,9 +3116,10 @@ private CacheSet Caches
 }

 internal bool Disposed => _disposed != 0;
 #endregion

 #region Internal and private methods
 //
 // Internal and private methods
 //

 internal static void GetIPProtocolInformation(AddressFamily addressFamily, Internals.SocketAddress socketAddress, out bool isIPv4, out bool isIPv6)
 {
Expand DownExpand Up@@ -3889,6 +3832,16 @@ private static SocketError GetSocketErrorFromFaultedTask(Task t)
 };
 }

 #endregion
 // Helper to maintain existing behavior of Socket APM methods to throw synchronously from Begin*.
 private static IAsyncResult TaskToApmBeginWithSyncExceptions(Task task, AsyncCallback? callback, object? state)
 {
 if (task.IsFaulted)
 {
 task.GetAwaiter().GetResult();
 Debug.Fail("Task faulted but GetResult did not throw???");
 }

 return TaskToApm.Begin(task, callback, state);
 }
 }
}

2 changes: 1 addition & 1 deletion
src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ internal unsafe SocketError DoOperationConnect(Socket socket, SafeSocketHandle h
 return socketError;
 }

 internal SocketError DoOperationDisconnect(Socket socket, SafeSocketHandle handle)
 internal SocketError DoOperationDisconnect(Socket socket, SafeSocketHandle handle, CancellationToken cancellationToken)
 {
 SocketError socketError = SocketPal.Disconnect(socket, handle, _disconnectReuseSocket);
 FinishOperationSync(socketError, 0, SocketFlags.None);
Expand Down

10 changes: 9 additions & 1 deletion
src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -364,8 +364,11 @@ internal unsafe SocketError DoOperationConnectEx(Socket socket, SafeSocketHandle
 }
 }

 internal unsafe SocketError DoOperationDisconnect(Socket socket, SafeSocketHandle handle)
 internal unsafe SocketError DoOperationDisconnect(Socket socket, SafeSocketHandle handle, CancellationToken cancellationToken)
 {
 // Note: CancellationToken is ignored for now.
Comment thread
geoffkizer marked this conversation as resolved.

 // See https://github.com/dotnet/runtime/issues/51452

 NativeOverlapped* overlapped = AllocateNativeOverlapped();
 try
 {
Expand DownExpand Up@@ -1188,6 +1191,7 @@ private unsafe SocketError FinishOperationConnect()
 private void CompleteCore()
 {
 _strongThisRef.Value = null; // null out this reference from the overlapped so this isn't kept alive artificially

 if (_singleBufferHandleState != SingleBufferHandleState.None)
 {
 // If the state isn't None, then either it's Set, in which case there's state to cleanup,
Expand All@@ -1213,6 +1217,8 @@ void CompleteCoreSpin()
 sw.SpinOnce();
 }

 Debug.Assert(_singleBufferHandleState == SingleBufferHandleState.Set);

 // Remove any cancellation registration. First dispose the registration
 // to ensure that cancellation will either never fine or will have completed
 // firing before we continue. Only then can we safely null out the overlapped.
Expand All@@ -1223,6 +1229,8 @@ void CompleteCoreSpin()
 }

 // Release any GC handles.
 Debug.Assert(_singleBufferHandleState == SingleBufferHandleState.Set);

 if (_singleBufferHandleState == SingleBufferHandleState.Set)
 {
 _singleBufferHandleState = SingleBufferHandleState.None;
Expand Down

7 changes: 0 additions & 7 deletions
src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketPal.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1976,13 +1976,6 @@ public static SocketError AcceptAsync(Socket socket, SafeSocketHandle handle, Sa
 return socketError;
 }

 internal static SocketError DisconnectAsync(Socket socket, SafeSocketHandle handle, bool reuseSocket, DisconnectOverlappedAsyncResult asyncResult)
 {
 SocketError socketError = Disconnect(socket, handle, reuseSocket);
 asyncResult.PostCompletion(socketError);
 return socketError;
 }

 internal static SocketError Disconnect(Socket socket, SafeSocketHandle handle, bool reuseSocket)
 {
 handle.SetToDisconnected();
Expand Down
Loading