mobiletools/Ffu2Vhdx
0
0
Fork 0
mirror of https://github.com/MobileTooling/Ffu2Vhdx.git synced 2026-07-27 12:48:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Improve FFU Stream speed

Browse Source
This commit is contained in:
Gustave Monce
2024-09-08 19:02:23 +02:00
parent 34ff32c00a
commit 2b931e800a
1 changed files with 104 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Img2Ffu/Reader/FullFlashUpdateReaderStream.cs
+104 -81
View File
@@ -15,6 +15,8 @@ namespace Img2Ffu.Reader
private long length;
private int sectorSize;
private int minSectorCount;
private long blockSize;
private Dictionary<long, int> blockTable;
private long currentPosition = 0;
@@ -30,7 +32,8 @@ namespace Img2Ffu.Reader
image = signedImage.Image;
this.storeIndex = storeIndex;
store = image.Stores[(int)storeIndex];
length = GetStoreLength();
blockSize = store.StoreHeader.BlockSize;
(length, blockTable) = BuildBlockTable();
try
{
@@ -121,46 +124,13 @@ namespace Img2Ffu.Reader
public override long Length => length;
private long GetStoreLength()
{
long blockMaxStart = 0;
long blockMaxEnd = 0;
foreach (WriteDescriptor writeDescriptor in store.WriteDescriptors)
{
foreach (Structs.DiskLocation diskLocation in writeDescriptor.DiskLocations)
{
switch (diskLocation.DiskAccessMethod)
{
case 0:
{
if (diskLocation.BlockIndex > blockMaxStart)
{
blockMaxStart = diskLocation.BlockIndex;
}
break;
}
case 2:
{
if (diskLocation.BlockIndex > blockMaxEnd)
{
blockMaxEnd = diskLocation.BlockIndex;
}
break;
}
}
}
}
long totalBlocks = blockMaxStart + blockMaxEnd + 2;
return totalBlocks * store.StoreHeader.BlockSize;
}
private long GetBlockDataIndex(long realBlockOffset)
private (long, Dictionary<long, int>) BuildBlockTable()
{
// We do not want to immediately return because FFU files may first blank out sectors and then write post mortem
long matchedIndex = -1; // Invalid
Dictionary<long, int> blockTable = [];
long blockMaxStart = 0;
long blockMaxEnd = 0;
for (int i = 0; i < store.WriteDescriptors.Count; i++)
{
@@ -171,19 +141,37 @@ namespace Img2Ffu.Reader
{
case 0:
{
long blockOffset = diskLocation.BlockIndex;
if (blockOffset == realBlockOffset)
if (diskLocation.BlockIndex > blockMaxStart)
{
matchedIndex = i;
blockMaxStart = diskLocation.BlockIndex;
}
long blockOffset = diskLocation.BlockIndex;
if (blockTable.ContainsKey(blockOffset))
{
blockTable[blockOffset] = i;
}
else
{
blockTable.Add(blockOffset, i);
}
break;
}
case 2:
{
long blockOffset = (Length / store.StoreHeader.BlockSize) - 1 - diskLocation.BlockIndex;
if (blockOffset == realBlockOffset)
if (diskLocation.BlockIndex > blockMaxEnd)
{
matchedIndex = i;
blockMaxEnd = diskLocation.BlockIndex;
}
long blockOffset = (Length / blockSize) - 1 - diskLocation.BlockIndex;
if (blockTable.ContainsKey(blockOffset))
{
blockTable[blockOffset] = i;
}
else
{
blockTable.Add(blockOffset, i);
}
break;
}
@@ -191,13 +179,39 @@ namespace Img2Ffu.Reader
}
}
return matchedIndex;
long totalBlocks = blockMaxStart + blockMaxEnd + 2;
return (totalBlocks * blockSize, blockTable);
}
private long GetBlockDataIndex(long realBlockOffset)
{
if (blockTable.ContainsKey(realBlockOffset))
{
return blockTable[realBlockOffset];
}
return -1; // Invalid
}
public override long Position
{
get => currentPosition;
set => currentPosition = value;
set
{
if (currentPosition < 0)
{
throw new ArgumentOutOfRangeException("value");
}
// Workaround for malformed MBRs
/*if (currentPosition > Length)
{
throw new EndOfStreamException();
}*/
currentPosition = value;
}
}
public override void Flush()
@@ -207,7 +221,33 @@ namespace Img2Ffu.Reader
public override int Read(byte[] buffer, int offset, int count)
{
int readBytes = count;
if (buffer == null)
{
throw new ArgumentNullException("buffer");
}
if (offset + count > buffer.Length)
{
throw new ArgumentException("The sum of offset and count is greater than the buffer length.");
}
if (offset < 0)
{
throw new ArgumentOutOfRangeException("offset");
}
if (count < 0)
{
throw new ArgumentOutOfRangeException("count");
}
// Workaround for malformed MBRs
if (Position >= Length)
{
return count;
}
long readBytes = (long)count;
if (Position + readBytes > Length)
{
@@ -220,15 +260,13 @@ namespace Img2Ffu.Reader
// Read the buffer from the FFU file.
// First we have to figure out where do we land here.
long overflowBlockStartByteCount = Position % store.StoreHeader.BlockSize;
long overflowBlockEndByteCount = (Position + readBytes) % store.StoreHeader.BlockSize;
long overflowBlockStartByteCount = Position % blockSize;
long overflowBlockEndByteCount = (Position + readBytes) % blockSize;
long totalBlockCount = Length / store.StoreHeader.BlockSize;
long startBlockIndex = (Position - overflowBlockStartByteCount) / blockSize;
long endBlockIndex = (Position + readBytes + (blockSize - overflowBlockEndByteCount)) / blockSize;
long startBlockIndex = (Position - overflowBlockStartByteCount) / store.StoreHeader.BlockSize;
long endBlockIndex = (Position + readBytes + (store.StoreHeader.BlockSize - overflowBlockEndByteCount)) / store.StoreHeader.BlockSize;
byte[] allReadBlocks = new byte[(endBlockIndex - startBlockIndex + 1) * store.StoreHeader.BlockSize];
byte[] allReadBlocks = new byte[(endBlockIndex - startBlockIndex + 1) * blockSize];
for (long currentBlock = startBlockIndex; currentBlock < endBlockIndex; currentBlock++)
{
@@ -236,55 +274,40 @@ namespace Img2Ffu.Reader
if (virtualBlockIndex != -1)
{
byte[] block = image.GetStoreDataBlock(ffuFileStream, storeIndex, (ulong)virtualBlockIndex);
Array.Copy(block, 0, allReadBlocks, (int)((currentBlock - startBlockIndex) * store.StoreHeader.BlockSize), store.StoreHeader.BlockSize);
Array.Copy(block, 0, allReadBlocks, (int)((currentBlock - startBlockIndex) * blockSize), blockSize);
}
}
Array.Copy(allReadBlocks, overflowBlockStartByteCount, buffer, offset, readBytes);
Position += readBytes;
return readBytes;
if (Position == Length)
{
// Workaround for malformed MBRs
//return 0;
}
return (int)readBytes;
}
public override long Seek(long offset, SeekOrigin origin)
{
if (offset > Length)
{
throw new ArgumentOutOfRangeException(nameof(offset));
}
switch (origin)
{
case SeekOrigin.Begin:
{
if (offset < 0)
{
throw new IOException();
}
Position = offset;
break;
}
case SeekOrigin.Current:
{
int tempPosition = (int)Position + (int)offset;
if (tempPosition < 0)
{
throw new IOException();
}
Position = tempPosition;
Position += offset;
break;
}
case SeekOrigin.End:
{
int tempPosition = (int)Length + (int)offset;
if (tempPosition < 0)
{
throw new IOException();
}
Position = tempPosition;
Position = Length + offset;
break;
}
default: