Skip to content

Removes atomic-ness from AccountStorageEntry id and slot fields #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brooksprumo merged 1 commit into from
Mar 11, 2024
Merged

Removes atomic-ness from AccountStorageEntry id and slot fields #119

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions accounts-db/src/accounts_db.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1005,9 +1005,9 @@ struct CleanKeyTimings {
/// Persistent storage structure holding the accounts
#[derive(Debug)]
pub struct AccountStorageEntry {
pub(crate) id: AtomicAppendVecId,
pub(crate) id: AppendVecId,

pub(crate) slot: AtomicU64,
pub(crate) slot: Slot,

/// storage holding the accounts
pub accounts: AccountsFile,
Expand Down Expand Up @@ -1037,8 +1037,8 @@ impl AccountStorageEntry {
let accounts = AccountsFile::AppendVec(AppendVec::new(&path, true, file_size as usize));

Self {
id: AtomicAppendVecId::new(id),
slot: AtomicU64::new(slot),
id,
slot,
accounts,
count_and_status: SeqLock::new((0, AccountStorageStatus::Available)),
approx_store_count: AtomicUsize::new(0),
Expand All @@ -1053,8 +1053,8 @@ impl AccountStorageEntry {
num_accounts: usize,
) -> Self {
Self {
id: AtomicAppendVecId::new(id),
slot: AtomicU64::new(slot),
id,
slot,
accounts,
count_and_status: SeqLock::new((0, AccountStorageStatus::Available)),
approx_store_count: AtomicUsize::new(num_accounts),
Expand Down Expand Up @@ -1112,11 +1112,11 @@ impl AccountStorageEntry {
}

pub fn slot(&self) -> Slot {
self.slot.load(Ordering::Acquire)
self.slot
}

pub fn append_vec_id(&self) -> AppendVecId {
self.id.load(Ordering::Acquire)
self.id
}

pub fn flush(&self) -> Result<(), AccountsFileError> {
Expand Down