{"header":{"message":"Using an LruCache instead of a HashMap for loaded pages in a tag","description":null,"timestamp":"2021-12-10T13:50:33.54703744Z","authors":[{}]},"hash":"AETYXHGO4N5PURYZT7Z5UZDGLAN7CD6JESLFAASLYFEXZKWSFE7AC","authors":[{"login":"pmeunier","key":"FZQ2g7VfnzLYM4mtTVDk9HAZjA8Jk9ndkwN1icgbtWUr"}],"deps":{"hashes":[["AETYXHGO4N5PURYZT7Z5UZDGLAN7CD6JESLFAASLYFEXZKWSFE7AC","Using an LruCache instead of a HashMap for loaded pages in a tag"],["AA",null],["N3X5YP7PV2XVQKRRWSRCGJG34HZPLV4BGBLZGJG55KGIB7ORJ77QC","Adding tag/txn.rs, now that the parser allows it"]],"deps":["N3X5YP7PV2XVQKRRWSRCGJG34HZPLV4BGBLZGJG55KGIB7ORJ77QC"],"known":[]},"hunks":[{"Edit":{"inode":{"change":2,"pos":48},"path":"libpijul/src/tag/txn.rs","line":3,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":98},"to":{"change":2,"start":98,"end":148},"introduced_by":2}],"inode":{"change":2,"pos":48}}},"contents":[{"Del":"use std::collections::{hash_map::Entry, HashMap};\n"}]}},{"Edit":{"inode":{"change":2,"pos":48},"path":"libpijul/src/tag/txn.rs","line":4,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":170}],"down_context":[{"change":2,"pos":170}],"flag":"BLOCK","start":0,"end":60,"inode":{"change":2,"pos":48}}},"contents":[{"Add":""},{"Add":"/// Size of the LRU cache."},{"Add":"const CACHE_SIZE: usize = 1024;"}]}},{"Replacement":{"inode":{"change":2,"pos":48},"path":"libpijul/src/tag/txn.rs","line":34,"ins":{"up_context":[{"change":2,"pos":788}],"down_context":[{"change":2,"pos":856}],"flag":"BLOCK","start":61,"end":141,"inode":{"change":2,"pos":48}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":788},"to":{"change":2,"start":788,"end":856},"introduced_by":2}],"inode":{"change":2,"pos":48}},"ins_contents":[{"Add":" loaded: Mutex>>,"}],"del_contents":[{"Del":" loaded: Mutex>>,\n"}]}},{"Replacement":{"inode":{"change":2,"pos":48},"path":"libpijul/src/tag/txn.rs","line":53,"ins":{"up_context":[{"change":2,"pos":1336}],"down_context":[{"change":2,"pos":1412}],"flag":"BLOCK","start":142,"end":228,"inode":{"change":2,"pos":48}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1336},"to":{"change":2,"start":1336,"end":1412},"introduced_by":2}],"inode":{"change":2,"pos":48}},"ins_contents":[{"Add":" pub fn new>(p: P, h: &Hash) -> Result {"}],"del_contents":[{"Del":" pub fn new>(p: P) -> Result {\n"}]}},{"Replacement":{"inode":{"change":2,"pos":48},"path":"libpijul/src/tag/txn.rs","line":57,"ins":{"up_context":[{"change":2,"pos":1581}],"down_context":[{"change":2,"pos":1655}],"flag":"BLOCK","start":229,"end":495,"inode":{"change":2,"pos":48}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1581},"to":{"change":2,"start":1581,"end":1655},"introduced_by":2}],"inode":{"change":2,"pos":48}},"ins_contents":[{"Add":" let header: crate::tag::FileHeader = bincode::deserialize(&off).map_err(TagError::BincodeDe)?;"},{"Add":" let mut ch = OpenTagFile {"},{"Add":" file,"},{"Add":" header"},{"Add":" };"},{"Add":" ch.check(h)?;"},{"Add":" ch.file.seek(SeekFrom::Start(off.len() as u64))?;"}],"del_contents":[{"Del":" let header: crate::tag::FileHeader = bincode::deserialize(&off)?;\n"}]}},{"Replacement":{"inode":{"change":2,"pos":48},"path":"libpijul/src/tag/txn.rs","line":65,"ins":{"up_context":[{"change":2,"pos":1723}],"down_context":[{"change":2,"pos":1777}],"flag":"BLOCK","start":496,"end":556,"inode":{"change":2,"pos":48}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1723},"to":{"change":2,"start":1723,"end":1777},"introduced_by":2}],"inode":{"change":2,"pos":48}},"ins_contents":[{"Add":" r: ch.file,"},{"Add":" off: ch.header.channel,"}],"del_contents":[{"Del":" r: file,\n off: header.channel,\n"}]}},{"Replacement":{"inode":{"change":2,"pos":48},"path":"libpijul/src/tag/txn.rs","line":69,"ins":{"up_context":[{"change":2,"pos":1811}],"down_context":[{"change":2,"pos":1879}],"flag":"BLOCK","start":557,"end":658,"inode":{"change":2,"pos":48}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1811},"to":{"change":2,"start":1811,"end":1879},"introduced_by":2}],"inode":{"change":2,"pos":48}},"ins_contents":[{"Add":" header: ch.header,"},{"Add":" loaded: Mutex::new(lru_cache::LruCache::new(CACHE_SIZE)),"}],"del_contents":[{"Del":" header,\n loaded: Mutex::new(HashMap::new()),\n"}]}},{"Replacement":{"inode":{"change":2,"pos":48},"path":"libpijul/src/tag/txn.rs","line":85,"ins":{"up_context":[{"change":2,"pos":2328}],"down_context":[{"change":2,"pos":2869}],"flag":"BLOCK","start":659,"end":853,"inode":{"change":2,"pos":48}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":2328},"to":{"change":2,"start":2328,"end":2869},"introduced_by":2}],"inode":{"change":2,"pos":48}},"ins_contents":[{"Add":" let mut l = self.loaded.lock().unwrap();"},{"Add":" let p = if let Some(p) = l.get_mut(&off_aligned) {"},{"Add":" unsafe {"},{"Add":" p.as_mut_ptr().add((off - off_aligned) as usize)"}],"del_contents":[{"Del":" let p = match self.loaded.lock().unwrap().entry(off_aligned) {\n Entry::Occupied(mut e) => unsafe {\n e.get_mut().as_mut_ptr().add((off - off_aligned) as usize)\n },\n Entry::Vacant(e) => {\n let mut buf = Box::new([0; crate::tag::BLOCK_SIZE]);\n self.s\n .lock()\n .unwrap()\n .decompress(&mut buf[..], off_aligned)?;\n unsafe { e.insert(buf).as_mut_ptr().add((off - off_aligned) as usize) }\n"}]}},{"Edit":{"inode":{"change":2,"pos":48},"path":"libpijul/src/tag/txn.rs","line":90,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":2883}],"down_context":[{"change":2,"pos":2883}],"flag":"BLOCK","start":854,"end":1227,"inode":{"change":2,"pos":48}}},"contents":[{"Add":" } else {"},{"Add":" let mut buf = Box::new([0; crate::tag::BLOCK_SIZE]);"},{"Add":" self.s"},{"Add":" .lock()"},{"Add":" .unwrap()"},{"Add":" .decompress(&mut buf[..], off_aligned)?;"},{"Add":" let p = unsafe {"},{"Add":" buf.as_mut_ptr().add((off - off_aligned) as usize)"},{"Add":" };"},{"Add":" l.insert(off_aligned, buf);"},{"Add":" p"}]}}],"owner":"irevoire","repo":"pijul","token":"0ojYRoEhfrrVMXsiBTPL91UGG692CNnYQLvNDIjvBGo=","login":null}

…

Dependencies

Change contents