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

reduce pubkey copies on insert path (#18240)

Browse Source
This commit is contained in:
Jeff Washington (jwash)
2021-06-28 12:04:29 -05:00
committed by GitHub
parent 933fd28908
commit 1f1e54b9d8
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
runtime/src/accounts_index.rs
View File

@ -1009,29 +1009,31 @@ impl<T: 'static + Clone + IsCached + ZeroLamport> AccountsIndex<T> {
let new_entry = WriteAccountMapEntry::new_entry_after_update(slot, info); let new_entry = WriteAccountMapEntry::new_entry_after_update(slot, info);
match w_account_maps { match w_account_maps {
Some(w_account_maps) => { Some(w_account_maps) => {
self.insert_new_entry_if_missing_with_lock(pubkey, w_account_maps, new_entry) self.insert_new_entry_if_missing_with_lock(*pubkey, w_account_maps, new_entry)
} }
None => { None => {
let mut w_account_maps = self.get_account_maps_write_lock(); let mut w_account_maps = self.get_account_maps_write_lock();
self.insert_new_entry_if_missing_with_lock(pubkey, &mut w_account_maps, new_entry) self.insert_new_entry_if_missing_with_lock(*pubkey, &mut w_account_maps, new_entry)
} }
} }
.map(|x| (x.0, x.1))
} }
// return None if item was created new // return None if item was created new
// if entry for pubkey already existed, return Some(entry). Caller needs to call entry.update. // if entry for pubkey already existed, return Some(entry). Caller needs to call entry.update.
fn insert_new_entry_if_missing_with_lock( fn insert_new_entry_if_missing_with_lock(
&self, &self,
pubkey: &Pubkey, pubkey: Pubkey,
w_account_maps: &mut AccountMapsWriteLock<T>, w_account_maps: &mut AccountMapsWriteLock<T>,
new_entry: AccountMapEntry<T>, new_entry: AccountMapEntry<T>,
) -> Option<(WriteAccountMapEntry<T>, T)> { ) -> Option<(WriteAccountMapEntry<T>, T, Pubkey)> {
let account_entry = w_account_maps.entry(*pubkey); let account_entry = w_account_maps.entry(pubkey);
match account_entry { match account_entry {
Entry::Occupied(account_entry) => Some(( Entry::Occupied(account_entry) => Some((
WriteAccountMapEntry::from_account_map_entry(account_entry.get().clone()), WriteAccountMapEntry::from_account_map_entry(account_entry.get().clone()),
// extract the new account_info from the unused 'new_entry' // extract the new account_info from the unused 'new_entry'
new_entry.slot_list.write().unwrap().remove(0).1, new_entry.slot_list.write().unwrap().remove(0).1,
*account_entry.key(),
)), )),
Entry::Vacant(account_entry) => { Entry::Vacant(account_entry) => {
account_entry.insert(new_entry); account_entry.insert(new_entry);
@ -1368,7 +1370,7 @@ impl<T: 'static + Clone + IsCached + ZeroLamport> AccountsIndex<T> {
.map(|(pubkey, account_info)| { .map(|(pubkey, account_info)| {
// this value is equivalent to what update() below would have created if we inserted a new item // this value is equivalent to what update() below would have created if we inserted a new item
( (
pubkey, *pubkey,
WriteAccountMapEntry::new_entry_after_update(slot, account_info), WriteAccountMapEntry::new_entry_after_update(slot, account_info),
) )
}) })
@ -1386,9 +1388,9 @@ impl<T: 'static + Clone + IsCached + ZeroLamport> AccountsIndex<T> {
&mut w_account_maps, &mut w_account_maps,
new_item, new_item,
); );
if let Some((mut w_account_entry, account_info)) = already_exists { if let Some((mut w_account_entry, account_info, pubkey)) = already_exists {
w_account_entry.update(slot, account_info, &mut _reclaims); w_account_entry.update(slot, account_info, &mut _reclaims);
duplicate_keys.push(*pubkey); duplicate_keys.push(pubkey);
} }
}); });
@ -2721,7 +2723,7 @@ pub mod tests {
let new_entry = WriteAccountMapEntry::new_entry_after_update(slot, account_info); let new_entry = WriteAccountMapEntry::new_entry_after_update(slot, account_info);
let mut w_account_maps = index.get_account_maps_write_lock(); let mut w_account_maps = index.get_account_maps_write_lock();
let write = index.insert_new_entry_if_missing_with_lock( let write = index.insert_new_entry_if_missing_with_lock(
&key.pubkey(), key.pubkey(),
&mut w_account_maps, &mut w_account_maps,
new_entry, new_entry,
); );