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

make commit_credits one trip through the rwlock (#4969)

This commit is contained in:
Rob Walker 2019-07-08 20:46:21 -07:00 committed by GitHub
parent 22ef3c7c54
commit 49250f62aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
runtime/src/accounts.rs
View File

@ -525,25 +525,24 @@ impl Accounts {
/// Commit remaining credit-only changes, regardless of reference count
pub fn commit_credits(&self, ancestors: &HashMap<Fork, usize>, fork: Fork) {
let credit_only_account_locks = self.credit_only_account_locks.read().unwrap();
for (pubkey, credit_only_lock) in credit_only_account_locks.iter() {
let credit = credit_only_lock.credits.load(Ordering::Relaxed);
for (pubkey, lock) in self.credit_only_account_locks.write().unwrap().drain() {
let lock_count = *lock.lock_count.lock().unwrap();
if lock_count != 0 {
warn!(
"dropping credit-only lock on {}, still has {} locks",
pubkey, lock_count
);
}
let credit = lock.credits.load(Ordering::Relaxed);
if credit > 0 {
let mut account = self
.load_slow(ancestors, pubkey)
.load_slow(ancestors, &pubkey)
.map(|(account, _)| account)
.unwrap_or_default();
account.lamports += credit;
self.store_slow(fork, pubkey, &account);
self.store_slow(fork, &pubkey, &account);
}
}
drop(credit_only_account_locks);
self.clear_credit_only_account_locks();
}
pub fn clear_credit_only_account_locks(&self) {
let mut credit_only_account_locks = self.credit_only_account_locks.write().unwrap();
credit_only_account_locks.clear();
}
fn collect_accounts<'a>(

4
runtime/src/bank.rs
View File

@ -344,7 +344,6 @@ impl Bank {
self.collector_id = *collector_id;
self.rc.accounts = Arc::new(Accounts::new_from_parent(&parent.rc.accounts));
self.clear_credit_only_account_locks();
self.epoch_stakes = {
let mut epoch_stakes = parent.epoch_stakes.clone();
@ -1417,9 +1416,6 @@ impl Bank {
.accounts
.commit_credits(&self.ancestors, self.slot());
}
fn clear_credit_only_account_locks(&self) {
self.rc.accounts.clear_credit_only_account_locks();
}
}
impl Drop for Bank {