blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

AcctIdx: get rid of unused is_dirty (#23733)

This commit is contained in:
Jeff Washington (jwash) 2022-03-17 16:29:36 -05:00 committed by GitHub
parent 8b230b86cc
commit 664deb2157
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
runtime/src/in_mem_accounts_index.rs
View File

@ -48,8 +48,6 @@ pub struct InMemAccountsIndex<T: IndexValue> {
stop_evictions_changes: AtomicU64, stop_evictions_changes: AtomicU64,
// true while ranges are being manipulated. Used to keep an async flush from removing things while a range is being held. // true while ranges are being manipulated. Used to keep an async flush from removing things while a range is being held.
stop_evictions: AtomicU64, stop_evictions: AtomicU64,
// set to true when any entry in this bin is marked dirty
bin_dirty: AtomicBool,
// set to true while this bin is being actively flushed // set to true while this bin is being actively flushed
flushing_active: AtomicBool, flushing_active: AtomicBool,
} }
@ -81,7 +79,6 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
cache_ranges_held: CacheRangesHeld::default(), cache_ranges_held: CacheRangesHeld::default(),
stop_evictions_changes: AtomicU64::default(), stop_evictions_changes: AtomicU64::default(),
stop_evictions: AtomicU64::default(), stop_evictions: AtomicU64::default(),
bin_dirty: AtomicBool::default(),
flushing_active: AtomicBool::default(), flushing_active: AtomicBool::default(),
// initialize this to max, to make it clear we have not flushed at age 0, the starting age // initialize this to max, to make it clear we have not flushed at age 0, the starting age
last_age_flushed: AtomicU8::new(Age::MAX), last_age_flushed: AtomicU8::new(Age::MAX),
@ -869,12 +866,6 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
} }
} }
pub fn set_bin_dirty(&self) {
self.bin_dirty.store(true, Ordering::Release);
// 1 bin dirty, so only need 1 thread to wake up if many could be waiting
self.storage.wait_dirty_or_aged.notify_one();
}
/// returns true if a dice roll indicates this call should result in a random eviction. /// returns true if a dice roll indicates this call should result in a random eviction.
/// This causes non-determinism in cache contents per validator. /// This causes non-determinism in cache contents per validator.
fn random_chance_of_eviction() -> bool { fn random_chance_of_eviction() -> bool {
@ -937,12 +928,11 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
} }
fn flush_internal(&self, _flush_guard: &FlushGuard) { fn flush_internal(&self, _flush_guard: &FlushGuard) {
let was_dirty = self.bin_dirty.swap(false, Ordering::Acquire);
let current_age = self.storage.current_age(); let current_age = self.storage.current_age();
let mut iterate_for_age = self.get_should_age(current_age); let mut iterate_for_age = self.get_should_age(current_age);
let startup = self.storage.get_startup(); let startup = self.storage.get_startup();
if !was_dirty && !iterate_for_age && !startup { if !iterate_for_age && !startup {
// wasn't dirty and no need to age, so no need to flush this bucket // no need to age, so no need to flush this bucket
// but, at startup we want to remove from buckets as fast as possible if any items exist // but, at startup we want to remove from buckets as fast as possible if any items exist
return; return;
} }