Run source measurement and arrangement in the frame pipeline
Verify Tessera GUI / verify (push) Failing after 7m30s

This commit is contained in:
2026-10-21 15:58:30 +08:00
parent 7b11e32eb6
commit 1b5fe1069f
12 changed files with 854 additions and 75 deletions
+93 -15
View File
@@ -180,6 +180,7 @@ struct Session {
published_version: u64,
force_frame: bool,
paint_reads: std::collections::BTreeMap<ObjectRef, u64>,
layout_reads: std::collections::BTreeMap<ObjectRef, u64>,
snapshot_visited: usize,
snapshot_reused: usize,
}
@@ -1151,6 +1152,7 @@ impl UiBridge {
if state
.paint_reads
.iter()
.chain(state.layout_reads.iter())
.any(|(object, version)| vm.change_version(*object).ok() != Some(*version))
{
state.force_frame = true;
@@ -1188,7 +1190,9 @@ impl UiBridge {
let page = state.pending.unwrap_or(state.active);
let desktop = state.desktop;
let nodes = state.nodes.clone();
let hooks = state.mounts.synchronize(vm, desktop, page, nodes, frame)?;
let hooks = state
.mounts
.synchronize(vm, desktop, page, nodes, frame, false)?;
let result = (|| {
if snapshot.is_none() {
state.layout.clear_occurrences();
@@ -1263,20 +1267,93 @@ impl UiBridge {
Ok(())
}
pub fn layout_frame(&self, vm: &Vm, root: &UiNode) -> Result<crate::document::Frame> {
let mut state = self
.session
.lock()
.map_err(|_| anyhow::anyhow!("UI session poisoned"))?;
let mut frame = state.layout.frame(root)?;
frame.focus = match vm.get_attr(state.desktop, "focus") {
Ok(Value::Number(id)) => id.as_i64().and_then(|n| u64::try_from(n).ok()),
_ => None,
pub fn layout_frame(
&self,
vm: &mut Vm,
root: Option<Arc<UiNode>>,
) -> Result<crate::document::Frame> {
let Some(root) = root else {
self.session
.lock()
.map_err(|_| anyhow::anyhow!("UI session poisoned"))?
.layout_reads
.clear();
let frame = crate::document::Frame::default();
self.commit_frame(vm, None, &frame)?;
return Ok(frame);
};
frame.focus = frame
.focus
.filter(|id| frame.mounts.iter().any(|m| m.id == *id && m.interactive));
Ok(frame)
let (mut layout, desktop, page, nodes) = {
let state = self
.session
.lock()
.map_err(|_| anyhow::anyhow!("UI session poisoned"))?;
(
state.layout.clone(),
state.desktop,
state.pending.unwrap_or(state.active),
state.nodes.clone(),
)
};
let mut frame = layout.structure(&root)?;
let (hooks, mounts) = {
let mut state = self
.session
.lock()
.map_err(|_| anyhow::anyhow!("UI session poisoned"))?;
let hooks = state
.mounts
.synchronize(vm, desktop, page, nodes, &frame, true)?;
(hooks, state.mounts.ordered())
};
let result = (|| {
let reads = crate::source_layout::render(
vm,
desktop,
mounts,
root.clone(),
&mut frame,
&mut layout,
)?;
// Capture versions before lifecycle hooks can change a dependency.
let reads = reads
.into_iter()
.map(|object| vm.change_version(object).map(|version| (object, version)))
.collect::<Result<std::collections::BTreeMap<_, _>, _>>()?;
frame.focus = match vm.get_attr(desktop, "focus") {
Ok(Value::Number(id)) => id.as_i64().and_then(|n| u64::try_from(n).ok()),
_ => None,
};
frame.focus = frame
.focus
.filter(|id| frame.mounts.iter().any(|m| m.id == *id && m.interactive));
{
let mut state = self
.session
.lock()
.map_err(|_| anyhow::anyhow!("UI session poisoned"))?;
state.layout = layout;
state.layout_reads = reads;
}
self.commit_frame(vm, Some(root), &frame)?;
if let Some(hooks) = hooks {
let value = vm
.call_with_limits(
hooks,
&[],
endor_core::ExecutionLimits {
max_frames: 128,
max_instructions: 1_000_000,
},
)
.map_err(|error| crate::endor_host::runtime_error(vm, error))?;
vm.release_value(value)?;
}
Ok(frame)
})();
if let Some(hooks) = hooks {
vm.release(hooks)?;
}
result
}
pub fn rendered(&self, vm: &Vm) -> Result<Option<Arc<UiNode>>> {
let state = self
@@ -1313,6 +1390,7 @@ pub fn install(vm: &mut Vm, roots: &mut Vec<ObjectRef>) -> Result<UiBridge> {
published_version: 0,
force_frame: false,
paint_reads: std::collections::BTreeMap::new(),
layout_reads: std::collections::BTreeMap::new(),
snapshot_visited: 0,
snapshot_reused: 0,
}));
@@ -1560,7 +1638,7 @@ pub fn attach_desktop_type(
cx.attach_type(instance, definition)
}
fn desktop_type(
pub(crate) fn desktop_type(
store: &endor_core::ObjectStore,
name: &str,
desktop: ObjectRef,