Use File.OpenHandle in Socket.SendFile directly #56777
Merged
Conversation
This file contains 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
ghost
added
the
community-contribution
|
Tagging subscribers to this area: @dotnet/ncl Issue DetailsSaves a FileStream allocation.
|
stephentoub
reviewed
Aug 3, 2021
stephentoub
reviewed
Aug 3, 2021
src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.Windows.cs
Show resolved
Hide resolved
stephentoub
reviewed
Aug 3, 2021
| @@ -204,11 +204,14 @@ private void SendFileInternal(string? fileName, ReadOnlySpan<byte> preBuffer, Re | |||
| Send(preBuffer); | |||
| } | |||
|
|
|||
| // Send the file, if any | |||
| if (fileHandle != null) | |||
| using (fileHandle) | |||
There was a problem hiding this comment.
This should be done earlier. The preBuffer sending above should be a part of this so that the fileHandle will be disposed if that Send throws.
stephentoub
reviewed
Aug 3, 2021
Comment on lines
401
to
408
| SafeFileHandle? fileHandle = OpenFileHandle(fileName); | ||
|
|
||
| SocketError errorCode; | ||
| // This can throw ObjectDisposedException. | ||
| errorCode = SocketPal.SendFile(_handle, fileHandle, preBuffer, postBuffer, flags); | ||
|
|
||
| using (fileHandle) | ||
| { | ||
| // This can throw ObjectDisposedException. | ||
| errorCode = SocketPal.SendFile(_handle, fileHandle, preBuffer, postBuffer, flags); | ||
| } |
There was a problem hiding this comment.
This can be:
SocketError errorCode;
using (SafeFileHandle? fileHandle = OpenFileHandle(fileName))
{
// This can throw ObjectDisposedException.
errorCode = SocketPal.SendFile(_handle, fileHandle, preBuffer, postBuffer, flags);
}
thaystg
added a commit
to thaystg/runtime
that referenced
this pull request
Aug 3, 2021
# By Camillo Toselli (1) and others # Via GitHub * origin/main: add RID for Debian 11 (dotnet#56789) [wasm] [debugger] Skip thread static field (dotnet#56749) Fix timeouts in coreroot_determinism test in GC stress mode (dotnet#56770) Use File.OpenHandle in Socket.SendFile directly (dotnet#56777) accept empty realm for digest auth (dotnet#56369) (dotnet#56455) # Conflicts: # src/mono/wasm/debugger/DebuggerTestSuite/BreakpointTests.cs # src/mono/wasm/debugger/DebuggerTestSuite/GetPropertiesTests.cs
thaystg
added a commit
to thaystg/runtime
that referenced
this pull request
Aug 4, 2021
…ger_proxy_attribute * origin/main: (340 commits) add RID for Debian 11 (dotnet#56789) [wasm] [debugger] Skip thread static field (dotnet#56749) Fix timeouts in coreroot_determinism test in GC stress mode (dotnet#56770) Use File.OpenHandle in Socket.SendFile directly (dotnet#56777) accept empty realm for digest auth (dotnet#56369) (dotnet#56455) [wasm][debugger] Create test Inherited Properties (dotnet#56754) Mark new test as incompatible with GC Mark4781_1GcStressIncompatible (dotnet#56739) Ensure MetadataEnumResult is sufficiently updated by MetaDataImport::Enum (dotnet#56756) [mono] Remove gdb xdebug and binary writer support, it hasn't worked in a while. (dotnet#56759) Update windows-requirements.md (dotnet#56476) Update doc and generic parameter name for JsonValue.GetValue (dotnet#56639) [wasm][debugger] Inspect static class (dotnet#56740) Fix stack overflow handling issue in GC stress (dotnet#56733) Use ReflectionOnly as serialization mode in case dynamic code runtime feature is not supported (dotnet#56604) Move Windows Compat pack to NuGet pack task (dotnet#56686) Fix build error when building some packages (dotnet#56767) Simplify JIT shutdown logic in crossgen2 (dotnet#56687) Fix race in crossdac publishing with PGO (dotnet#56762) Add DictionaryKeyPolicy support for EnumConverter [dotnet#47765] (dotnet#54429) Use ComWrappers in some Marshal unit-tests and update platform metadata (dotnet#56595) ...
ghost
locked as resolved and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Saves a FileStream allocation.