Skip to content

LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust

Merge main into settings branch (memory budget + configurable thumbnail disk cache)

Brandon Thomasef9c6ca38c9b
diff --cc crates/engine/src/media.rs
index d33cae32a,77ff7e815..c14954036
--- a/crates/engine/src/media.rs
+++ b/crates/engine/src/media.rs
@@@ -126,19 -132,67 +132,74 @@@ impl Default for MediaCache
}
}
+ /// Memory for rendered previews out of the cache share.
+ fn rendered_budget(share: usize) -> usize {
+ RENDERED_MEM_BYTES.min(share / 4)
+ }
+
+ fn source_bytes(img: &Rgb32f) -> usize {
+ img.data.len() * 12 + 64
+ }
+
impl MediaCache {
/// Keep rendered thumbnails on disk in `dir` as well.
- pub fn attach_disk_cache(&mut self, dir: &std::path::Path) {
- self.rendered = Arc::new(PreviewCache::with_disk(rendered_budget(self.budget), dir, DISK_CACHE_BYTES));
+ pub fn attach_disk_cache(&mut self, dir: &std::path::Path, disk_bytes: u64) {
- self.rendered = Arc::new(PreviewCache::with_disk(RENDERED_MEM_BYTES, dir, disk_bytes));
++ self.rendered = Arc::new(PreviewCache::with_disk(rendered_budget(self.budget), dir, disk_bytes));
+ }
+
+ /// Forget every decoded source (photo ids changed meaning, e.g. another library was opened).
+ pub fn clear_sources(&mut self) {
- self.thumbs = Lru::new(THUMB_SOURCE_BYTES);
++ self.thumbs = Lru::new(THUMB_SOURCE_BYTES.min(self.budget));
+ self.previews.clear();
+ self.full = None;
}
+ /// Bytes the caches may hold together.
+ pub fn budget(&self) -> usize {
+ self.budget
+ }
+
+ /// Change the bytes the caches may hold together, evicting at once if needed.
+ pub fn set_budget(&mut self, bytes: usize) {
+ self.budget = bytes;
+ self.thumbs.set_budget(THUMB_SOURCE_BYTES.min(bytes));
+ self.rendered.set_mem_budget(rendered_budget(bytes));
+ self.enforce_budget();
+ }
+
+ /// Bytes held by decoded sources and rendered previews in memory.
+ pub fn held(&self) -> usize {
+ let (t, p, f) = self.usage();
+ t.bytes + p.bytes + f.bytes + self.rendered.mem_usage().1
+ }
+
+ /// Evict least recently used entries across the source caches and the rendered previews
+ /// until they fit the budget. The newest preview-level source (the photo on screen, or the
+ /// one just decoded) is never evicted here.
+ pub fn enforce_budget(&mut self) {
+ let mut held = self.held();
+ while held > self.budget {
+ let newest_preview = self.previews.iter().map(|e| e.2).max();
+ let candidates = [
+ self.thumbs.oldest_tick().map(|t| (t, 0)),
+ self.previews.iter().filter(|e| Some(e.2) != newest_preview).map(|e| e.2).min().map(|t| (t, 1)),
+ self.full.as_ref().map(|e| (e.2, 2)),
+ self.rendered.oldest_tick().map(|t| (t, 3)),
+ ];
+ let Some((tick, which)) = candidates.into_iter().flatten().min() else { break };
+ let freed = match which {
+ 0 => self.thumbs.pop_oldest(),
+ 1 => self.previews.iter().position(|e| e.2 == tick).map(|i| source_bytes(&self.previews.remove(i).1)),
+ 2 => self.full.take().map(|e| source_bytes(&e.1)),
+ _ => self.rendered.evict_oldest(),
+ };
+ match freed {
+ Some(b) if b > 0 => held = held.saturating_sub(b),
+ _ => break,
+ }
+ }
+ }
+
pub fn get(&mut self, id: PhotoId, level: SourceLevel) -> Option<Arc<Rgb32f>> {
match level {
SourceLevel::Thumb => self.thumbs.get(&id).cloned(),