Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 5.6k
adding span version of ReceiveMessageFrom#46285
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.
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
Uh oh!
There was an error while loading. Please reload this page.
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
24d5af0
adding span version of ReceiveMessageFrom
ovebastiansen 8facd83
Started using new testsetup for the receivemessagefrom
ovebastiansen ac76468
removed code duplication in socketpal.windows
ovebastiansen 2efca1e
removed unused buffers parameter
ovebastiansen 57c84d3
adding non-zero offset to the ReceiveMessageFrom test
ovebastiansen e106a97
added documentation
ovebastiansen 5e7a035
offset fix for EAP tests
ovebastiansen 871f535
fixing pr comments
ovebastiansen File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
94 changes: 94 additions & 0 deletions
94 src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 67 additions & 3 deletions
70 src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncContext.Unix.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 28 additions & 1 deletion
29 src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketPal.Unix.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 8 additions & 3 deletions
11 src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketPal.Windows.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -451,14 +451,19 @@ public static unsafe IPPacketInformation GetIPPacketInformation(Interop.Winsock. | ||
| } | ||
| public static unsafe SocketError ReceiveMessageFrom(Socket socket, SafeSocketHandle handle, byte[] buffer, int offset, int size, ref SocketFlags socketFlags, Internals.SocketAddress socketAddress, out Internals.SocketAddress receiveAddress, out IPPacketInformation ipPacketInformation, out int bytesTransferred) | ||
| { | ||
| return ReceiveMessageFrom(socket, handle, new Span<byte>(buffer, offset, size), ref socketFlags, socketAddress, out receiveAddress, out ipPacketInformation, out bytesTransferred); | ||
| } | ||
| public static unsafe SocketError ReceiveMessageFrom(Socket socket, SafeSocketHandle handle, Span<byte> buffer, ref SocketFlags socketFlags, Internals.SocketAddress socketAddress, out Internals.SocketAddress receiveAddress, out IPPacketInformation ipPacketInformation, out int bytesTransferred) | ||
ovebastiansen marked this conversation as resolved.
Outdated
Uh oh!There was an error while loading. Please reload this page. | ||
| { | ||
| bool ipv4, ipv6; | ||
| Socket.GetIPProtocolInformation(socket.AddressFamily, socketAddress, out ipv4, out ipv6); | ||
| bytesTransferred = 0; | ||
| receiveAddress = socketAddress; | ||
| ipPacketInformation = default(IPPacketInformation); | ||
| fixed (byte* ptrBuffer = buffer) | ||
| fixed (byte* bufferPtr = &MemoryMarshal.GetReference(buffer)) | ||
| fixed (byte* ptrSocketAddress = socketAddress.Buffer) | ||
| { | ||
| Interop.Winsock.WSAMsg wsaMsg; | ||
| @@ -467,8 +472,8 @@ public static unsafe SocketError ReceiveMessageFrom(Socket socket, SafeSocketHan | ||
| wsaMsg.flags = socketFlags; | ||
| WSABuffer wsaBuffer; | ||
| wsaBuffer.Length = size; | ||
| wsaBuffer.Pointer = (IntPtr)(ptrBuffer + offset); | ||
| wsaBuffer.Length = buffer.Length; | ||
| wsaBuffer.Pointer = (IntPtr)bufferPtr; | ||
| wsaMsg.buffers = (IntPtr)(&wsaBuffer); | ||
| wsaMsg.count = 1; | ||
9 changes: 7 additions & 2 deletions
9 src/libraries/System.Net.Sockets/tests/FunctionalTests/ReceiveMessageFrom.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The new practice is to add xmldocs right in the dotnet/runtime PR. See 9f73188 from #45083
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, it seems like non of the other methods in this class has it, should I start the it or am I looking at the wrong place?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can check #47230 and #47229 as examples adding new methods to
Socket.cstogether with xml docs.Just copy existing docs, and modify them according to the new overload:
https://docs.microsoft.com/en-us/dotnet/api/system.net.sockets.socket.receivemessagefrom?view=net-5.0
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
took a stab at the documentation, copied from the existing, but existing is missing some of the exception actually thrown from the method, so a bit unsure if they should be added.