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

REFACTOR: Possible loss of fraction.

Browse Source
This commit is contained in:
Natalia Portillo
2017-12-21 17:02:40 +00:00
parent f65de10280
commit e06c140e45
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
DiscImageChef.Core/Benchmark.cs
View File

@@ -111,7 +111,7 @@ namespace DiscImageChef.Core
end = DateTime.Now; end = DateTime.Now;
results.FillTime = (end - start).TotalSeconds; results.FillTime = (end - start).TotalSeconds;
results.FillSpeed = bufferSize / 1048576 / (end - start).TotalSeconds; results.FillSpeed = bufferSize / 1048576.0 / (end - start).TotalSeconds;
ms.Seek(0, SeekOrigin.Begin); ms.Seek(0, SeekOrigin.Begin);
mem = GC.GetTotalMemory(false); mem = GC.GetTotalMemory(false);
@@ -133,7 +133,7 @@ namespace DiscImageChef.Core
if(mem < results.MinMemory) results.MinMemory = mem; if(mem < results.MinMemory) results.MinMemory = mem;
results.ReadTime = (end - start).TotalSeconds; results.ReadTime = (end - start).TotalSeconds;
results.ReadSpeed = bufferSize / 1048576 / (end - start).TotalSeconds; results.ReadSpeed = bufferSize / 1048576.0 / (end - start).TotalSeconds;
#region Adler32 #region Adler32
ctx = new Adler32Context(); ctx = new Adler32Context();
@@ -163,7 +163,7 @@ namespace DiscImageChef.Core
new BenchmarkEntry new BenchmarkEntry
{ {
TimeSpan = (end - start).TotalSeconds, TimeSpan = (end - start).TotalSeconds,
Speed = bufferSize / 1048576 / (end - start).TotalSeconds Speed = bufferSize / 1048576.0 / (end - start).TotalSeconds
}); });
results.SeparateTime += (end - start).TotalSeconds; results.SeparateTime += (end - start).TotalSeconds;
#endregion Adler32 #endregion Adler32
@@ -196,7 +196,7 @@ namespace DiscImageChef.Core
new BenchmarkEntry new BenchmarkEntry
{ {
TimeSpan = (end - start).TotalSeconds, TimeSpan = (end - start).TotalSeconds,
Speed = bufferSize / 1048576 / (end - start).TotalSeconds Speed = bufferSize / 1048576.0 / (end - start).TotalSeconds
}); });
results.SeparateTime += (end - start).TotalSeconds; results.SeparateTime += (end - start).TotalSeconds;
#endregion CRC16 #endregion CRC16
@@ -229,7 +229,7 @@ namespace DiscImageChef.Core
new BenchmarkEntry new BenchmarkEntry
{ {
TimeSpan = (end - start).TotalSeconds, TimeSpan = (end - start).TotalSeconds,
Speed = bufferSize / 1048576 / (end - start).TotalSeconds Speed = bufferSize / 1048576.0 / (end - start).TotalSeconds
}); });
results.SeparateTime += (end - start).TotalSeconds; results.SeparateTime += (end - start).TotalSeconds;
#endregion CRC32 #endregion CRC32
@@ -262,7 +262,7 @@ namespace DiscImageChef.Core
new BenchmarkEntry new BenchmarkEntry
{ {
TimeSpan = (end - start).TotalSeconds, TimeSpan = (end - start).TotalSeconds,
Speed = bufferSize / 1048576 / (end - start).TotalSeconds Speed = bufferSize / 1048576.0 / (end - start).TotalSeconds
}); });
results.SeparateTime += (end - start).TotalSeconds; results.SeparateTime += (end - start).TotalSeconds;
#endregion CRC64 #endregion CRC64
@@ -295,7 +295,7 @@ namespace DiscImageChef.Core
new BenchmarkEntry new BenchmarkEntry
{ {
TimeSpan = (end - start).TotalSeconds, TimeSpan = (end - start).TotalSeconds,
Speed = bufferSize / 1048576 / (end - start).TotalSeconds Speed = bufferSize / 1048576.0 / (end - start).TotalSeconds
}); });
results.SeparateTime += (end - start).TotalSeconds; results.SeparateTime += (end - start).TotalSeconds;
#endregion MD5 #endregion MD5
@@ -328,7 +328,7 @@ namespace DiscImageChef.Core
new BenchmarkEntry new BenchmarkEntry
{ {
TimeSpan = (end - start).TotalSeconds, TimeSpan = (end - start).TotalSeconds,
Speed = bufferSize / 1048576 / (end - start).TotalSeconds Speed = bufferSize / 1048576.0 / (end - start).TotalSeconds
}); });
results.SeparateTime += (end - start).TotalSeconds; results.SeparateTime += (end - start).TotalSeconds;
#endregion RIPEMD160 #endregion RIPEMD160
@@ -361,7 +361,7 @@ namespace DiscImageChef.Core
new BenchmarkEntry new BenchmarkEntry
{ {
TimeSpan = (end - start).TotalSeconds, TimeSpan = (end - start).TotalSeconds,
Speed = bufferSize / 1048576 / (end - start).TotalSeconds Speed = bufferSize / 1048576.0 / (end - start).TotalSeconds
}); });
results.SeparateTime += (end - start).TotalSeconds; results.SeparateTime += (end - start).TotalSeconds;
#endregion SHA1 #endregion SHA1
@@ -394,7 +394,7 @@ namespace DiscImageChef.Core
new BenchmarkEntry new BenchmarkEntry
{ {
TimeSpan = (end - start).TotalSeconds, TimeSpan = (end - start).TotalSeconds,
Speed = bufferSize / 1048576 / (end - start).TotalSeconds Speed = bufferSize / 1048576.0 / (end - start).TotalSeconds
}); });
results.SeparateTime += (end - start).TotalSeconds; results.SeparateTime += (end - start).TotalSeconds;
#endregion SHA256 #endregion SHA256
@@ -427,7 +427,7 @@ namespace DiscImageChef.Core
new BenchmarkEntry new BenchmarkEntry
{ {
TimeSpan = (end - start).TotalSeconds, TimeSpan = (end - start).TotalSeconds,
Speed = bufferSize / 1048576 / (end - start).TotalSeconds Speed = bufferSize / 1048576.0 / (end - start).TotalSeconds
}); });
results.SeparateTime += (end - start).TotalSeconds; results.SeparateTime += (end - start).TotalSeconds;
#endregion SHA384 #endregion SHA384
@@ -460,7 +460,7 @@ namespace DiscImageChef.Core
new BenchmarkEntry new BenchmarkEntry
{ {
TimeSpan = (end - start).TotalSeconds, TimeSpan = (end - start).TotalSeconds,
Speed = bufferSize / 1048576 / (end - start).TotalSeconds Speed = bufferSize / 1048576.0 / (end - start).TotalSeconds
}); });
results.SeparateTime += (end - start).TotalSeconds; results.SeparateTime += (end - start).TotalSeconds;
#endregion SHA512 #endregion SHA512
@@ -493,7 +493,7 @@ namespace DiscImageChef.Core
new BenchmarkEntry new BenchmarkEntry
{ {
TimeSpan = (end - start).TotalSeconds, TimeSpan = (end - start).TotalSeconds,
Speed = bufferSize / 1048576 / (end - start).TotalSeconds Speed = bufferSize / 1048576.0 / (end - start).TotalSeconds
}); });
results.SeparateTime += (end - start).TotalSeconds; results.SeparateTime += (end - start).TotalSeconds;
#endregion SpamSum #endregion SpamSum
@@ -523,7 +523,7 @@ namespace DiscImageChef.Core
if(mem < results.MinMemory) results.MinMemory = mem; if(mem < results.MinMemory) results.MinMemory = mem;
results.EntropyTime = (end - start).TotalSeconds; results.EntropyTime = (end - start).TotalSeconds;
results.EntropySpeed = bufferSize / 1048576 / (end - start).TotalSeconds; results.EntropySpeed = bufferSize / 1048576.0 / (end - start).TotalSeconds;
#endregion Entropy #endregion Entropy
#region Multitasking #region Multitasking
@@ -549,10 +549,10 @@ namespace DiscImageChef.Core
if(mem < results.MinMemory) results.MinMemory = mem; if(mem < results.MinMemory) results.MinMemory = mem;
results.TotalTime = (end - start).TotalSeconds; results.TotalTime = (end - start).TotalSeconds;
results.TotalSpeed = bufferSize / 1048576 / results.TotalTime; results.TotalSpeed = bufferSize / 1048576.0 / results.TotalTime;
#endregion #endregion
results.SeparateSpeed = bufferSize / 1048576 / results.SeparateTime; results.SeparateSpeed = bufferSize / 1048576.0 / results.SeparateTime;
return results; return results;
} }

4
DiscImageChef.DiscImages/VHD.cs
View File

@@ -1048,7 +1048,7 @@ namespace DiscImageChef.DiscImages
case TYPE_DIFFERENCING: case TYPE_DIFFERENCING:
{ {
// Block number for BAT searching // Block number for BAT searching
uint blockNumber = (uint)Math.Floor((double)(sectorAddress / (thisDynamic.BlockSize / 512))); uint blockNumber = (uint)Math.Floor((sectorAddress / (thisDynamic.BlockSize / 512.0)));
// Sector number inside of block // Sector number inside of block
uint sectorInBlock = (uint)(sectorAddress % (thisDynamic.BlockSize / 512)); uint sectorInBlock = (uint)(sectorAddress % (thisDynamic.BlockSize / 512));
@@ -1131,7 +1131,7 @@ namespace DiscImageChef.DiscImages
Stream thisStream; Stream thisStream;
// Block number for BAT searching // Block number for BAT searching
uint blockNumber = (uint)Math.Floor((double)(sectorAddress / (thisDynamic.BlockSize / 512))); uint blockNumber = (uint)Math.Floor((sectorAddress / (thisDynamic.BlockSize / 512.0)));
// Sector number inside of block // Sector number inside of block
uint sectorInBlock = (uint)(sectorAddress % (thisDynamic.BlockSize / 512)); uint sectorInBlock = (uint)(sectorAddress % (thisDynamic.BlockSize / 512));
// How many sectors before reaching end of block // How many sectors before reaching end of block