mirrors/LibHac
1
0
Fork 0
mirror of https://github.com/Thealexbarney/LibHac.git synced 2024-11-14 10:49:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Slightly speed up IntegrityVerificationStorage

Browse source
This commit is contained in:
Alex Barney 2019-01-21 12:57:40 -06:00
parent 39f952015f
commit b6964589fa
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/LibHac/IO/IntegrityVerificationStorage.cs
View file

@ -31,6 +31,7 @@ namespace LibHac.IO
BlockValidities = new Validity[SectorCount]; BlockValidities = new Validity[SectorCount];
} }
// todo Take short path when integrity checks are disabled
private void ReadImpl(Span<byte> destination, long offset, IntegrityCheckLevel integrityCheckLevel) private void ReadImpl(Span<byte> destination, long offset, IntegrityCheckLevel integrityCheckLevel)
{ {
int count = destination.Length; int count = destination.Length;
@ -38,15 +39,29 @@ namespace LibHac.IO
if (count < 0 || count > SectorSize) if (count < 0 || count > SectorSize)
throw new ArgumentOutOfRangeException(nameof(destination), "Length is invalid."); throw new ArgumentOutOfRangeException(nameof(destination), "Length is invalid.");
Span<byte> hashBuffer = stackalloc byte[DigestSize];
long blockIndex = offset / SectorSize; long blockIndex = offset / SectorSize;
long hashPos = blockIndex * DigestSize;
if (BlockValidities[blockIndex] == Validity.Invalid && integrityCheckLevel == IntegrityCheckLevel.ErrorOnInvalid) if (BlockValidities[blockIndex] == Validity.Invalid && integrityCheckLevel == IntegrityCheckLevel.ErrorOnInvalid)
{ {
throw new InvalidDataException("Hash error!"); throw new InvalidDataException("Hash error!");
} }
if (Type != IntegrityStorageType.Save && integrityCheckLevel == IntegrityCheckLevel.None)
{
BaseStorage.Read(destination, offset);
return;
}
if (BlockValidities[blockIndex] != Validity.Unchecked)
{
BaseStorage.Read(destination, offset);
return;
}
Span<byte> hashBuffer = stackalloc byte[DigestSize];
long hashPos = blockIndex * DigestSize;
HashStorage.Read(hashBuffer, hashPos); HashStorage.Read(hashBuffer, hashPos);
if (Type == IntegrityStorageType.Save && Util.IsEmpty(hashBuffer)) if (Type == IntegrityStorageType.Save && Util.IsEmpty(hashBuffer))
@ -59,10 +74,9 @@ namespace LibHac.IO
byte[] dataBuffer = ArrayPool<byte>.Shared.Rent(SectorSize); byte[] dataBuffer = ArrayPool<byte>.Shared.Rent(SectorSize);
try try
{ {
BaseStorage.Read(dataBuffer, offset, count, 0); BaseStorage.Read(destination, offset);
dataBuffer.AsSpan(0, count).CopyTo(destination); destination.CopyTo(dataBuffer);
if (integrityCheckLevel == IntegrityCheckLevel.None) return;
if (BlockValidities[blockIndex] != Validity.Unchecked) return; if (BlockValidities[blockIndex] != Validity.Unchecked) return;
int bytesToHash = SectorSize; int bytesToHash = SectorSize;