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

name the field runtime_id

Browse source
This commit is contained in:
Niko Matsakis 2018-10-30 20:39:56 -04:00
parent cf9db9cc7f
commit 2e3f8b1a3d
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/derived.rs
View file

@ -315,7 +315,7 @@ where
);
db.salsa_event(|| Event {
id: runtime.id(),
runtime_id: runtime.id(),
kind: EventKind::DidValidateMemoizedValue {
descriptor: descriptor.clone(),
},
@ -464,9 +464,9 @@ where
std::mem::drop(map);
db.salsa_event(|| Event {
id: db.salsa_runtime().id(),
runtime_id: db.salsa_runtime().id(),
kind: EventKind::WillBlockOn {
other_id,
other_runtime_id: other_id,
descriptor: descriptor.clone(),
},
});

2
src/input.rs
View file

@ -84,7 +84,7 @@ where
let mut map = self.map.write();
db.salsa_event(|| Event {
id: db.salsa_runtime().id(),
runtime_id: db.salsa_runtime().id(),
kind: EventKind::WillChangeInputValue {
descriptor: descriptor.clone(),
},

12
src/lib.rs
View file

@ -73,14 +73,14 @@ pub trait Database: plumbing::DatabaseStorageTypes + plumbing::DatabaseOps {
}
pub struct Event<DB: Database> {
pub id: RuntimeId,
pub runtime_id: RuntimeId,
pub kind: EventKind<DB>,
}
impl<DB: Database> fmt::Debug for Event<DB> {
fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
fmt.debug_struct("Event")
.field("id", &self.id)
.field("runtime_id", &self.runtime_id)
.field("kind", &self.kind)
.finish()
}
@ -94,7 +94,7 @@ pub enum EventKind<DB: Database> {
/// Executes before the "re-used" value is returned.
DidValidateMemoizedValue { descriptor: DB::QueryDescriptor },
/// Indicates that another thread (with id `other_id`) is processing the
/// Indicates that another thread (with id `other_runtime_id`) is processing the
/// given query (`descriptor`), so we will block until they
/// finish.
///
@ -104,7 +104,7 @@ pub enum EventKind<DB: Database> {
/// (NB: you can find the `id` of the current thread via the
/// `salsa_runtime`)
WillBlockOn {
other_id: RuntimeId,
other_runtime_id: RuntimeId,
descriptor: DB::QueryDescriptor,
},
@ -126,11 +126,11 @@ impl<DB: Database> fmt::Debug for EventKind<DB> {
.field("descriptor", descriptor)
.finish(),
EventKind::WillBlockOn {
other_id,
other_runtime_id,
descriptor,
} => fmt
.debug_struct("WillBlockOn")
.field("other_id", other_id)
.field("other_runtime_id", other_runtime_id)
.field("descriptor", descriptor)
.finish(),
EventKind::WillChangeInputValue { descriptor } => fmt

2
src/runtime.rs
View file

@ -258,7 +258,7 @@ where
debug!("{:?}: execute_query_implementation invoked", descriptor);
db.salsa_event(|| Event {
id: db.salsa_runtime().id(),
runtime_id: db.salsa_runtime().id(),
kind: EventKind::WillExecute {
descriptor: descriptor.clone(),
},