Skip to content

property_tracker: don't register dependencies for tracker that don't … #9737

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

property_tracker: don't register dependencies for tracker that don't … #9737

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions internal/core/properties.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@ mod single_linked_list_pin {
}
I(&self.0)
}

/// Returns true if the list is empty
pub fn is_empty(&self) -> bool {
self.0.is_none()
}
}

#[test]
Expand Down Expand Up @@ -1436,6 +1441,12 @@ impl<DirtyHandler: PropertyDirtyHandler> PropertyTracker<DirtyHandler> {

/// Register this property tracker as a dependency to the current binding/property tracker being evaluated
pub fn register_as_dependency_to_current_binding(self: Pin<&Self>) {
let dep_nodes = self.holder.dep_nodes.take();
if dep_nodes.is_empty() {
// No need to register dependency if we have no dependency ourselves
return;
}
self.holder.dep_nodes.set(dep_nodes);
if CURRENT_BINDING.is_set() {
CURRENT_BINDING.with(|cur_binding| {
if let Some(cur_binding) = cur_binding {
Expand Down Expand Up @@ -1463,8 +1474,9 @@ impl<DirtyHandler: PropertyDirtyHandler> PropertyTracker<DirtyHandler> {
/// If this is called during the evaluation of another property binding or property tracker, then
/// any changes to accessed properties will also mark the other binding/tracker dirty.
pub fn evaluate<R>(self: Pin<&Self>, f: impl FnOnce() -> R) -> R {
let r = self.evaluate_as_dependency_root(f);
self.register_as_dependency_to_current_binding();
self.evaluate_as_dependency_root(f)
r
}

/// Evaluate the function, and record dependencies of properties accessed within this function.
Expand All @@ -1488,8 +1500,9 @@ impl<DirtyHandler: PropertyDirtyHandler> PropertyTracker<DirtyHandler> {
/// Call [`Self::evaluate`] if and only if it is dirty.
/// But register a dependency in any case.
pub fn evaluate_if_dirty<R>(self: Pin<&Self>, f: impl FnOnce() -> R) -> Option<R> {
let r = self.is_dirty().then(|| self.evaluate_as_dependency_root(f));
self.register_as_dependency_to_current_binding();
self.is_dirty().then(|| self.evaluate_as_dependency_root(f))
r
}

/// Mark this PropertyTracker as dirty
Expand Down
Loading