Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #894 from wabbajack-tools/issue-857

Browse Source 
Run disk benchmark longer, calculate thread useage in a slightly bett…
This commit is contained in:
Timothy Baldridge 2020-05-30 08:31:52 -07:00 committed by GitHub
commit 06a20fc095
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -3,6 +3,7 @@
#### Version - 2.0.8.0 - ??
* Make sure the MEGA client is logged out before logging in (#881)
* Removed final references to `nexus_link_cache` (#865)
* Run disk benchmarks for 10 seconds and use a tiered approach to disk queue size calculation of disks
#### Version - 2.0.7.0 - 5/28/2020
* Code is now robust when dealing with invasive Anti-virus software. We'll retry deletes/opens if the file is in use

19
Wabbajack.Common/Utils.cs
View File

@ -908,11 +908,13 @@ namespace Wabbajack.Common
private static async Task<long> TestDiskSpeedInner(WorkQueue queue, AbsolutePath path)
{
var startTime = DateTime.Now;
var seconds = 2;
var results = await Enumerable.Range(0, queue.DesiredNumWorkers)
var seconds = 10;
var runTime = new TimeSpan(0, 0, seconds);
Log($"Running disk benchmark, this will take {seconds} seconds");
var results = Enumerable.Range(0, queue.DesiredNumWorkers)
.PMap(queue, async idx =>
{
var startTime = DateTime.Now;
var random = new Random();
var file = path.Combine($"size_test{idx}.bin");
@ -921,7 +923,7 @@ namespace Wabbajack.Common
random.NextBytes(buffer);
await using (var fs = await file.Create())
{
while (DateTime.Now < startTime + new TimeSpan(0, 0, seconds))
while (DateTime.Now - startTime < runTime)
{
fs.Write(buffer, 0, buffer.Length);
// Flush to make sure large buffers don't cause the rate to be higher than it should
@ -932,7 +934,14 @@ namespace Wabbajack.Common
await file.DeleteAsync();
return size;
});
return results.Sum() / seconds;
for (int x = 0; x < seconds; x++)
{
Log($"Running Disk benchmark {Percent.FactoryPutInRange(x, seconds)} complete");
await Task.Delay(TimeSpan.FromSeconds(1));
}
return (await results).Sum() / seconds;
}
public static async Task<long> TestDiskSpeed(WorkQueue queue, AbsolutePath path)

14
Wabbajack.Lib/ABatchProcessor.cs
View File

@ -75,9 +75,9 @@ namespace Wabbajack.Lib
// Most of the heavy lifting is done on the scratch disk, so we'll use the value from that disk
var memory = Utils.GetMemoryStatus();
// Assume roughly 2GB of ram needed to extract each 7zip archive, and then leave 2GB for the OS. If calculation is lower or equal to 1 GB, use 1GB
var based_on_memory = Math.Max((memory.ullTotalPhys - (2 * GB)) / (2 * GB), 1);
var scratch_size = await RecommendQueueSize(AbsolutePath.EntryPoint);
var result = Math.Min((int)based_on_memory, (int)scratch_size);
var basedOnMemory = Math.Max((memory.ullTotalPhys - (2 * GB)) / (2 * GB), 1);
var scratchSize = await RecommendQueueSize(AbsolutePath.EntryPoint);
var result = Math.Min((int)basedOnMemory, (int)scratchSize);
Utils.Log($"Recommending a queue size of {result} based on disk performance, number of cores, and {((long)memory.ullTotalPhys).ToFileSizeString()} of system RAM");
return result;
}
@ -99,8 +99,12 @@ namespace Wabbajack.Lib
Utils.Log($"{raw_speed.ToFileSizeString()}/sec for {folder}");
int speed = (int)(raw_speed / 1024 / 1024);
// Less than 100MB/sec, stick with two threads.
return speed < 100 ? 2 : Math.Min(Environment.ProcessorCount, speed / 100 * 2);
// Less than 200, it's probably a HDD, so we can't go higher than 2
if (speed < 200) return 2;
// SATA SSD, so stick with 8 thread maximum
if (speed < 600) return Math.Min(Environment.ProcessorCount, 8);
// Anything higher is probably a NVME or a really good SSD, so take off the reins
return Environment.ProcessorCount;
}
/// <summary>