feat: resume source paint across worker turns and cancel unpublished commands

This commit is contained in:
2026-10-23 11:07:49 +08:00
parent 180a08ea63
commit acaef9ae29
3 changed files with 202 additions and 47 deletions
+54 -15
View File
@@ -231,6 +231,8 @@ struct Session {
refresh_yields: usize,
refresh_restarts: usize,
layout_cancels: usize,
paint_cancels: usize,
paint_slices: usize,
}
impl std::ops::Deref for Session {
@@ -1159,6 +1161,8 @@ impl NativeCallable for Function {
("refreshYields", session.refresh_yields as i64),
("refreshRestarts", session.refresh_restarts as i64),
("layoutCancels", session.layout_cancels as i64),
("paintCancels", session.paint_cancels as i64),
("paintSlices", session.paint_slices as i64),
] {
cx.set_attr(stats, name, Value::Number(value.into()))?;
}
@@ -2451,12 +2455,12 @@ impl UiBridge {
result
}
pub fn paint_frame(
pub fn begin_paint_frame(
&self,
vm: &mut Vm,
root: Option<&UiNode>,
frame: &mut crate::document::Frame,
) -> Result<()> {
root: Option<Arc<UiNode>>,
frame: crate::document::Frame,
) -> Result<crate::source_paint::Progress> {
let (desktop, mounts) = {
let state = self
.session
@@ -2477,16 +2481,48 @@ impl UiBridge {
.collect::<Result<Vec<_>>>()?;
(state.desktop, mounts)
};
let reads = crate::source_paint::render(vm, desktop, mounts, root, frame)?;
let reads = reads
.into_iter()
.map(|object| vm.change_version(object).map(|version| (object, version)))
.collect::<Result<std::collections::BTreeMap<_, _>, _>>()?;
self.session
.lock()
.map_err(|_| anyhow::anyhow!("UI session poisoned"))?
.paint_reads = reads;
Ok(())
let progress = crate::source_paint::start(vm, desktop, mounts, root, frame, 256)?;
self.accept_paint_progress(vm, progress)
}
pub fn resume_paint_frame(
&self,
vm: &mut Vm,
work: crate::source_paint::Work,
) -> Result<crate::source_paint::Progress> {
let progress = work.resume(vm, 256)?;
self.accept_paint_progress(vm, progress)
}
fn accept_paint_progress(
&self,
vm: &Vm,
progress: crate::source_paint::Progress,
) -> Result<crate::source_paint::Progress> {
if let crate::source_paint::Progress::Complete(draft) = &progress {
let reads = draft.reads.iter().copied()
.map(|object| vm.change_version(object).map(|version| (object, version)))
.collect::<Result<std::collections::BTreeMap<_, _>, _>>()?;
let mut state = self.session.lock().map_err(|_| anyhow::anyhow!("UI session poisoned"))?;
state.paint_reads = reads;
state.paint_slices = draft.slices;
}
Ok(progress)
}
pub fn cancel_paint_frame(
&self,
vm: &mut Vm,
window: u64,
work: crate::source_paint::Work,
) -> Result<()> {
let cancelled = work.cancel(vm);
let invalidated = self.select_window(window).and_then(|()| {
self.session.lock().map_err(|_| anyhow::anyhow!("UI session poisoned"))?.force_frame = true;
Ok(())
});
cancelled?;
invalidated
}
pub fn begin_layout_frame(
@@ -2615,7 +2651,7 @@ impl UiBridge {
Ok(())
}
pub fn note_refresh_restart(&self, cancelled_layout: bool) -> Result<()> {
pub fn note_refresh_restart(&self, cancelled_layout: bool, cancelled_paint: bool) -> Result<()> {
let mut state = self
.session
.lock()
@@ -2624,6 +2660,7 @@ impl UiBridge {
state.layout_cancels = state
.layout_cancels
.saturating_add(usize::from(cancelled_layout));
state.paint_cancels = state.paint_cancels.saturating_add(usize::from(cancelled_paint));
Ok(())
}
@@ -2827,6 +2864,8 @@ pub fn install(vm: &mut Vm, roots: &mut Vec<ObjectRef>) -> Result<UiBridge> {
refresh_yields: 0,
refresh_restarts: 0,
layout_cancels: 0,
paint_cancels: 0,
paint_slices: 0,
}));
let mut public_functions = Vec::new();
let mut factories = Vec::new();