mirror of
https://github.com/aaru-dps/Aaru.git
synced 2025-12-16 19:24:25 +00:00
* commandline:
* DiscImageChef.Settings/Settings.cs: * DiscImageChef.Settings/docs/README.txt: * DiscImageChef.Settings/packages.config: * DiscImageChef.Settings/docs/LICENSE.txt: * DiscImageChef.Settings/docs/ChangeLog.txt: * DiscImageChef.Settings/docs/mono/index.xml: * DiscImageChef.Settings/docs/html/index.html: * DiscImageChef.Settings/Properties/AssemblyInfo.cs: * DiscImageChef.Settings/DiscImageChef.Settings.csproj: * DiscImageChef.Settings/docs/mono/ns-Claunia.PropertyList.xml: * DiscImageChef.Settings/docs/mono/Claunia.PropertyList/UID.xml: * DiscImageChef.Settings/docs/html/Claunia.PropertyList/UID.html: * DiscImageChef.Settings/docs/mono/Claunia.PropertyList/NSSet.xml: * DiscImageChef.Settings/docs/html/Claunia.PropertyList/index.html: * DiscImageChef.Settings/docs/html/Claunia.PropertyList/NSSet.html: * DiscImageChef.Settings/docs/mono/Claunia.PropertyList/NSDate.xml: * DiscImageChef.Settings/docs/mono/Claunia.PropertyList/NSData.xml: * DiscImageChef.Settings/docs/html/Claunia.PropertyList/NSDate.html: * DiscImageChef.Settings/docs/html/Claunia.PropertyList/NSData.html: * DiscImageChef.Settings/docs/mono/Claunia.PropertyList/NSArray.xml: * DiscImageChef.Settings/docs/mono/Claunia.PropertyList/NSNumber.xml: * DiscImageChef.Settings/docs/mono/Claunia.PropertyList/NSString.xml: * DiscImageChef.Settings/docs/mono/Claunia.PropertyList/NSObject.xml: * DiscImageChef.Settings/docs/html/Claunia.PropertyList/NSArray.html: * DiscImageChef.Settings/docs/html/Claunia.PropertyList/NSNumber.html: * DiscImageChef.Settings/docs/html/Claunia.PropertyList/NSString.html: * DiscImageChef.Settings/docs/html/Claunia.PropertyList/NSObject.html: * DiscImageChef.Settings/docs/mono/Claunia.PropertyList/NSDictionary.xml: * DiscImageChef.Settings/docs/html/Claunia.PropertyList/NSDictionary.html: * DiscImageChef.Settings/docs/mono/Claunia.PropertyList/PropertyListParser.xml: * DiscImageChef.Settings/docs/html/Claunia.PropertyList/PropertyListParser.html: * DiscImageChef.Settings/docs/mono/Claunia.PropertyList/XmlPropertyListParser.xml: * DiscImageChef.Settings/docs/html/Claunia.PropertyList/XmlPropertyListParser.html: * DiscImageChef.Settings/docs/mono/Claunia.PropertyList/ASCIIPropertyListParser.xml: * DiscImageChef.Settings/docs/html/Claunia.PropertyList/ASCIIPropertyListParser.html: * DiscImageChef.Settings/docs/mono/Claunia.PropertyList/BinaryPropertyListParser.xml: * DiscImageChef.Settings/docs/mono/Claunia.PropertyList/BinaryPropertyListWriter.xml: * DiscImageChef.Settings/docs/html/Claunia.PropertyList/BinaryPropertyListWriter.html: * DiscImageChef.Settings/docs/html/Claunia.PropertyList/BinaryPropertyListParser.html: * DiscImageChef.Settings/docs/mono/Claunia.PropertyList/PropertyListFormatException.xml: * DiscImageChef.Settings/docs/html/Claunia.PropertyList/PropertyListFormatException.html: Added supports for settings * DiscImageChef/Commands/Configure.cs: Added support for settings. * DiscImageChef/Core/Statistics.cs: * DiscImageChef/Commands/Verify.cs: * DiscImageChef/Commands/Entropy.cs: * DiscImageChef/Commands/Formats.cs: * DiscImageChef/Commands/PrintHex.cs: * DiscImageChef/Commands/MediaInfo.cs: * DiscImageChef/Commands/Statistics.cs: Added statistics. * DiscImageChef.Decoders/SCSI/Inquiry.cs: Corrected bug on inquiry decoding. * DiscImageChef.Decoders/SCSI/Modes.cs: Corrected bug on decoding mode page 2Ah without write performance descriptors. Corrected bug when there is a vendor page 0 in mode sense decoding. * DiscImageChef.Devices/Device/Constructor.cs: Corrected detecting USB or FireWire attached CD/DVD/BD and tape drives. Try ATA identify on USB or FireWire that don't have SCSI INQUIRY. * DiscImageChef.DiscImages/CDRWin.cs: Corrected CD-ROM XA vs CD-ROM detection. * DiscImageChef.Partitions/AppleMap.cs: Corrected big endian working. Added debug output. * DiscImageChef.sln: Added supports for settings. * DiscImageChef/Commands/Decode.cs: * DiscImageChef/Commands/Analyze.cs: * DiscImageChef/Commands/Compare.cs: * DiscImageChef/Commands/Checksum.cs: * DiscImageChef/Commands/Benchmark.cs: * DiscImageChef/Commands/DeviceInfo.cs: * DiscImageChef/Commands/CreateSidecar.cs: Added statistics. * DiscImageChef/Commands/DeviceReport.cs: Added statistics. Correct handling empty inquiry string fields. Suppose it is not removable, til proved wrong. Corrected MODE SENSE (6/10) detection and calling order. If device is MMC type but reports neither mode page 2Ah neither GET CONFIGURATION, try all CDs (old drives work like that). Try reading Lead-In and Lead-Out in Audio CD using Audio READ CD commands. Corrected READ LONG information handling, some drives return 2s-complement in 32 bit. Upper 16 bits are ignored. Added support for DVD raw block (37856 bytes). Check READ LONG up to 36 times the cooked block size. That should be enough to detect huge blocked media (like DVD and BD) without taking ages. If READ LONG size had to be bruteforced, and debug is activated, save the result. * DiscImageChef/Commands/DumpMedia.cs: Added statistics. Corrected READ LONG information handling, some drives return 2s-complement in 32 bit. Upper 16 bits are ignored. Start trying with 64 blocks at a time. Some drives report to be able to read 255 at a time, but they really don't, they take a lot longer to read. * DiscImageChef/Commands/MediaScan.cs: Added statistics. Start trying with 64 blocks at a time. Some drives report to be able to read 255 at a time, but they really don't, they take a lot longer to read. * DiscImageChef/DiscImageChef.csproj: Added support for settings. Added statistics. * DiscImageChef/Main.cs: * DiscImageChef/Options.cs: Added support for settings. Added statistics.
This commit is contained in:
@@ -57,7 +57,7 @@ namespace DiscImageChef.Commands
|
||||
long mem;
|
||||
object ctx;
|
||||
double allSeparate = 0;
|
||||
|
||||
System.Collections.Generic.Dictionary<string, double> checksumTimes = new System.Collections.Generic.Dictionary<string, double>();
|
||||
|
||||
DicConsole.WriteLine();
|
||||
|
||||
@@ -125,6 +125,7 @@ namespace DiscImageChef.Commands
|
||||
DicConsole.WriteLine();
|
||||
DicConsole.WriteLine("Took {0} seconds to Adler32 buffer, {1} MiB/sec.", (end - start).TotalSeconds, (bufferSize / 1048576) / (end - start).TotalSeconds);
|
||||
allSeparate += (end - start).TotalSeconds;
|
||||
checksumTimes.Add("Adler32", (end - start).TotalSeconds);
|
||||
#endregion Adler32
|
||||
|
||||
#region CRC16
|
||||
@@ -155,6 +156,7 @@ namespace DiscImageChef.Commands
|
||||
DicConsole.WriteLine();
|
||||
DicConsole.WriteLine("Took {0} seconds to CRC16 buffer, {1} MiB/sec.", (end - start).TotalSeconds, (bufferSize / 1048576) / (end - start).TotalSeconds);
|
||||
allSeparate += (end - start).TotalSeconds;
|
||||
checksumTimes.Add("CRC16", (end - start).TotalSeconds);
|
||||
#endregion CRC16
|
||||
|
||||
#region CRC32
|
||||
@@ -185,6 +187,7 @@ namespace DiscImageChef.Commands
|
||||
DicConsole.WriteLine();
|
||||
DicConsole.WriteLine("Took {0} seconds to CRC32 buffer, {1} MiB/sec.", (end - start).TotalSeconds, (bufferSize / 1048576) / (end - start).TotalSeconds);
|
||||
allSeparate += (end - start).TotalSeconds;
|
||||
checksumTimes.Add("CRC32", (end - start).TotalSeconds);
|
||||
#endregion CRC32
|
||||
|
||||
#region CRC64
|
||||
@@ -215,6 +218,7 @@ namespace DiscImageChef.Commands
|
||||
DicConsole.WriteLine();
|
||||
DicConsole.WriteLine("Took {0} seconds to CRC64 buffer, {1} MiB/sec.", (end - start).TotalSeconds, (bufferSize / 1048576) / (end - start).TotalSeconds);
|
||||
allSeparate += (end - start).TotalSeconds;
|
||||
checksumTimes.Add("CRC64", (end - start).TotalSeconds);
|
||||
#endregion CRC64
|
||||
|
||||
#region Fletcher32
|
||||
@@ -244,7 +248,8 @@ namespace DiscImageChef.Commands
|
||||
|
||||
DicConsole.WriteLine();
|
||||
DicConsole.WriteLine("Took {0} seconds to Fletcher32 buffer, {1} MiB/sec.", (end - start).TotalSeconds, (bufferSize / 1048576) / (end - start).TotalSeconds);
|
||||
allSeparate += (end-start).TotalSeconds;*/
|
||||
allSeparate += (end-start).TotalSeconds;
|
||||
checksumTimes.Add("Fletcher32", (end - start).TotalSeconds);*/
|
||||
#endregion Fletcher32
|
||||
|
||||
#region MD5
|
||||
@@ -275,6 +280,7 @@ namespace DiscImageChef.Commands
|
||||
DicConsole.WriteLine();
|
||||
DicConsole.WriteLine("Took {0} seconds to MD5 buffer, {1} MiB/sec.", (end - start).TotalSeconds, (bufferSize / 1048576) / (end - start).TotalSeconds);
|
||||
allSeparate += (end - start).TotalSeconds;
|
||||
checksumTimes.Add("MD5", (end - start).TotalSeconds);
|
||||
#endregion MD5
|
||||
|
||||
#region RIPEMD160
|
||||
@@ -305,6 +311,7 @@ namespace DiscImageChef.Commands
|
||||
DicConsole.WriteLine();
|
||||
DicConsole.WriteLine("Took {0} seconds to RIPEMD160 buffer, {1} MiB/sec.", (end - start).TotalSeconds, (bufferSize / 1048576) / (end - start).TotalSeconds);
|
||||
allSeparate += (end - start).TotalSeconds;
|
||||
checksumTimes.Add("RIPEMD160", (end - start).TotalSeconds);
|
||||
#endregion RIPEMD160
|
||||
|
||||
#region SHA1
|
||||
@@ -335,6 +342,7 @@ namespace DiscImageChef.Commands
|
||||
DicConsole.WriteLine();
|
||||
DicConsole.WriteLine("Took {0} seconds to SHA1 buffer, {1} MiB/sec.", (end - start).TotalSeconds, (bufferSize / 1048576) / (end - start).TotalSeconds);
|
||||
allSeparate += (end - start).TotalSeconds;
|
||||
checksumTimes.Add("SHA1", (end - start).TotalSeconds);
|
||||
#endregion SHA1
|
||||
|
||||
#region SHA256
|
||||
@@ -365,6 +373,7 @@ namespace DiscImageChef.Commands
|
||||
DicConsole.WriteLine();
|
||||
DicConsole.WriteLine("Took {0} seconds to SHA256 buffer, {1} MiB/sec.", (end - start).TotalSeconds, (bufferSize / 1048576) / (end - start).TotalSeconds);
|
||||
allSeparate += (end - start).TotalSeconds;
|
||||
checksumTimes.Add("SHA256", (end - start).TotalSeconds);
|
||||
#endregion SHA256
|
||||
|
||||
#region SHA384
|
||||
@@ -395,6 +404,7 @@ namespace DiscImageChef.Commands
|
||||
DicConsole.WriteLine();
|
||||
DicConsole.WriteLine("Took {0} seconds to SHA384 buffer, {1} MiB/sec.", (end - start).TotalSeconds, (bufferSize / 1048576) / (end - start).TotalSeconds);
|
||||
allSeparate += (end - start).TotalSeconds;
|
||||
checksumTimes.Add("SHA384", (end - start).TotalSeconds);
|
||||
#endregion SHA384
|
||||
|
||||
#region SHA512
|
||||
@@ -425,6 +435,7 @@ namespace DiscImageChef.Commands
|
||||
DicConsole.WriteLine();
|
||||
DicConsole.WriteLine("Took {0} seconds to SHA512 buffer, {1} MiB/sec.", (end - start).TotalSeconds, (bufferSize / 1048576) / (end - start).TotalSeconds);
|
||||
allSeparate += (end - start).TotalSeconds;
|
||||
checksumTimes.Add("SHA512", (end - start).TotalSeconds);
|
||||
#endregion SHA512
|
||||
|
||||
#region SpamSum
|
||||
@@ -455,6 +466,7 @@ namespace DiscImageChef.Commands
|
||||
DicConsole.WriteLine();
|
||||
DicConsole.WriteLine("Took {0} seconds to SpamSum buffer, {1} MiB/sec.", (end - start).TotalSeconds, (bufferSize / 1048576) / (end - start).TotalSeconds);
|
||||
allSeparate += (end - start).TotalSeconds;
|
||||
checksumTimes.Add("SpamSum", (end - start).TotalSeconds);
|
||||
#endregion SpamSum
|
||||
|
||||
#region Entropy
|
||||
@@ -489,6 +501,7 @@ namespace DiscImageChef.Commands
|
||||
|
||||
DicConsole.WriteLine();
|
||||
DicConsole.WriteLine("Took {0} seconds to entropy buffer, {1} MiB/sec.", (end - start).TotalSeconds, (bufferSize / 1048576) / (end - start).TotalSeconds);
|
||||
double entropyTime = (end - start).TotalSeconds;
|
||||
#endregion Entropy
|
||||
|
||||
#region Multitasking
|
||||
@@ -657,6 +670,9 @@ namespace DiscImageChef.Commands
|
||||
DicConsole.WriteLine();
|
||||
DicConsole.WriteLine("Max memory used is {0} bytes", maxMemory);
|
||||
DicConsole.WriteLine("Min memory used is {0} bytes", minMemory);
|
||||
|
||||
Core.Statistics.AddCommand("benchmark");
|
||||
Core.Statistics.AddBenchmark(checksumTimes, entropyTime, (end - start).TotalSeconds, allSeparate, maxMemory, minMemory);
|
||||
}
|
||||
|
||||
#region Threading helpers
|
||||
|
||||
Reference in New Issue
Block a user