gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rework acct idx entry to prepare for hashmap (#19875)

Browse Source
This commit is contained in:
Jeff Washington (jwash)
2021-09-14 15:27:23 -05:00
committed by GitHub
parent 2a795614d3
commit 60276da1fd
1 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
runtime/src/in_mem_accounts_index.rs
View File

@ -36,20 +36,6 @@ impl<T: IsCached> InMemAccountsIndex<T> {
Arc::new(BucketMapHolder::new()) Arc::new(BucketMapHolder::new())
} }
fn entry(&mut self, pubkey: Pubkey) -> Entry<K, AccountMapEntry<T>> {
let m = Measure::start("entry");
let result = self.map.entry(pubkey);
let stats = &self.storage.stats;
let (count, time) = if matches!(result, Entry::Occupied(_)) {
(&stats.entries_from_mem, &stats.entry_mem_us)
} else {
(&stats.entries_missing, &stats.entry_missing_us)
};
Self::update_time_stat(time, m);
Self::update_stat(count, 1);
result
}
pub fn items<R>(&self, range: &Option<&R>) -> Vec<(K, AccountMapEntry<T>)> pub fn items<R>(&self, range: &Option<&R>) -> Vec<(K, AccountMapEntry<T>)>
where where
R: RangeBounds<Pubkey> + std::fmt::Debug, R: RangeBounds<Pubkey> + std::fmt::Debug,
@ -86,7 +72,18 @@ impl<T: IsCached> InMemAccountsIndex<T> {
// If the slot list for pubkey exists in the index and is empty, remove the index entry for pubkey and return true. // If the slot list for pubkey exists in the index and is empty, remove the index entry for pubkey and return true.
// Return false otherwise. // Return false otherwise.
pub fn remove_if_slot_list_empty(&mut self, pubkey: Pubkey) -> bool { pub fn remove_if_slot_list_empty(&mut self, pubkey: Pubkey) -> bool {
if let Entry::Occupied(index_entry) = self.entry(pubkey) { let m = Measure::start("entry");
let entry = self.map.entry(pubkey);
let stats = &self.storage.stats;
let (count, time) = if matches!(entry, Entry::Occupied(_)) {
(&stats.entries_from_mem, &stats.entry_mem_us)
} else {
(&stats.entries_missing, &stats.entry_missing_us)
};
Self::update_time_stat(time, m);
Self::update_stat(count, 1);
if let Entry::Occupied(index_entry) = entry {
if index_entry.get().slot_list.read().unwrap().is_empty() { if index_entry.get().slot_list.read().unwrap().is_empty() {
index_entry.remove(); index_entry.remove();
self.stats().insert_or_delete(false, self.bin); self.stats().insert_or_delete(false, self.bin);
@ -103,7 +100,17 @@ impl<T: IsCached> InMemAccountsIndex<T> {
reclaims: &mut SlotList<T>, reclaims: &mut SlotList<T>,
previous_slot_entry_was_cached: bool, previous_slot_entry_was_cached: bool,
) { ) {
match self.entry(*pubkey) { let m = Measure::start("entry");
let entry = self.map.entry(*pubkey);
let stats = &self.storage.stats;
let (count, time) = if matches!(entry, Entry::Occupied(_)) {
(&stats.entries_from_mem, &stats.entry_mem_us)
} else {
(&stats.entries_missing, &stats.entry_missing_us)
};
Self::update_time_stat(time, m);
Self::update_stat(count, 1);
match entry {
Entry::Occupied(mut occupied) => { Entry::Occupied(mut occupied) => {
let current = occupied.get_mut(); let current = occupied.get_mut();
Self::lock_and_update_slot_list( Self::lock_and_update_slot_list(
@ -215,7 +222,17 @@ impl<T: IsCached> InMemAccountsIndex<T> {
pubkey: Pubkey, pubkey: Pubkey,
new_entry: AccountMapEntry<T>, new_entry: AccountMapEntry<T>,
) -> Option<(WriteAccountMapEntry<T>, T, Pubkey)> { ) -> Option<(WriteAccountMapEntry<T>, T, Pubkey)> {
let result = match self.entry(pubkey) { let m = Measure::start("entry");
let entry = self.map.entry(pubkey);
let stats = &self.storage.stats;
let (count, time) = if matches!(entry, Entry::Occupied(_)) {
(&stats.entries_from_mem, &stats.entry_mem_us)
} else {
(&stats.entries_missing, &stats.entry_missing_us)
};
Self::update_time_stat(time, m);
Self::update_stat(count, 1);
let result = match entry {
Entry::Occupied(account_entry) => { Entry::Occupied(account_entry) => {
Some(( Some((
WriteAccountMapEntry::from_account_map_entry(account_entry.get().clone()), WriteAccountMapEntry::from_account_map_entry(account_entry.get().clone()),