claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to fix hashing issue

Browse Source
This commit is contained in:
Matt Nadareski
2022-08-29 11:06:30 -07:00
parent 4bb4da444f
commit 48d15ff09c
1 changed files with 12 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
SabreTools.FileTypes/BaseFile.cs
View File

@@ -354,10 +354,8 @@ namespace SabreTools.FileTypes
hashers.Add(new Hasher(Hash.SpamSum));
// Initialize the hashing helpers
var loadBuffer = new ThreadLoadBuffer(input);
int buffersize = 3 * 1024 * 1024;
byte[] buffer0 = new byte[buffersize];
byte[] buffer1 = new byte[buffersize];
byte[] buffer = new byte[buffersize];
/*
Please note that some of the following code is adapted from
@@ -367,38 +365,26 @@ namespace SabreTools.FileTypes
been tweaked to better fit this code base.
*/
// Pre load the first buffer
// Pre load the buffer
int next = buffersize > size ? (int)size : buffersize;
int current = input.Read(buffer, 0, next);
long refsize = size;
int next = refsize > buffersize ? buffersize : (int)refsize;
input.Read(buffer0, 0, next);
int current = next;
refsize -= next;
bool bufferSelect = true;
while (current > 0)
while (refsize > 0)
{
// Trigger the buffer load on the second buffer
next = refsize > buffersize ? buffersize : (int)refsize;
if (next > 0)
loadBuffer.Trigger(bufferSelect ? buffer1 : buffer0, next);
byte[] buffer = bufferSelect ? buffer0 : buffer1;
// Run hashes in parallel
if (current > 0)
Parallel.ForEach(hashers, Globals.ParallelOptions, h => h.Process(buffer, current));
// Wait for the load buffer worker, if needed
if (next > 0)
loadBuffer.Wait();
// Load the next buffer
refsize -= current;
next = buffersize > refsize ? (int)refsize : buffersize;
// Setup for the next hashing step
current = next;
refsize -= next;
bufferSelect = !bufferSelect;
if (next > 0)
current = input.Read(buffer, 0, next);
}
// Finalize all hashing helpers
loadBuffer.Finish();
Parallel.ForEach(hashers, Globals.ParallelOptions, h => h.Terminate());
// Get the results
@@ -415,7 +401,6 @@ namespace SabreTools.FileTypes
};
// Dispose of the hashers
loadBuffer.Dispose();
hashers.ForEach(h => h.Dispose());
return baseFile;