Skip to content

AcceptAsync with existing Socket support on Unix, Review Changes #74645

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
liveans merged 2 commits into from
Sep 20, 2022
Merged

AcceptAsync with existing Socket support on Unix, Review Changes #74645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c380d98
Update: Review Changes
liveans Aug 26, 2022
ea110a0
Update: Review changes
liveans Sep 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 10 additions & 39 deletions src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.Unix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,14 +170,17 @@ private static void ThrowMultiConnectNotSupported()
#pragma warning disable CA1822
private Socket? GetOrCreateAcceptSocket(Socket? acceptSocket, bool checkDisconnected, string propertyName, out SafeSocketHandle? handle)
{
if (acceptSocket != null && acceptSocket._handle.HasShutdownSend)
if (acceptSocket != null)
{
throw new SocketException((int)SocketError.InvalidArgument);
}
if (acceptSocket._handle.HasShutdownSend)
{
throw new SocketException((int)SocketError.InvalidArgument);
}

if (acceptSocket != null && acceptSocket._rightEndPoint != null && (!checkDisconnected || !acceptSocket._isDisconnected))
{
throw new InvalidOperationException(SR.Format(SR.net_sockets_namedmustnotbebound, propertyName));
if (acceptSocket._rightEndPoint != null && (!checkDisconnected || !acceptSocket._isDisconnected))
{
throw new InvalidOperationException(SR.Format(SR.net_sockets_namedmustnotbebound, propertyName));
}
}

handle = null;
Expand Down Expand Up @@ -273,39 +276,7 @@ internal Socket CopyStateFromSource(Socket source)
{
object? origValue = pi.GetValue(source);
object? cloneValue = pi.GetValue(this);

if (origValue is IEnumerable origEnumerable)
{
IEnumerable? cloneEnumerable = cloneValue as IEnumerable;
Debug.Assert(cloneEnumerable != null, $"{pi.Name}. Expected enumerable cloned value.");

IEnumerator e1 = origEnumerable.GetEnumerator();
try
{
IEnumerator e2 = cloneEnumerable.GetEnumerator();
try
{
while (e1.MoveNext())
{
Debug.Assert(e2.MoveNext(), $"{pi.Name}. Cloned enumerator too short.");
Debug.Assert(Equals(e1.Current, e2.Current), $"{pi.Name}. Cloned enumerator's values don't match.");
}
Debug.Assert(!e2.MoveNext(), $"{pi.Name}. Cloned enumerator too long.");
}
finally
{
(e2 as IDisposable)?.Dispose();
}
}
finally
{
(e1 as IDisposable)?.Dispose();
}
}
else
{
Debug.Assert(Equals(origValue, cloneValue), $"{pi.Name}. Expected: {origValue}, Actual: {cloneValue}");
}
Debug.Assert(Equals(origValue, cloneValue), $"{pi.Name}. Expected: {origValue}, Actual: {cloneValue}");
}
#endif
return this;
Expand Down
23 changes: 12 additions & 11 deletions src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.Unix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,20 +335,21 @@ internal void LogBuffer(int size)
private SocketError FinishOperationAccept(Internals.SocketAddress remoteSocketAddress)
{
System.Buffer.BlockCopy(_acceptBuffer!, 0, remoteSocketAddress.Buffer, 0, _acceptAddressBufferCount);
Socket? sukru = _acceptSocket;
_acceptSocket = _currentSocket!.CreateAcceptSocket(
Socket acceptedSocket = _currentSocket!.CreateAcceptSocket(
SocketPal.CreateSocket(_acceptedFileDescriptor),
_currentSocket._rightEndPoint!.Create(remoteSocketAddress));
if (sukru != null)
if (_acceptSocket is null)
{
sukru.DisposeHandle();
sukru.CopyStateFromSource(_acceptSocket);
// We keep this socket to make clean-up.
Socket temp = _acceptSocket;
_acceptSocket = sukru;
temp.ClearHandle();
temp.Dispose();
GC.SuppressFinalize(temp);
// Store the accepted socket
_acceptSocket = acceptedSocket;
}
else
{
// Copy state from the accepted socket into the caller-supplied socket and then dispose of the original.
_acceptSocket.DisposeHandle();
_acceptSocket.CopyStateFromSource(acceptedSocket);
acceptedSocket.ClearHandle();
acceptedSocket.Dispose();
}
return SocketError.Success;
}
Expand Down