Revert "Revert "relieve gc pressure maybe"" (without caching addresses this time)

This reverts commit 5d2b25bccb.
This commit is contained in:
Loporrit
2024-02-14 05:34:12 +00:00
parent 5d2b25bccb
commit 0f661c9c69
5 changed files with 88 additions and 77 deletions

View File

@@ -1,16 +1,16 @@
using Dalamud.Game.ClientState.Objects.SubKinds;
using System.Security.Cryptography;
using System.Security.Cryptography;
using System.Text;
namespace MareSynchronos.Utils;
public static class Crypto
{
#pragma warning disable SYSLIB0021 // Type or member is obsolete
private static readonly Dictionary<string, string> _hashListSHA1 = new(StringComparer.Ordinal);
private static readonly Dictionary<string, string> _hashListSHA256 = new(StringComparer.Ordinal);
#pragma warning disable SYSLIB0021 // Type or member is obsolete
private static readonly SHA256CryptoServiceProvider _sha256CryptoProvider = new();
private static readonly SHA1CryptoServiceProvider _sha1CryptoProvider = new();
public static string GetFileHash(this string filePath)
{
@@ -28,21 +28,12 @@ public static class Crypto
return GetOrComputeHashSHA256(stringToHash);
}
public static string GetHash256(this PlayerCharacter character)
{
var charName = character.Name + character.HomeWorld.Id.ToString();
return GetOrComputeHashSHA256(charName);
}
private static string GetOrComputeHashSHA1(string stringToCompute)
{
if (_hashListSHA1.TryGetValue(stringToCompute, out var hash))
return hash;
using SHA1CryptoServiceProvider cryptoProvider = new();
var computedHash = BitConverter.ToString(cryptoProvider.ComputeHash(Encoding.UTF8.GetBytes(stringToCompute))).Replace("-", "", StringComparison.Ordinal);
_hashListSHA1[stringToCompute] = computedHash;
return computedHash;
return _hashListSHA1[stringToCompute] = BitConverter.ToString(_sha1CryptoProvider.ComputeHash(Encoding.UTF8.GetBytes(stringToCompute))).Replace("-", "", StringComparison.Ordinal);
}
private static string GetOrComputeHashSHA256(string stringToCompute)
@@ -50,10 +41,7 @@ public static class Crypto
if (_hashListSHA256.TryGetValue(stringToCompute, out var hash))
return hash;
using SHA256CryptoServiceProvider cryptoProvider = new();
var computedHash = BitConverter.ToString(cryptoProvider.ComputeHash(Encoding.UTF8.GetBytes(stringToCompute))).Replace("-", "", StringComparison.Ordinal);
_hashListSHA256[stringToCompute] = computedHash;
return computedHash;
return _hashListSHA256[stringToCompute] = BitConverter.ToString(_sha256CryptoProvider.ComputeHash(Encoding.UTF8.GetBytes(stringToCompute))).Replace("-", "", StringComparison.Ordinal);
}
#pragma warning restore SYSLIB0021 // Type or member is obsolete