diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2015-03-30 20:47:13 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2015-04-19 01:13:09 +0200 |
| commit | 9224ce3d4d1ea0428a70e75134998e08aa45b1e6 (patch) | |
| tree | a4afde96f9fd0fe9e1a3d14339f6e7146aeb59d3 /ftparchive | |
| parent | 76cbc9abb2d09ee5b248dfaa24948ba016fb6dee (diff) | |
calculate only expected hashes in methods
Methods get told which hashes are expected by the acquire system, which
means we can use this list to restrict what we calculate in the methods
as any extra we are calculating is wasted effort as we can't compare it
with anything anyway.
Adding support for a new hash algorithm is therefore 'free' now and if a
algorithm is no longer provided in a repository for a file, we
automatically stop calculating it.
In practice this results in a speed-up in Debian as we don't have SHA512
here (so far), so we practically stop calculating it.
Diffstat (limited to 'ftparchive')
| -rw-r--r-- | ftparchive/cachedb.cc | 4 | ||||
| -rw-r--r-- | ftparchive/writer.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc index 1dc268594..cc3527ea4 100644 --- a/ftparchive/cachedb.cc +++ b/ftparchive/cachedb.cc @@ -441,8 +441,8 @@ bool CacheDB::GetHashes(bool const GenOnly, unsigned int const DoHashes) if (OpenFile() == false) return false; - Hashes hashes; - if (Fd->Seek(0) == false || hashes.AddFD(*Fd, CurStat.FileSize, FlHashes) == false) + Hashes hashes(FlHashes); + if (Fd->Seek(0) == false || hashes.AddFD(*Fd, CurStat.FileSize) == false) return false; HashStringList hl = hashes.GetHashStringList(); diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index db68c21f0..593278590 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -1075,8 +1075,8 @@ bool ReleaseWriter::DoPackage(string FileName) CheckSums[NewFileName].size = fd.Size(); - Hashes hs; - hs.AddFD(fd, 0, DoHashes); + Hashes hs(DoHashes); + hs.AddFD(fd); CheckSums[NewFileName].Hashes = hs.GetHashStringList(); fd.Close(); |