summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2011-08-30 20:06:11 (UTC)
committer Michael Krelin <hacker@klever.net>2011-08-30 20:06:11 (UTC)
commit77706495aa0cc1706cfe1535b40477e004312081 (patch) (unidiff)
treea63cf5ce4682a0ce4b412f303f7524c9fa6bacfa
parent111044b60ba5f40e003d1ba1d4082794985aa3ad (diff)
downloadiii-77706495aa0cc1706cfe1535b40477e004312081.zip
iii-77706495aa0cc1706cfe1535b40477e004312081.tar.gz
iii-77706495aa0cc1706cfe1535b40477e004312081.tar.bz2
optimize integrity digest calculation memory use
Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/eyetil.cc14
1 files changed, 5 insertions, 9 deletions
diff --git a/src/eyetil.cc b/src/eyetil.cc
index 57ae607..2e6ab7e 100644
--- a/src/eyetil.cc
+++ b/src/eyetil.cc
@@ -162,16 +162,12 @@ struct block512_t {
162 } 162 }
163 163
164}; 164};
165#pragma pack() 165#pragma pack()
166 166
167binary_t integrity_digest(const void *ptr,size_t size,const std::string& ukey) { 167binary_t integrity_digest(const void *ptr,size_t size,const std::string& ukey) {
168 binary_t key; key.from_hex(ukey); 168 md5_digester rv;
169 std::vector<uint16_t> blksums; blksums.reserve(size/sizeof(block512_t)); 169 std::transform( (block512_t*)ptr, ((block512_t*)ptr)+size/sizeof(block512_t),
170 block512_t *db = (block512_t*)ptr, 170 rv.updater<uint16_t>(), block512_t::tcpcksum );
171 *de = db + size/sizeof(block512_t); 171 rv.update( binary_t(ukey) );
172 std::transform( db, de, std::back_inserter(blksums), block512_t::tcpcksum ); 172 return rv.final();
173 binary_t subject;
174 subject.from_data((void*)&(blksums.front()),blksums.size()*sizeof(uint16_t));
175 std::copy( key.begin(), key.end(), std::back_inserter(subject) );
176 return subject.md5();
177} 173}