- Notifications
You must be signed in to change notification settings - Fork5.2k
Use File.OpenHandle in Socket.SendFile directly#56777
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Uh oh!
There was an error while loading.Please reload this page.
Conversation
ghost commentedAug 3, 2021
Tagging subscribers to this area: @dotnet/ncl Issue DetailsSaves a FileStream allocation.
|
Uh oh!
There was an error while loading.Please reload this page.
Uh oh!
There was an error while loading.Please reload this page.
| // Send the file, if any | ||
| if(fileHandle!=null) | ||
| using(fileHandle) |
stephentoubAug 3, 2021 • edited
Loading Uh oh!
There was an error while loading.Please reload this page.
edited
Uh oh!
There was an error while loading.Please reload this page.
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.
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.
| SafeFileHandle?fileHandle=OpenFileHandle(fileName); | ||
| SocketErrorerrorCode; | ||
| // 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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
This can be:
SocketErrorerrorCode;using(SafeFileHandle?fileHandle=OpenFileHandle(fileName)){// This can throw ObjectDisposedException.errorCode=SocketPal.SendFile(_handle,fileHandle,preBuffer,postBuffer,flags);}
stephentoub left a comment
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.
Thanks!
# 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
…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) ...
Saves a FileStream allocation.