Skip to content

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.

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
merged 4 commits into from
Aug 3, 2021
Merged

Use File.OpenHandle in Socket.SendFile directly #56777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
00ae72a
Directly open file handle in Windows.
huoyaoyuan Aug 3, 2021
cc9d665
Directly open file handle on Unix.
huoyaoyuan Aug 3, 2021
8a2bbc1
Dispose FileHandle.
huoyaoyuan Aug 3, 2021
83d2fec
Update scope of using.
huoyaoyuan Aug 3, 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
12 changes: 6 additions & 6 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 @@ -5,6 +5,7 @@
using System.IO;
using System.Threading.Tasks;
using System.Runtime.Versioning;
using Microsoft.Win32.SafeHandles;

namespace System.Net.Sockets
{
Expand Down Expand Up @@ -190,12 +191,11 @@ private void SendFileInternal(string? fileName, ReadOnlySpan<byte> preBuffer, Re
{
CheckTransmitFileOptions(flags);

SocketError errorCode = SocketError.Success;

// Open the file, if any
// Open it before we send the preBuffer so that any exception happens first
FileStream? fileStream = OpenFile(fileName);

SocketError errorCode = SocketError.Success;
using (fileStream)
using (SafeFileHandle? fileHandle = OpenFileHandle(fileName))
{
// Send the preBuffer, if any
// This will throw on error
Expand All @@ -205,10 +205,10 @@ private void SendFileInternal(string? fileName, ReadOnlySpan<byte> preBuffer, Re
}

// Send the file, if any
if (fileStream != null)
if (fileHandle != null)
{
// This can throw ObjectDisposedException.
errorCode = SocketPal.SendFile(_handle, fileStream);
errorCode = SocketPal.SendFile(_handle, fileHandle);
}
}

Expand Down
9 changes: 3 additions & 6 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 @@ -397,14 +397,11 @@ private Socket GetOrCreateAcceptSocket(Socket? acceptSocket, bool checkDisconnec

private void SendFileInternal(string? fileName, ReadOnlySpan<byte> preBuffer, ReadOnlySpan<byte> postBuffer, TransmitFileOptions flags)
{
// Open the file, if any
FileStream? fileStream = OpenFile(fileName);

SocketError errorCode;
using (fileStream)
{
SafeFileHandle? fileHandle = fileStream?.SafeFileHandle;

// Open the file, if any
using (SafeFileHandle? fileHandle = OpenFileHandle(fileName))
{
// This can throw ObjectDisposedException.
errorCode = SocketPal.SendFile(_handle, fileHandle, preBuffer, postBuffer, flags);
}
Expand Down
3 changes: 2 additions & 1 deletion src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
using System.Runtime.Versioning;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Win32.SafeHandles;

namespace System.Net.Sockets
{
Expand Down Expand Up @@ -3783,7 +3784,7 @@ private void ValidateBlockingMode()
partial void ValidateForMultiConnect(bool isMultiEndpoint);

// Helper for SendFile implementations
private static FileStream? OpenFile(string? name) => string.IsNullOrEmpty(name) ? null : File.OpenRead(name);
private static SafeFileHandle? OpenFileHandle(string? name) => string.IsNullOrEmpty(name) ? null : File.OpenHandle(name, FileMode.Open, FileAccess.Read);

private void UpdateReceiveSocketErrorForDisposed(ref SocketError socketError, int bytesTransferred)
{
Expand Down
7 changes: 2 additions & 5 deletions src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketPal.Unix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1172,13 +1172,10 @@ public static SocketError Send(SafeSocketHandle handle, ReadOnlySpan<byte> buffe
return errorCode;
}

public static SocketError SendFile(SafeSocketHandle handle, FileStream fileStream)
public static SocketError SendFile(SafeSocketHandle handle, SafeFileHandle fileHandle)
{
long offset = 0;
long length = fileStream.Length;

SafeFileHandle fileHandle = fileStream.SafeFileHandle;

long length = RandomAccess.GetLength(fileHandle);
long bytesTransferred = 0;

if (!handle.IsNonBlocking)
Expand Down