src/backup/chunker.rs: simplify break test

To make it a little bit faster ...
This commit is contained in:
Dietmar Maurer 2019-02-22 13:02:11 +01:00
parent 6adb40eefc
commit f252ca654c
1 changed files with 8 additions and 6 deletions

View File

@ -27,7 +27,8 @@ pub struct Chunker {
_discriminator: u32, _discriminator: u32,
break_test_value: u32, break_test_mask: u32,
break_test_minimum: u32,
window: [u8; CA_CHUNKER_WINDOW_SIZE], window: [u8; CA_CHUNKER_WINDOW_SIZE],
} }
@ -121,7 +122,8 @@ impl Chunker {
panic!("got unexpected chunk size - not a power of two."); panic!("got unexpected chunk size - not a power of two.");
} }
let break_test_value = (chunk_size_avg*2 -1) as u32; let break_test_mask = (chunk_size_avg*2 - 1) as u32;
let break_test_minimum = break_test_mask - 2;
Self { Self {
h: 0, h: 0,
@ -131,7 +133,8 @@ impl Chunker {
chunk_size_max: chunk_size_avg<<2, chunk_size_max: chunk_size_avg<<2,
_chunk_size_avg: chunk_size_avg, _chunk_size_avg: chunk_size_avg,
_discriminator: discriminator, _discriminator: discriminator,
break_test_value: break_test_value, break_test_mask: break_test_mask,
break_test_minimum: break_test_minimum,
window: [0u8; CA_CHUNKER_WINDOW_SIZE], window: [0u8; CA_CHUNKER_WINDOW_SIZE],
} }
} }
@ -209,10 +212,9 @@ impl Chunker {
//(self.h & 0x1ffff) <= 2 //THIS IS SLOW!!! //(self.h & 0x1ffff) <= 2 //THIS IS SLOW!!!
//(self.h & self.break_test_value) <= 2 // Bad on 0 streams //(self.h & self.break_test_mask) <= 2 // Bad on 0 streams
// simply add arbitrary value (10) before testing (self.h & self.break_test_mask) >= self.break_test_minimum
((self.h+10) & self.break_test_value) <= 2
} }
// This is the original implementation from casync // This is the original implementation from casync