aaru-dps/Aaru.Server
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.Server.git synced 2025-12-16 19:24:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

REFACTOR: All refactor in DiscImageChef.DiscImages.

Browse Source
This commit is contained in:
Natalia Portillo
2017-12-22 06:55:04 +00:00
parent e87e058a11
commit 0ad9da7b3a
48 changed files with 2851 additions and 3069 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
DiscImageChef.DiscImages/QED.cs
View File

@@ -138,7 +138,7 @@ namespace DiscImageChef.DiscImages
Dictionary<ulong, byte[]> clusterCache;
Dictionary<ulong, ulong[]> l2TableCache;
uint maxCachedSectors = MAX_CACHE_SIZE / 512;
const uint MAX_CACHED_SECTORS = MAX_CACHE_SIZE / 512;
uint maxL2TableCache;
uint maxClusterCache;
@@ -309,10 +309,8 @@ namespace DiscImageChef.DiscImages
throw new ArgumentOutOfRangeException(nameof(sectorAddress),
$"Sector address {sectorAddress} not found");
byte[] sector;
// Check cache
if(sectorCache.TryGetValue(sectorAddress, out sector)) return sector;
if(sectorCache.TryGetValue(sectorAddress, out byte[] sector)) return sector;
ulong byteAddress = sectorAddress * 512;
@@ -325,9 +323,7 @@ namespace DiscImageChef.DiscImages
// TODO: Implement differential images
if(l1Table[l1Off] == 0) return new byte[512];
ulong[] l2Table;
if(!l2TableCache.TryGetValue(l1Off, out l2Table))
if(!l2TableCache.TryGetValue(l1Off, out ulong[] l2Table))
{
l2Table = new ulong[tableSize];
imageStream.Seek((long)l1Table[l1Off], SeekOrigin.Begin);
@@ -350,8 +346,7 @@ namespace DiscImageChef.DiscImages
if(offset != 0 && offset != 1)
{
byte[] cluster;
if(!clusterCache.TryGetValue(offset, out cluster))
if(!clusterCache.TryGetValue(offset, out byte[] cluster))
{
cluster = new byte[qHdr.cluster_size];
imageStream.Seek((long)offset, SeekOrigin.Begin);
@@ -365,7 +360,7 @@ namespace DiscImageChef.DiscImages
Array.Copy(cluster, (int)(byteAddress & sectorMask), sector, 0, 512);
}
if(sectorCache.Count >= maxCachedSectors) sectorCache.Clear();
if(sectorCache.Count >= MAX_CACHED_SECTORS) sectorCache.Clear();
sectorCache.Add(sectorAddress, sector);