Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor old APM [Begin/End]Accept methods on top of Task APIs, and enable for Unix as well #51212

Merged
merged 7 commits into from
Apr 26, 2021
Merged

refactor old APM [Begin/End]Accept methods on top of Task APIs, and enable for Unix as well #51212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dfdb557
refactor old APM [Begin/End]Accept methods on top of Task APIs, and e…
Apr 14, 2021
72a3651
fix BeginAccept to throw synchronously, and relevant test changes
Apr 18, 2021
e53e896
fix AcceptReceive test to run on unix too
Apr 18, 2021
3a1b865
dispose accepted socket if receive throws
Apr 18, 2021
27305b2
remove CallbackClosure cache
Apr 18, 2021
9378d1d
fix test helper to indicate AcceptReceive with EAP is still only supp…
Apr 18, 2021
c9b31af
rip out TaskToApmBeginWithSyncExceptions and adjust tests
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
3 changes: 0 additions & 3 deletions src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
<Compile Include="System\Net\Sockets\TransmitFileOptions.cs" />
<Compile Include="System\Net\Sockets\UDPClient.cs" />
<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\UnixDomainSocketEndPoint.cs" />
<!-- Logging -->
Expand Down Expand Up @@ -89,7 +88,6 @@
</ItemGroup>
<ItemGroup Condition="'$(TargetsWindows)' == 'true'">
<!-- Windows: CoreCLR -->
<Compile Include="System\Net\Sockets\AcceptOverlappedAsyncResult.Windows.cs" />
<Compile Include="System\Net\Sockets\BaseOverlappedAsyncResult.Windows.cs" />
<Compile Include="System\Net\Sockets\DynamicWinsockMethods.cs" />
<Compile Include="System\Net\Sockets\SafeSocketHandle.Windows.cs" />
Expand Down Expand Up @@ -184,7 +182,6 @@
Link="Common\System\Net\CompletionPortHelper.Windows.cs" />
</ItemGroup>
<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\SafeSocketHandle.Unix.cs" />
<Compile Include="System\Net\Sockets\Socket.Unix.cs" />
Expand Down
54 changes: 0 additions & 54 deletions src/libraries/System.Net.Sockets/src/System/Net/Sockets/AcceptOverlappedAsyncResult.Unix.cs
View file
Open in desktop

This file was deleted.

134 changes: 0 additions & 134 deletions ...ibraries/System.Net.Sockets/src/System/Net/Sockets/AcceptOverlappedAsyncResult.Windows.cs
View file
Open in desktop

This file was deleted.

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

This file was deleted.

20 changes: 0 additions & 20 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 @@ -27,26 +27,6 @@ public SocketInformation DuplicateAndClose(int targetProcessId)
throw new PlatformNotSupportedException(SR.net_sockets_duplicateandclose_notsupported);
}

public IAsyncResult BeginAccept(int receiveSize, AsyncCallback? callback, object? state)
{
throw new PlatformNotSupportedException(SR.net_sockets_accept_receive_apm_notsupported);
}

public IAsyncResult BeginAccept(Socket? acceptSocket, int receiveSize, AsyncCallback? callback, object? state)
{
throw new PlatformNotSupportedException(SR.net_sockets_accept_receive_apm_notsupported);
}

public Socket EndAccept(out byte[] buffer, IAsyncResult asyncResult)
{
throw new PlatformNotSupportedException(SR.net_sockets_accept_receive_apm_notsupported);
}

public Socket EndAccept(out byte[] buffer, out int bytesTransferred, IAsyncResult asyncResult)
{
throw new PlatformNotSupportedException(SR.net_sockets_accept_receive_apm_notsupported);
}

internal bool PreferInlineCompletions
{
get => _handle.PreferInlineCompletions;
Expand Down
27 changes: 2 additions & 25 deletions src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.Windows.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using System.IO;
using System.Runtime.CompilerServices;
using System.Threading;
using System.Threading.Tasks;
using System.Runtime.Versioning;

namespace System.Net.Sockets
Expand Down Expand Up @@ -145,30 +146,6 @@ public SocketInformation DuplicateAndClose(int targetProcessId)
return info;
}

public IAsyncResult BeginAccept(int receiveSize, AsyncCallback? callback, object? state)
{
return BeginAccept(acceptSocket: null, receiveSize, callback, state);
}

// This is the truly async version that uses AcceptEx.
public IAsyncResult BeginAccept(Socket? acceptSocket, int receiveSize, AsyncCallback? callback, object? state)
{
return BeginAcceptCommon(acceptSocket, receiveSize, callback, state);
}

public Socket EndAccept(out byte[] buffer, IAsyncResult asyncResult)
{
Socket socket = EndAccept(out byte[] innerBuffer, out int bytesTransferred, asyncResult);
buffer = new byte[bytesTransferred];
Buffer.BlockCopy(innerBuffer, 0, buffer, 0, bytesTransferred);
return socket;
}

public Socket EndAccept(out byte[] buffer, out int bytesTransferred, IAsyncResult asyncResult)
{
return EndAcceptCommon(out buffer!, out bytesTransferred, asyncResult);
}

private DynamicWinsockMethods GetDynamicWinsockMethods()
{
return _dynamicWinsockMethods ??= DynamicWinsockMethods.GetMethods(_addressFamily, _socketType, _protocolType);
Expand Down Expand Up @@ -439,7 +416,7 @@ private IAsyncResult BeginSendFileInternal(string? fileName, byte[]? preBuffer,
throw new SocketException((int)errorCode);
}

asyncResult.FinishPostingAsyncOp(ref Caches.SendClosureCache);
asyncResult.FinishPostingAsyncOp();

return asyncResult;
}
Expand Down
Loading