mirrors/salsa
1
0
Fork 0
mirror of https://github.com/salsa-rs/salsa.git synced 2025-02-02 09:46:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Modify struct ingredient lookups

Browse source
This commit is contained in:
Shoyu Vanilla 2024-11-15 01:40:45 +09:00
parent fac6053761
commit 2cae1ef5bb
7 changed files with 55 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
components/salsa-macro-rules/src/setup_input_struct.rs
View file

@ -124,6 +124,9 @@ macro_rules! setup_input_struct {
}
impl $zalsa::SalsaStructInDb for $Struct {
fn lookup_ingredient_index(aux: &dyn $zalsa::JarAux) -> core::option::Option<$zalsa::IngredientIndex> {
aux.lookup_jar_by_type(&<$zalsa_struct::JarImpl<$Configuration>>::default())
}
}
impl $Struct {

3
components/salsa-macro-rules/src/setup_interned_struct.rs
View file

@ -141,6 +141,9 @@ macro_rules! setup_interned_struct {
}
impl $zalsa::SalsaStructInDb for $Struct<'_> {
fn lookup_ingredient_index(aux: &dyn $zalsa::JarAux) -> core::option::Option<$zalsa::IngredientIndex> {
aux.lookup_jar_by_type(&<$zalsa_struct::JarImpl<$Configuration>>::default())
}
}
unsafe impl $zalsa::Update for $Struct<'_> {

8
components/salsa-macro-rules/src/setup_tracked_fn.rs
View file

@ -99,6 +99,9 @@ macro_rules! setup_tracked_fn {
$zalsa::IngredientCache::new();
impl $zalsa::SalsaStructInDb for $InternedData<'_> {
fn lookup_ingredient_index(_aux: &dyn $zalsa::JarAux) -> core::option::Option<$zalsa::IngredientIndex> {
None
}
}
impl $zalsa::interned::Configuration for $Configuration {
@ -203,10 +206,7 @@ macro_rules! setup_tracked_fn {
if $needs_interner {
first_index.successor(0)
} else {
aux
.lookup_struct_ingredient_index(
core::any::TypeId::of::<$InternedData<'static>>()
)
<$InternedData as $zalsa::SalsaStructInDb>::lookup_ingredient_index(aux)
.expect(
"Salsa struct is passed as an argument of a tracked function, but its ingredient hasn't been added!"
)

3
components/salsa-macro-rules/src/setup_tracked_struct.rs
View file

@ -152,6 +152,9 @@ macro_rules! setup_tracked_struct {
}
impl $zalsa::SalsaStructInDb for $Struct<'_> {
fn lookup_ingredient_index(aux: &dyn $zalsa::JarAux) -> core::option::Option<$zalsa::IngredientIndex> {
aux.lookup_jar_by_type(&<$zalsa_struct::JarImpl<$Configuration>>::default())
}
}
impl $zalsa::TrackedStructInDb for $Struct<'_> {

2
src/ingredient.rs
View file

@ -29,7 +29,7 @@ pub trait Jar: Any {
}
pub trait JarAux {
fn lookup_struct_ingredient_index(&self, type_id: TypeId) -> Option<IngredientIndex>;
fn lookup_jar_by_type(&self, jar: &dyn Jar) -> Option<IngredientIndex>;
fn next_memo_ingredient_index(
&self,

6
src/salsa_struct.rs
View file

@ -1 +1,5 @@
pub trait SalsaStructInDb {}
use crate::{plumbing::JarAux, IngredientIndex};
pub trait SalsaStructInDb {
fn lookup_ingredient_index(aux: &dyn JarAux) -> Option<IngredientIndex>;
}

65
src/zalsa.rs
View file

@ -119,10 +119,10 @@ pub struct Zalsa {
nonce: Nonce<StorageNonce>,
/// Map from the [`IngredientIndex`][] of a salsa struct to a list of
/// [ingredient-indices](`IngredientIndex`)for tracked functions that have this salsa struct
/// Map from the [`IngredientIndex::as_usize`][] of a salsa struct to a list of
/// [ingredient-indices](`IngredientIndex`) for tracked functions that have this salsa struct
/// as input.
memo_ingredients: RwLock<FxHashMap<IngredientIndex, Vec<IngredientIndex>>>,
memo_ingredient_indices: RwLock<Vec<Vec<IngredientIndex>>>,
/// Map from the type-id of an `impl Jar` to the index of its first ingredient.
/// This is using a `Mutex<FxHashMap>` (versus, say, a `FxDashMap`)
@ -132,9 +132,6 @@ pub struct Zalsa {
/// adding new kinds of ingredients.
jar_map: Mutex<FxHashMap<TypeId, IngredientIndex>>,
/// Map from the type-id of a salsa struct to the index of its first ingredient.
salsa_struct_map: Mutex<FxHashMap<TypeId, IngredientIndex>>,
/// Vector of ingredients.
///
/// Immutable unless the mutex on `ingredients_map` is held.
@ -154,11 +151,10 @@ impl Zalsa {
views_of: Views::new::<Db>(),
nonce: NONCE.nonce(),
jar_map: Default::default(),
salsa_struct_map: Default::default(),
ingredients_vec: AppendOnlyVec::new(),
ingredients_requiring_reset: AppendOnlyVec::new(),
runtime: Runtime::default(),
memo_ingredients: Default::default(),
memo_ingredient_indices: Default::default(),
}
}
@ -192,11 +188,14 @@ impl Zalsa {
{
let jar_type_id = jar.type_id();
let mut jar_map = self.jar_map.lock();
*jar_map
.entry(jar_type_id)
.or_insert_with(|| {
let index = IngredientIndex::from(self.ingredients_vec.len());
let ingredients = jar.create_ingredients(self, index);
let mut should_create = false;
let index = *jar_map.entry(jar_type_id).or_insert_with(|| {
should_create = true;
IngredientIndex::from(self.ingredients_vec.len())
});
if should_create {
let aux = JarAuxImpl(self, &jar_map);
let ingredients = jar.create_ingredients(&aux, index);
for ingredient in ingredients {
let expected_index = ingredient.ingredient_index();
@ -204,9 +203,7 @@ impl Zalsa {
self.ingredients_requiring_reset.push(expected_index);
}
let actual_index = self
.ingredients_vec
.push(ingredient);
let actual_index = self.ingredients_vec.push(ingredient);
assert_eq!(
expected_index.as_usize(),
actual_index,
@ -215,13 +212,10 @@ impl Zalsa {
expected_index,
actual_index,
);
}
}
}
if let Some(type_id) = jar.salsa_struct_type_id() {
self.salsa_struct_map.lock().insert(type_id, index);
}
index
})
}
}
@ -302,16 +296,16 @@ impl Zalsa {
struct_ingredient_index: IngredientIndex,
memo_ingredient_index: MemoIngredientIndex,
) -> IngredientIndex {
self.memo_ingredients.read()[&struct_ingredient_index][memo_ingredient_index.as_usize()]
self.memo_ingredient_indices.read()[struct_ingredient_index.as_usize()]
[memo_ingredient_index.as_usize()]
}
}
impl JarAux for Zalsa {
fn lookup_struct_ingredient_index(&self, type_id: TypeId) -> Option<IngredientIndex> {
self.salsa_struct_map
.lock()
.get(&type_id)
.map(ToOwned::to_owned)
struct JarAuxImpl<'a>(&'a Zalsa, &'a FxHashMap<TypeId, IngredientIndex>);
impl<'a> JarAux for JarAuxImpl<'a> {
fn lookup_jar_by_type(&self, jar: &dyn Jar) -> Option<IngredientIndex> {
self.1.get(&jar.type_id()).map(ToOwned::to_owned)
}
fn next_memo_ingredient_index(
@ -319,8 +313,19 @@ impl JarAux for Zalsa {
struct_ingredient_index: IngredientIndex,
ingredient_index: IngredientIndex,
) -> MemoIngredientIndex {
let mut memo_ingredients = self.memo_ingredients.write();
let memo_ingredients = memo_ingredients.entry(struct_ingredient_index).or_default();
let mut memo_ingredients = self.0.memo_ingredient_indices.write();
let memo_ingredients = if let Some(memo_ingredients) =
memo_ingredients.get_mut(struct_ingredient_index.as_usize())
{
memo_ingredients
} else {
while memo_ingredients.len() <= struct_ingredient_index.as_usize() {
memo_ingredients.push(Vec::new());
}
memo_ingredients
.get_mut(struct_ingredient_index.as_usize())
.unwrap()
};
let mi = MemoIngredientIndex(u32::try_from(memo_ingredients.len()).unwrap());
memo_ingredients.push(ingredient_index);
mi