mirrors/salsa
1
0
Fork 0
mirror of https://github.com/salsa-rs/salsa.git synced 2025-01-23 13:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

switch to a NonZeroU64 so that Option<Revision> is one word

Browse source
This commit is contained in:
Niko Matsakis 2019-06-19 06:31:25 -07:00
parent 4f8c4720d4
commit 3224c322e8
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/runtime.rs
View file

@ -8,6 +8,7 @@ use rustc_hash::{FxHashMap, FxHasher};
use smallvec::SmallVec; use smallvec::SmallVec;
use std::fmt::Write; use std::fmt::Write;
use std::hash::BuildHasherDefault; use std::hash::BuildHasherDefault;
use std::num::NonZeroU64;
use std::sync::atomic::{AtomicU64, AtomicUsize, Ordering}; use std::sync::atomic::{AtomicU64, AtomicUsize, Ordering};
use std::sync::Arc; use std::sync::Arc;
@ -154,17 +155,13 @@ where
/// Read current value of the revision counter. /// Read current value of the revision counter.
#[inline] #[inline]
pub(crate) fn current_revision(&self) -> Revision { pub(crate) fn current_revision(&self) -> Revision {
Revision { Revision::from(self.shared_state.revision.load(Ordering::SeqCst))
generation: self.shared_state.revision.load(Ordering::SeqCst),
}
} }
/// Read current value of the revision counter. /// Read current value of the revision counter.
#[inline] #[inline]
fn pending_revision(&self) -> Revision { fn pending_revision(&self) -> Revision {
Revision { Revision::from(self.shared_state.pending_revision.load(Ordering::SeqCst))
generation: self.shared_state.pending_revision.load(Ordering::SeqCst),
}
} }
/// Check if the current revision is canceled. If this method ever /// Check if the current revision is canceled. If this method ever
@ -286,9 +283,7 @@ where
let old_revision = self.shared_state.revision.fetch_add(1, Ordering::SeqCst); let old_revision = self.shared_state.revision.fetch_add(1, Ordering::SeqCst);
assert_eq!(current_revision, old_revision); assert_eq!(current_revision, old_revision);
let new_revision = Revision { let new_revision = Revision::from(current_revision + 1);
generation: current_revision + 1,
};
debug!("increment_revision: incremented to {:?}", new_revision); debug!("increment_revision: incremented to {:?}", new_revision);
@ -517,7 +512,7 @@ impl<DB: Database> ActiveQuery<DB> {
database_key, database_key,
changed_at: ChangedAt { changed_at: ChangedAt {
is_constant: true, is_constant: true,
revision: Revision::START, revision: Revision::start(),
}, },
dependencies: Some(FxIndexSet::default()), dependencies: Some(FxIndexSet::default()),
} }
@ -563,16 +558,22 @@ pub struct RuntimeId {
/// directly as a user of salsa. /// directly as a user of salsa.
#[derive(Copy, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)] #[derive(Copy, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
pub struct Revision { pub struct Revision {
generation: u64, generation: NonZeroU64,
} }
impl Revision { impl Revision {
pub(crate) const START: Self = Revision { generation: 1 }; fn start() -> Self {
Self::from(1)
}
fn from(g: u64) -> Self {
Self {
generation: NonZeroU64::new(g).unwrap(),
}
}
fn next(self) -> Revision { fn next(self) -> Revision {
Revision { Self::from(self.generation.get() + 1)
generation: self.generation + 1,
}
} }
} }