Skip to content

Fix undetected pinned element in advance_hot #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ihtefyw wants to merge 1 commit into from
Closed

Fix undetected pinned element in advance_hot #96

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/shard.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use std::{
collections::HashSet,
hash::{BuildHasher, Hash},
hint::unreachable_unchecked,
mem::{self, MaybeUninit},
Expand All @@ -9,7 +10,7 @@ use hashbrown::HashTable;
use crate::{
linked_slab::{LinkedSlab, Token},
shim::sync::atomic::{self, AtomicU16},
Equivalent, Lifecycle, MemoryUsed, Weighter,
DefaultHashBuilder, Equivalent, Lifecycle, MemoryUsed, Weighter,
};

#[cfg(feature = "stats")]
Expand Down Expand Up @@ -724,7 +725,7 @@ impl<
/// Advance hot ring evicting entries.
#[must_use]
fn advance_hot(&mut self, lcs: &mut L::RequestState) -> bool {
let mut unpinned = 0usize;
let mut unpinned: HashSet<_, DefaultHashBuilder> = HashSet::default();
let Some(mut idx) = self.hot_head else {
return false;
};
Expand All @@ -738,13 +739,14 @@ impl<
*resident.referenced.get_mut() = (*resident.referenced.get_mut())
.min(MAX_F)
.saturating_sub(1);
if unpinned == 0 && Some(next) == self.hot_head {
unpinned.remove(&idx);
if unpinned.is_empty() && Some(next) == self.hot_head {
return false;
}
idx = next;
continue;
}
unpinned += 1;
unpinned.insert(idx);
if *resident.referenced.get_mut() != 0 {
*resident.referenced.get_mut() = (*resident.referenced.get_mut()).min(MAX_F) - 1;
idx = next;
Expand Down