mirrors/salsa
1
0
Fork 0
mirror of https://github.com/salsa-rs/salsa.git synced 2024-11-25 04:27:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #55 from matklad/illigal-state

Browse source 
Refactor out some illegal states
This commit is contained in:
Niko Matsakis 2018-10-17 04:27:08 -04:00 committed by GitHub
commit 089f489df6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/derived.rs
View file

@ -230,7 +230,7 @@ where
// Check with an upgradable read to see if there is a value
// already. (This permits other readers but prevents anyone
// else from running `read_upgrade` at the same time.)
let mut old_value = match self.probe(
let mut old_memo = match self.probe(
self.map.upgradable_read(),
runtime,
revision_now,
@ -240,7 +240,11 @@ where
ProbeState::UpToDate(v) => return v,
ProbeState::StaleOrAbsent(map) => {
let mut map = RwLockUpgradableReadGuard::upgrade(map);
map.insert(key.clone(), QueryState::in_progress(runtime.id()))
match map.insert(key.clone(), QueryState::in_progress(runtime.id())) {
Some(QueryState::Memoized(old_memo)) => Some(old_memo),
Some(QueryState::InProgress { .. }) => unreachable!(),
None => None
}
}
};
@ -248,21 +252,21 @@ where
// has been a new revision since the last time we checked. So,
// first things first, let's walk over each of our previous
// inputs and check whether they are out of date.
if let Some(QueryState::Memoized(old_memo)) = &mut old_value {
if let Some(value) = old_memo.verify_memoized_value(db) {
if let Some(memo) = &mut old_memo {
if let Some(value) = memo.verify_memoized_value(db) {
debug!("{:?}({:?}): inputs still valid", Q::default(), key);
// If none of out inputs have changed since the last time we refreshed
// our value, then our value must still be good. We'll just patch
// the verified-at date and re-use it.
old_memo.verified_at = revision_now;
let changed_at = old_memo.changed_at;
memo.verified_at = revision_now;
let changed_at = memo.changed_at;
let new_value = StampedValue { value, changed_at };
self.overwrite_placeholder(
runtime,
descriptor,
key,
old_value.unwrap(),
old_memo.unwrap(),
&new_value,
);
return Ok(new_value);
@ -294,7 +298,7 @@ where
// really change, even if some of its inputs have. So we can
// "backdate" its `changed_at` revision to be the same as the
// old value.
if let Some(QueryState::Memoized(old_memo)) = &old_value {
if let Some(old_memo) = &old_memo {
if old_memo.value.as_ref() == Some(&stamped_value.value) {
assert!(old_memo.changed_at <= stamped_value.changed_at);
stamped_value.changed_at = old_memo.changed_at;
@ -311,12 +315,12 @@ where
runtime,
descriptor,
key,
QueryState::Memoized(Memo {
Memo {
changed_at: stamped_value.changed_at,
value,
inputs,
verified_at: revision_now,
}),
},
&stamped_value,
);
}
@ -446,13 +450,13 @@ where
runtime: &Runtime<DB>,
descriptor: &DB::QueryDescriptor,
key: &Q::Key,
map_value: QueryState<DB, Q>,
memo: Memo<DB, Q>,
new_value: &StampedValue<Q::Value>,
) {
// Overwrite the value, releasing the lock afterwards:
let waiting = {
let mut write = self.map.write();
match write.insert(key.clone(), map_value) {
match write.insert(key.clone(), QueryState::Memoized(memo)) {
Some(QueryState::InProgress { id, waiting }) => {
assert_eq!(id, runtime.id());