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

AcctIdx: remove stats from write lock section (#20548)

This commit is contained in:
Jeff Washington (jwash) 2021-10-08 15:27:38 -05:00 committed by GitHub
parent a03aba15b0
commit 0545306f0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
runtime/src/in_mem_accounts_index.rs
View File

@ -264,19 +264,16 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
// 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.
pub fn remove_if_slot_list_empty(&self, pubkey: Pubkey) -> bool {
let m = Measure::start("entry");
let mut m = Measure::start("entry");
let mut map = self.map().write().unwrap();
let entry = map.entry(pubkey);
let stats = &self.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);
m.stop();
let found = matches!(entry, Entry::Occupied(_));
let result = self.remove_if_slot_list_empty_entry(entry);
drop(map);
self.remove_if_slot_list_empty_entry(entry)
self.update_entry_stats(m, found);
result
}
pub fn slot_list_mut<RT>(
@ -311,17 +308,11 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
);
Self::update_stat(&self.stats().updates_in_mem, 1);
} else {
let m = Measure::start("entry");
let mut m = Measure::start("entry");
let mut map = self.map().write().unwrap();
let entry = map.entry(*pubkey);
let stats = &self.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);
m.stop();
let found = matches!(entry, Entry::Occupied(_));
match entry {
Entry::Occupied(mut occupied) => {
let current = occupied.get_mut();
@ -356,10 +347,24 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
self.stats().insert_or_delete_mem(true, self.bin);
}
}
drop(map);
self.update_entry_stats(m, found);
};
})
}
fn update_entry_stats(&self, stopped_measure: Measure, found: bool) {
let stats = &self.stats();
let (count, time) = if found {
(&stats.entries_from_mem, &stats.entry_mem_us)
} else {
(&stats.entries_missing, &stats.entry_missing_us)
};
Self::update_stat(time, stopped_measure.as_us());
Self::update_stat(count, 1);
}
// Try to update an item in the slot list the given `slot` If an item for the slot
// already exists in the list, remove the older item, add it to `reclaims`, and insert
// the new item.
@ -463,17 +468,11 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
pubkey: Pubkey,
new_entry: PreAllocatedAccountMapEntry<T>,
) -> Option<(AccountMapEntry<T>, T, Pubkey)> {
let m = Measure::start("entry");
let mut m = Measure::start("entry");
let mut map = self.map().write().unwrap();
let entry = map.entry(pubkey);
let stats = &self.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);
m.stop();
let found = matches!(entry, Entry::Occupied(_));
let result = match entry {
Entry::Occupied(occupied) => Some(Self::insert_returner(
occupied.get(),
@ -483,7 +482,7 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
Entry::Vacant(vacant) => {
// not in cache, look on disk
let disk_entry = self.load_account_entry_from_disk(vacant.key());
stats.insert_or_delete_mem(true, self.bin);
self.stats().insert_or_delete_mem(true, self.bin);
if let Some(disk_entry) = disk_entry {
// on disk, so insert into cache, then return cache value so caller will merge
let result = Some(Self::insert_returner(&disk_entry, vacant.key(), new_entry));
@ -499,6 +498,8 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
}
}
};
drop(map);
self.update_entry_stats(m, found);
let stats = self.stats();
if result.is_none() {
stats.insert_or_delete(true, self.bin);
@ -777,6 +778,8 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
if ranges.iter().any(|range| range.is_none()) {
return false; // range said to hold 'all', so not completed
}
// consider chunking these so we don't hold the write lock too long
let mut map = self.map().write().unwrap();
for k in removes {
if let Entry::Occupied(occupied) = map.entry(k) {