robin/bitbuffer
1
0
Fork 0
mirror of https://codeberg.org/icewind/bitbuffer.git synced 2026-06-03 16:44:06 +02:00
Code Issues Releases Wiki Activity

minor dynamic length string performance improvement

Browse source
This commit is contained in:
Robin Appelman 2019-03-16 14:51:25 +01:00
commit 031979673e
1 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/buffer.rs
View file

@ -400,7 +400,7 @@ impl<E> BitBuffer<E>
String::from_utf8(bytes)? String::from_utf8(bytes)?
}; };
Ok(raw_string.trim_end_matches(char::from(0)).to_owned()) Ok(raw_string.trim_end_matches(char::from(0)).to_owned())
}, }
None => { None => {
let bytes = self.read_string_bytes(position); let bytes = self.read_string_bytes(position);
if cfg!(feature = "unchecked_utf8") { if cfg!(feature = "unchecked_utf8") {
@ -415,25 +415,31 @@ impl<E> BitBuffer<E>
} }
fn read_string_bytes(&self, position: usize) -> Vec<u8> { fn read_string_bytes(&self, position: usize) -> Vec<u8> {
let mut acc = Vec::with_capacity(25); let mut acc = Vec::with_capacity(32);
let mut pos = position; let mut pos = position;
loop { loop {
let read = min((USIZE_SIZE - 1) * 8, self.bit_len - pos); let read = (USIZE_SIZE - 1) * 8;
let raw_bytes = self.read_usize(pos, read); let raw_bytes = self.read_usize(pos, read);
let bytes: [u8; USIZE_SIZE] = if E::is_le() { let bytes: [u8; USIZE_SIZE] = if E::is_le() {
raw_bytes.to_le_bytes() raw_bytes.to_le_bytes()
} else { } else {
raw_bytes.to_be_bytes() raw_bytes.to_be_bytes()
}; };
for i in 0..(USIZE_SIZE - 1) {
// ony LE we use the first 7 bytes, on BE the last 7
let byte = if E::is_le() { bytes[i] } else { bytes[1 + i] };
if byte == 0 { let (start, end) = if E::is_le() {
(0usize, USIZE_SIZE - 1)
} else {
(1usize, USIZE_SIZE)
};
for i in start..end {
if bytes[i] == 0 {
acc.extend_from_slice(&bytes[start..i]);
return acc; return acc;
} }
acc.push(byte);
} }
acc.extend_from_slice(&bytes[start..end]);
pos += read; pos += read;
} }
} }