gsadmin/ssh.net
1
0
Fork 0
mirror of https://github.com/sshnet/SSH.NET.git synced 2026-09-10 09:15:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduces heap allocations for the some byte[] uses (#1272)

Browse Source
This commit is contained in:
Jacob Slusser
2023-12-11 01:07:32 -08:00
committed by GitHub
parent f172ac587c
commit f4371ffccc
2 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Renci.SshNet/Common/SshData.cs
+2 -2
View File
@@ -221,7 +221,7 @@ namespace Renci.SshNet.Common
/// <exception cref="InvalidOperationException">Attempt to read past the end of the stream.</exception>
protected uint ReadUInt32()
{
return Pack.BigEndianToUInt32(ReadBytes(4));
return _stream.ReadUInt32();
}
/// <summary>
@@ -233,7 +233,7 @@ namespace Renci.SshNet.Common
/// <exception cref="InvalidOperationException">Attempt to read past the end of the stream.</exception>
protected ulong ReadUInt64()
{
return Pack.BigEndianToUInt64(ReadBytes(8));
return _stream.ReadUInt64();
}
/// <summary>
src/Renci.SshNet/Common/SshDataStream.cs
+28
View File
@@ -188,8 +188,14 @@ namespace Renci.SshNet.Common
/// </returns>
public uint ReadUInt32()
{
#if NETSTANDARD2_1_OR_GREATER || NET6_0_OR_GREATER
Span<byte> span = stackalloc byte[4];
ReadBytes(span);
return System.Buffers.Binary.BinaryPrimitives.ReadUInt32BigEndian(span);
#else
var data = ReadBytes(4);
return Pack.BigEndianToUInt32(data);
#endif // NETSTANDARD2_1_OR_GREATER || NET6_0_OR_GREATER
}
/// <summary>
@@ -200,8 +206,14 @@ namespace Renci.SshNet.Common
/// </returns>
public ulong ReadUInt64()
{
#if NETSTANDARD2_1_OR_GREATER || NET6_0_OR_GREATER
Span<byte> span = stackalloc byte[8];
ReadBytes(span);
return System.Buffers.Binary.BinaryPrimitives.ReadUInt64BigEndian(span);
#else
var data = ReadBytes(8);
return Pack.BigEndianToUInt64(data);
#endif // NETSTANDARD2_1_OR_GREATER || NET6_0_OR_GREATER
}
/// <summary>
@@ -264,5 +276,21 @@ namespace Renci.SshNet.Common
return data;
}
#if NETSTANDARD2_1 || NET6_0_OR_GREATER
/// <summary>
/// Reads data into the specified <paramref name="buffer" />.
/// </summary>
/// <param name="buffer">The buffer to read into.</param>
/// <exception cref="ArgumentOutOfRangeException"><paramref name="buffer"/> is larger than the total of bytes available.</exception>
private void ReadBytes(Span<byte> buffer)
{
var bytesRead = Read(buffer);
if (bytesRead < buffer.Length)
{
throw new ArgumentOutOfRangeException(nameof(buffer), string.Format(CultureInfo.InvariantCulture, "The requested length ({0}) is greater than the actual number of bytes read ({1}).", buffer.Length, bytesRead));
}
}
#endif // NETSTANDARD2_1 || NET6_0_OR_GREATER
}
}