Mirrors/dioxus
2
0
Fork 0
mirror of https://github.com/DioxusLabs/dioxus synced 2025-02-16 13:48:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't run effects from dead recycled scopes (#3201)

Browse source 
* Don't run effects from dead recycled scopes

* Fix scheduler
This commit is contained in:
Evan Almloff 2024-11-13 10:48:30 -06:00 • committed by GitHub
parent c1f3a6868e
commit 128608f3b2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
packages/core/src/runtime.rs
View file

@ -1,6 +1,7 @@
use crate::arena::ElementRef;
use crate::innerlude::{DirtyTasks, Effect};
use crate::nodes::VNodeMount;
use crate::scheduler::ScopeOrder;
use crate::scope_context::SuspenseLocation;
use crate::{
innerlude::{LocalTask, SchedulerMsg},
@ -129,6 +130,11 @@ impl Runtime {
self.remove_task(id);
}
// Drop all queued effects
self.pending_effects
.borrow_mut()
.remove(&ScopeOrder::new(scope.height, scope.id));
// Drop all hooks in reverse order in case a hook depends on another hook.
for hook in scope.hooks.take().drain(..).rev() {
drop(hook);

35
packages/core/src/scheduler.rs
View file

@ -148,13 +148,11 @@ impl VirtualDom {
/// Take the top task from the highest scope
pub(crate) fn pop_task(&mut self) -> Option<Task> {
let mut dirty_tasks = self.runtime.dirty_tasks.borrow_mut();
let mut tasks = dirty_tasks.first()?;
let tasks = dirty_tasks.first()?;
// If the scope doesn't exist for whatever reason, then we should skip it
while !self.scopes.contains(tasks.order.id.0) {
dirty_tasks.pop_first();
tasks = dirty_tasks.first()?;
}
// The scope that owns the effect should still exist. We can't just ignore the task if the scope doesn't exist
// because the scope id may have been reallocated
debug_assert!(self.scopes.contains(tasks.order.id.0));
let mut tasks = tasks.tasks_queued.borrow_mut();
let task = tasks.pop_front()?;
@ -168,27 +166,22 @@ impl VirtualDom {
/// Take any effects from the highest scope. This should only be called if there is no pending scope reruns or tasks
pub(crate) fn pop_effect(&mut self) -> Option<Effect> {
let mut pending_effects = self.runtime.pending_effects.borrow_mut();
let mut effect = pending_effects.pop_first()?;
let effect = pending_effects.pop_first()?;
// If the scope doesn't exist for whatever reason, then we should skip it
while !self.scopes.contains(effect.order.id.0) {
effect = pending_effects.pop_first()?;
}
// The scope that owns the effect should still exist. We can't just ignore the effect if the scope doesn't exist
// because the scope id may have been reallocated
debug_assert!(self.scopes.contains(effect.order.id.0));
Some(effect)
}
/// Take any work from the highest scope. This may include rerunning the scope and/or running tasks
pub(crate) fn pop_work(&mut self) -> Option<Work> {
let mut dirty_scope = self.dirty_scopes.first();
// Pop any invalid scopes off of each dirty task;
while let Some(scope) = dirty_scope {
if !self.scopes.contains(scope.id.0) {
self.dirty_scopes.pop_first();
dirty_scope = self.dirty_scopes.first();
} else {
break;
}
let dirty_scope = self.dirty_scopes.first();
// Make sure the top dirty scope is valid
#[cfg(debug_assertions)]
if let Some(scope) = dirty_scope {
assert!(self.scopes.contains(scope.id.0));
}
// Find the height of the highest dirty scope
@ -197,7 +190,7 @@ impl VirtualDom {
let mut dirty_task = dirty_tasks.first();
// Pop any invalid tasks off of each dirty scope;
while let Some(task) = dirty_task {
if task.tasks_queued.borrow().is_empty() || !self.scopes.contains(task.order.id.0) {
if task.tasks_queued.borrow().is_empty() {
dirty_tasks.pop_first();
dirty_task = dirty_tasks.first()
} else {