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

dashmap -> rwlock<hashmap> for rewrites (#24327)

This commit is contained in:
Jeff Washington (jwash) 2022-04-14 11:55:58 -05:00 committed by GitHub
parent e5fc0d3f76
commit a91b0c8ea3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/src/bank.rs
View File

@ -178,7 +178,7 @@ pub const SECONDS_PER_YEAR: f64 = 365.25 * 24.0 * 60.0 * 60.0;
pub const MAX_LEADER_SCHEDULE_STAKES: Epoch = 5; pub const MAX_LEADER_SCHEDULE_STAKES: Epoch = 5;
pub type Rewrites = DashMap<Pubkey, Hash>; pub type Rewrites = RwLock<HashMap<Pubkey, Hash>>;
#[derive(Clone, Debug, PartialEq)] #[derive(Clone, Debug, PartialEq)]
pub struct RentDebit { pub struct RentDebit {

14
runtime/src/expected_rent_collection.rs
View File

@ -284,7 +284,10 @@ impl ExpectedRentCollection {
if possibly_update if possibly_update
&& rent_epoch == 0 && rent_epoch == 0
&& current_epoch > 1 && current_epoch > 1
&& !rewrites_skipped_this_slot.contains_key(pubkey) && !rewrites_skipped_this_slot
.read()
.unwrap()
.contains_key(pubkey)
{ {
// we know we're done // we know we're done
return None; return None;
@ -293,7 +296,10 @@ impl ExpectedRentCollection {
// if an account was written >= its rent collection slot within the last epoch worth of slots, then we don't want to update it here // if an account was written >= its rent collection slot within the last epoch worth of slots, then we don't want to update it here
if possibly_update && rent_epoch < current_epoch { if possibly_update && rent_epoch < current_epoch {
let new_rent_epoch = if partition_from_pubkey < partition_from_current_slot let new_rent_epoch = if partition_from_pubkey < partition_from_current_slot
|| rewrites_skipped_this_slot.contains_key(pubkey) || rewrites_skipped_this_slot
.read()
.unwrap()
.contains_key(pubkey)
{ {
// partition_from_pubkey < partition_from_current_slot: // partition_from_pubkey < partition_from_current_slot:
// we already would have done a rewrite on this account IN this epoch // we already would have done a rewrite on this account IN this epoch
@ -310,7 +316,7 @@ impl ExpectedRentCollection {
} }
} else if !possibly_update { } else if !possibly_update {
// This is a non-trivial lookup. Would be nice to skip this. // This is a non-trivial lookup. Would be nice to skip this.
assert!(!rewrites_skipped_this_slot.contains_key(pubkey), "did not update rent_epoch: {}, new value for rent_epoch: {}, old: {}, current epoch: {}", pubkey, rent_epoch, next_epoch, current_epoch); assert!(!rewrites_skipped_this_slot.read().unwrap().contains_key(pubkey), "did not update rent_epoch: {}, new value for rent_epoch: {}, old: {}, current epoch: {}", pubkey, rent_epoch, next_epoch, current_epoch);
} }
} }
None None
@ -1131,7 +1137,7 @@ pub mod tests {
continue; continue;
} }
rewrites.insert(pubkey, Hash::default()); rewrites.write().unwrap().insert(pubkey, Hash::default());
} }
let expected_new_rent_epoch = if partition_index_bank_slot let expected_new_rent_epoch = if partition_index_bank_slot
> partition_from_pubkey > partition_from_pubkey