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

Move salsa event system into Zalsa (#849)

Browse source 
* Move salsa event system into `Zalsa`

* Encode `None` into ShallowUpdate

This shrinks the return value from 16 to 8 bytes
This commit is contained in:
Lukas Wirth 2025-05-07 13:45:49 +02:00 • committed by GitHub
parent f78a641d20
commit cfa88e9a4d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
35 changed files with 422 additions and 353 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/function/execute.rs
View file

@ -4,7 +4,7 @@ use crate::function::{Configuration, IngredientImpl};
use crate::loom::sync::atomic::{AtomicBool, Ordering};
use crate::zalsa::{MemoIngredientIndex, Zalsa, ZalsaDatabase};
use crate::zalsa_local::{ActiveQueryGuard, QueryRevisions};
use crate::{Database, Event, EventKind, Id, Revision};
use crate::{Event, EventKind, Id, Revision};
impl<C> IngredientImpl<C>
where
@ -30,14 +30,13 @@ where
let id = database_key_index.key_index();
tracing::info!("{:?}: executing query", database_key_index);
let zalsa = db.zalsa();
db.salsa_event(&|| {
zalsa.event(&|| {
Event::new(EventKind::WillExecute {
database_key: database_key_index,
})
});
let zalsa = db.zalsa();
let memo_ingredient_index = self.memo_ingredient_index(zalsa, id);
let (new_value, mut revisions) = match C::CYCLE_STRATEGY {
@ -104,7 +103,7 @@ where
// Diff the new outputs with the old, to discard any no-longer-emitted
// outputs and update the tracked struct IDs for seeding the next revision.
self.diff_outputs(zalsa, db, database_key_index, old_memo, &mut revisions);
self.diff_outputs(zalsa, database_key_index, old_memo, &mut revisions);
}
self.insert_memo(
zalsa,
@ -209,7 +208,7 @@ where
if iteration_count > MAX_ITERATIONS {
panic!("{database_key_index:?}: execute: too many cycle iterations");
}
db.salsa_event(&|| {
zalsa.event(&|| {
Event::new(EventKind::WillIterateCycle {
database_key: database_key_index,
iteration_count,