Move data files to solution folder.

This commit is contained in:
2021-09-28 01:39:30 +01:00
parent 856f61f7c6
commit 2a2e67997a
13 changed files with 84 additions and 112 deletions

View File

@@ -17,10 +17,18 @@
<Content Include="libAaru.Checksums.Native.so">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<None Remove="data\random"/>
<Content Include="data\random">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Aaru6.Checksums\Aaru6.Checksums.csproj"/>
</ItemGroup>
<ItemGroup>
<Folder Include="data"/>
</ItemGroup>
</Project>

View File

@@ -80,8 +80,7 @@ namespace AaruBenchmark.Checksums
{
byte[] data = new byte[1048576];
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();
@@ -101,8 +100,7 @@ namespace AaruBenchmark.Checksums
{
byte[] data = new byte[1048576];
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();
@@ -122,8 +120,7 @@ namespace AaruBenchmark.Checksums
{
byte[] data = new byte[1048576];
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();
@@ -143,8 +140,7 @@ namespace AaruBenchmark.Checksums
{
byte[] data = new byte[1048576];
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();
@@ -164,8 +160,7 @@ namespace AaruBenchmark.Checksums
{
byte[] data = new byte[1048576];
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();
@@ -185,8 +180,7 @@ namespace AaruBenchmark.Checksums
{
byte[] data = new byte[1048576];
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();
@@ -206,8 +200,7 @@ namespace AaruBenchmark.Checksums
{
byte[] data = new byte[1048576];
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();
@@ -227,8 +220,7 @@ namespace AaruBenchmark.Checksums
{
byte[] data = new byte[1048576];
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();
@@ -248,8 +240,7 @@ namespace AaruBenchmark.Checksums
{
byte[] data = new byte[1048576];
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();
@@ -276,8 +267,7 @@ namespace AaruBenchmark.Checksums
{
byte[] data = new byte[1048576];
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();
@@ -297,8 +287,7 @@ namespace AaruBenchmark.Checksums
{
byte[] data = new byte[1048576];
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();
@@ -318,8 +307,7 @@ namespace AaruBenchmark.Checksums
{
byte[] data = new byte[1048576];
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();
@@ -339,8 +327,7 @@ namespace AaruBenchmark.Checksums
{
byte[] data = new byte[1048576];
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();

View File

@@ -79,8 +79,7 @@ namespace AaruBenchmark.Checksums
{
byte[] data = new byte[1048576];
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();
@@ -100,8 +99,7 @@ namespace AaruBenchmark.Checksums
{
byte[] data = new byte[1048576];
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();
@@ -121,8 +119,7 @@ namespace AaruBenchmark.Checksums
{
byte[] data = new byte[1048576];
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();
@@ -142,8 +139,7 @@ namespace AaruBenchmark.Checksums
{
byte[] data = new byte[1048576];
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();
@@ -163,8 +159,7 @@ namespace AaruBenchmark.Checksums
{
byte[] data = new byte[1048576];
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();
@@ -184,8 +179,7 @@ namespace AaruBenchmark.Checksums
{
byte[] data = new byte[1048576];
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();
@@ -205,8 +199,7 @@ namespace AaruBenchmark.Checksums
{
byte[] data = new byte[1048576];
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();
@@ -226,8 +219,7 @@ namespace AaruBenchmark.Checksums
{
byte[] data = new byte[1048576];
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();

View File

@@ -176,8 +176,7 @@ namespace AaruBenchmark.Checksums
ushort fletcher16 = 0;
byte[] hash;
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();
@@ -214,8 +213,7 @@ namespace AaruBenchmark.Checksums
uint fletcher32 = 0;
byte[] hash;
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();
@@ -253,8 +251,7 @@ namespace AaruBenchmark.Checksums
uint adler32 = 0;
byte[] hash;
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();
@@ -292,8 +289,7 @@ namespace AaruBenchmark.Checksums
ushort crc = 0;
byte[] hash;
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();
@@ -330,8 +326,7 @@ namespace AaruBenchmark.Checksums
ushort crc = 0;
byte[] hash;
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();
@@ -368,8 +363,7 @@ namespace AaruBenchmark.Checksums
uint crc32 = 0;
byte[] hash;
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();
@@ -407,8 +401,7 @@ namespace AaruBenchmark.Checksums
ulong crc64 = 0;
byte[] hash;
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();
@@ -446,8 +439,7 @@ namespace AaruBenchmark.Checksums
byte[] data = new byte[1048576];
byte[] hash = new byte[256];
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();

View File

@@ -75,8 +75,7 @@ namespace AaruBenchmark.Checksums
uint s = 0;
byte[] hash = new byte[16];
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();
@@ -111,8 +110,7 @@ namespace AaruBenchmark.Checksums
uint s = 0;
byte[] hash = new byte[20];
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();
@@ -147,8 +145,7 @@ namespace AaruBenchmark.Checksums
uint s = 0;
byte[] hash = new byte[32];
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();
@@ -183,8 +180,7 @@ namespace AaruBenchmark.Checksums
uint s = 0;
byte[] hash = new byte[48];
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();
@@ -219,8 +215,7 @@ namespace AaruBenchmark.Checksums
uint s = 0;
byte[] hash = new byte[64];
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();

View File

@@ -71,8 +71,7 @@ namespace AaruBenchmark.Checksums
uint s = 0;
byte[] hash = new byte[4];
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();
@@ -106,8 +105,7 @@ namespace AaruBenchmark.Checksums
uint s = 0;
byte[] hash = new byte[16];
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();
@@ -141,8 +139,7 @@ namespace AaruBenchmark.Checksums
uint s = 0;
byte[] hash = new byte[20];
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();
@@ -176,8 +173,7 @@ namespace AaruBenchmark.Checksums
uint s = 0;
byte[] hash = new byte[32];
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();
@@ -211,8 +207,7 @@ namespace AaruBenchmark.Checksums
uint s = 0;
byte[] hash = new byte[48];
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();
@@ -246,8 +241,7 @@ namespace AaruBenchmark.Checksums
uint s = 0;
byte[] hash = new byte[64];
var fs = new FileStream(Path.Combine("/mnt/DiscImageChef", "Checksum test files", "random"), FileMode.Open,
FileAccess.Read);
var fs = new FileStream(Path.Combine(Program.Folder, "random"), FileMode.Open, FileAccess.Read);
fs.Read(data, 0, 1048576);
fs.Close();

View File

@@ -8,7 +8,7 @@ namespace AaruBenchmark
{
public static void Gzip()
{
var _dataStream = new FileStream("/mnt/DiscImageChef/Filters/gzip.gz", FileMode.Open, FileAccess.Read);
var _dataStream = new FileStream(Path.Combine(Program.Folder, "gzip.gz"), FileMode.Open, FileAccess.Read);
Stream str = new GZipStream(_dataStream, CompressionMode.Decompress, true);
byte[] compressed = new byte[1048576];
int pos = 0;
@@ -37,7 +37,7 @@ namespace AaruBenchmark
public static void Bzip2()
{
var _dataStream = new FileStream("/mnt/DiscImageChef/Filters/bzip2.bz2", FileMode.Open, FileAccess.Read);
var _dataStream = new FileStream(Path.Combine(Program.Folder, "bzip2.bz2"), FileMode.Open, FileAccess.Read);
Stream str = new BZip2InputStream(_dataStream, true);
byte[] compressed = new byte[1048576];
int pos = 0;

View File

@@ -7,7 +7,7 @@ namespace AaruBenchmark
{
public static void Gzip()
{
var _dataStream = new FileStream("/mnt/DiscImageChef/Filters/gzip.gz", FileMode.Open, FileAccess.Read);
var _dataStream = new FileStream(Path.Combine(Program.Folder, "gzip.gz"), FileMode.Open, FileAccess.Read);
Stream str = new GZipStream(_dataStream, CompressionMode.Decompress, true);
byte[] compressed = new byte[1048576];
int pos = 0;

View File

@@ -1,10 +1,14 @@
using BenchmarkDotNet.Configs;
using System;
using System.IO;
using BenchmarkDotNet.Configs;
using BenchmarkDotNet.Running;
namespace AaruBenchmark
{
internal class Program
internal static class Program
{
internal static string Folder => Path.Combine(Environment.CurrentDirectory, "data");
static void Main(string[] args)
{
ManualConfig config = ManualConfig.Create(DefaultConfig.Instance).

View File

@@ -9,7 +9,7 @@ namespace AaruBenchmark
{
public static void Gzip()
{
var _dataStream = new FileStream("/mnt/DiscImageChef/Filters/gzip.gz", FileMode.Open, FileAccess.Read);
var _dataStream = new FileStream(Path.Combine(Program.Folder, "gzip.gz"), FileMode.Open, FileAccess.Read);
Stream str = new GZipStream(_dataStream, CompressionMode.Decompress);
byte[] compressed = new byte[1048576];
int pos = 0;
@@ -38,7 +38,7 @@ namespace AaruBenchmark
public static void Bzip2()
{
var _dataStream = new FileStream("/mnt/DiscImageChef/Filters/bzip2.bz2", FileMode.Open, FileAccess.Read);
var _dataStream = new FileStream(Path.Combine(Program.Folder, "bzip2.bz2"), FileMode.Open, FileAccess.Read);
Stream str = new BZip2Stream(_dataStream, CompressionMode.Decompress, true);
byte[] compressed = new byte[1048576];
int pos = 0;

Binary file not shown.

BIN
AaruBenchmark/data/gzip.gz Normal file

Binary file not shown.

BIN
AaruBenchmark/data/random Normal file

Binary file not shown.