From 1c8affc82783c0ac088ac9501b2198410b0b5c87 Mon Sep 17 00:00:00 2001 From: Willem Vanhulle Date: Sun, 11 Oct 2026 19:44:50 +0200 Subject: [PATCH] fix: separation of tree and timeline --- CONTRIBUTING.md | 2 +- README.md | 1 + docs/initrd.png | Bin 3604 -> 8237 bytes docs/shutdown.png | Bin 0 -> 7150 bytes docs/stage-2.png | Bin 5832 -> 10134 bytes src/model.rs | 88 ++++++++++++++++++++++++++++++++++++++++++++++ src/run.rs | 37 +++++++++++++------ src/view.rs | 37 +++++++++++++------ 8 files changed, 142 insertions(+), 23 deletions(-) create mode 100644 docs/shutdown.png diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f807413..73c0ed7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -16,7 +16,7 @@ Work inside the dev shell (`direnv allow` once). Run `cargo clippy - `nix build .#checks.x86_64-linux.boot`: boots a VM and reads the screen with OCR; screenshots land in `result/`. Run it by hand with `nix run .#checks.x86_64-linux.boot.driverInteractive`, then `test_script()`. - The images in `docs/` are crops of these screenshots. + The images in `docs/` are copies of these screenshots. Prefix the VM commands with `env -u LD_LIBRARY_PATH` when the shell exports libraries that clash with QEMU's. diff --git a/README.md b/README.md index 3d962dd..9f8d638 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ units still pending and a timeline of the ones that ran. ![The initrd: pending units on top, the timeline below](docs/initrd.png) ![Stage 2: the initrd collapsed, a failed unit, three still running](docs/stage-2.png) +![Shutdown: the unit still stopping at the end of the chain waiting on it](docs/shutdown.png) It needs systemd ≥ 246 as PID 1, libdbus and a virtual terminal (it draws on tty12). With a systemd initrd it starts about a second after the kernel and diff --git a/docs/initrd.png b/docs/initrd.png index 4f7205ef6cfc033948c71de8cad5769eef2aa1b9..0e8eb97238a225353a796d693e7bba3dce6a781c 100644 GIT binary patch literal 8237 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 VTj#g-Q3eJE22WQ%mvv4FO#ngeprrr+ literal 3604 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 E0OXutGynhq diff --git a/docs/shutdown.png b/docs/shutdown.png new file mode 100644 index 0000000000000000000000000000000000000000..86a12443893391016762803610efed10c3967449 GIT binary patch literal 7150 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 a`J9-u`xPMnO?l- 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 i?pvG;*%x(I|C3kPvZe7_ijNs6b$hz{xvX) -> Vec { + let mut kept_below: Vec = Vec::new(); + let mut kept: Vec = rows + .iter() + .rev() + .map(|row| { + let descendant_kept = kept_below.iter().skip(row.depth + 1).any(|kept| *kept); + kept_below.resize(row.depth + 1, false); + let anchors_the_tree = row.depth == 0 && row.is_target; + let keep = row.status == RowStatus::Running || descendant_kept || anchors_the_tree; + kept_below[row.depth] |= keep; + keep + }) + .collect(); + kept.reverse(); + let survivors: Vec = rows + .into_iter() + .zip(kept) + .filter_map(|(row, keep)| keep.then_some(row)) + .collect(); + relink_siblings(survivors) +} + +fn relink_siblings(rows: Vec) -> Vec { + let mut later_sibling: Vec = Vec::new(); + let mut is_last: Vec = rows + .iter() + .rev() + .map(|row| { + let last = !later_sibling.get(row.depth).copied().unwrap_or(false); + later_sibling.resize(row.depth + 1, false); + later_sibling[row.depth] = true; + last + }) + .collect(); + is_last.reverse(); + let mut ancestry: Vec = Vec::new(); + rows.into_iter() + .zip(is_last) + .map(|(row, last)| { + ancestry.truncate(row.depth); + ancestry.push(last); + PendingRow { + is_last_sibling: ancestry.clone(), + ..row + } + }) + .collect() +} + fn display_label(facts: &UnitFacts) -> String { if let Some(stem) = facts.name.strip_suffix(".service") { return stem.to_owned(); @@ -780,6 +831,43 @@ mod tests { ); } + #[test] + fn only_chains_leading_to_running_units_stay_in_view() { + let rows = paths_to_running(sample().pending_rows()); + let outline: Vec = rows + .iter() + .map(|row| format!("{}{}", " ".repeat(row.depth), row.label)) + .collect(); + assert_eq!( + outline, + [ + "graphical.target", + " multi-user.target", + " docker", + " nm-wait", + " nm", + ] + ); + let lasts: Vec = rows + .iter() + .map(|row| *row.is_last_sibling.last().unwrap()) + .collect(); + assert_eq!(lasts, [true, true, false, true, true]); + } + + #[test] + fn with_nothing_running_only_the_root_target_stays_in_view() { + let mut state = BootState::new(Phase::Host); + state.set_root("demo.target".to_owned()); + state.track_unit(facts("demo.target", &["idle.service"]), Activity::default()); + state.track_unit(facts("idle.service", &[]), Activity::default()); + state.queue_job(1, "demo.target", JobKind::BringsUp, Duration::ZERO); + state.queue_job(2, "idle.service", JobKind::BringsUp, Duration::ZERO); + let rows = paths_to_running(state.pending_rows()); + assert_eq!(rows.len(), 1); + assert_eq!(rows[0].label, "demo.target"); + } + #[test] fn finished_jobs_leave_the_tree_and_count_toward_their_milestone() { let mut state = sample(); diff --git a/src/run.rs b/src/run.rs index ab50f21..4260673 100644 --- a/src/run.rs +++ b/src/run.rs @@ -16,7 +16,8 @@ use bootvine::{ use crossterm::event::{self, Event, KeyCode, KeyEvent, KeyModifiers}; use ratatui::{ DefaultTerminal, - backend::{Backend, ClearType}, + backend::Backend, + buffer::{Buffer, CellDiffOption}, }; use rustix::system::uname; use signal_hook::{consts::SIGTERM, flag}; @@ -89,6 +90,21 @@ fn asks_to_quit(event: &Event) -> bool { || (*code == KeyCode::Char('c') && modifiers.contains(KeyModifiers::CONTROL)) } +fn overwrite_every_cell(backend: &mut B, frame: &Buffer) -> Result<(), B::Error> { + backend.draw( + frame + .content + .iter() + .enumerate() + .filter(|(_, cell)| cell.diff_option != CellDiffOption::Skip) + .map(|(index, cell)| { + let (x, y) = frame.pos_of(index); + (x, y, cell) + }), + )?; + backend.flush() +} + fn watch( state: &mut BootState, feed: &mut Feed, @@ -103,16 +119,9 @@ fn watch( let mut last_full_repaint = Instant::now(); loop { feed.pump(state, FRAME_INTERVAL)?; - if feed.session.is_none() - || feed.connections != painted_connections - || last_full_repaint.elapsed() >= FULL_REPAINT_INTERVAL - { - terminal.backend_mut().clear_region(ClearType::All)?; - terminal.swap_buffers(); - painted_connections = feed.connections; - last_full_repaint = Instant::now(); - } - terminal.draw(|canvas| { + let repaint_due = feed.connections != painted_connections + || last_full_repaint.elapsed() >= FULL_REPAINT_INTERVAL; + let completed = terminal.draw(|canvas| { canvas.render_widget( BootView { state, @@ -124,6 +133,12 @@ fn watch( canvas.area(), ); })?; + if repaint_due { + let painted = completed.buffer.clone(); + overwrite_every_cell(terminal.backend_mut(), &painted)?; + painted_connections = feed.connections; + last_full_repaint = Instant::now(); + } if state.is_complete() { eprintln!( "bootvine: {} reached, handing the console over", diff --git a/src/view.rs b/src/view.rs index 09bbdee..e38481f 100644 --- a/src/view.rs +++ b/src/view.rs @@ -14,7 +14,7 @@ use ratatui::{ }; use crate::{ - model::{BootState, FinishedRun, MilestoneRow, PendingRow, RowStatus, Tally}, + model::{BootState, FinishedRun, MilestoneRow, PendingRow, RowStatus, Tally, paths_to_running}, palette::Palette, }; @@ -36,6 +36,7 @@ const TIMELINE_LABEL_WIDTH: u16 = 28; const MIN_BAR_WIDTH: u16 = 12; const MIN_HEIGHT_FOR_TIMELINE: u16 = 12; const TIMELINE_CHROME_HEIGHT: u16 = 3; +const MIN_TIMELINE_HEIGHT: u16 = TIMELINE_CHROME_HEIGHT + 4; const HEADER_HEIGHT: u16 = 2; const FOOTER_HEIGHT: u16 = 2; const MAX_FAILED_ROWS: usize = 3; @@ -80,7 +81,10 @@ struct TimelineContent<'a> { impl Widget for BootView<'_> { fn render(self, area: Rect, buf: &mut Buffer) { - let rows = self.state.pending_rows(); + let all_rows = self.state.pending_rows(); + let pending_count = all_rows.len(); + let rows = paths_to_running(all_rows); + let folded = pending_count - rows.len(); let mut running: Vec<&PendingRow> = rows .iter() .filter(|row| !row.is_target && row.status == RowStatus::Running) @@ -108,7 +112,7 @@ impl Widget for BootView<'_> { let heights = Heights::share( area.height .saturating_sub(HEADER_HEIGHT + stages_height + failures_height + FOOTER_HEIGHT), - u16::try_from(rows.len()).unwrap_or(u16::MAX), + u16::try_from(rows.len() + usize::from(folded > 0)).unwrap_or(u16::MAX), timeline_need, ); @@ -126,7 +130,7 @@ impl Widget for BootView<'_> { self.header().render(header, buf); Paragraph::new(stages).render(stage_area, buf); - self.tree(&rows, tree.height).render(tree, buf); + self.tree(&rows, folded, tree.height).render(tree, buf); Paragraph::new(failures).render(failed, buf); if heights.timeline > 0 { let bar_rows = usize::from(heights.timeline.saturating_sub(TIMELINE_CHROME_HEIGHT)); @@ -169,7 +173,9 @@ impl Heights { timeline: timeline_need, }; } - let timeline = timeline_need.min((free / 2).max(free.saturating_sub(tree_need))); + let timeline = timeline_need + .min(free.saturating_sub(tree_need).max(MIN_TIMELINE_HEIGHT)) + .min(free); Self { tree: free - timeline, timeline, @@ -342,14 +348,14 @@ impl BootView<'_> { } } - fn tree<'a>(&self, rows: &'a [PendingRow], height: u16) -> Table<'a> { + fn tree<'a>(&self, rows: &'a [PendingRow], folded: usize, height: u16) -> Table<'a> { let capacity = usize::from(height); - let shown = if rows.len() > capacity { - capacity.saturating_sub(1) + let shown = if rows.len() + usize::from(folded > 0) > capacity { + capacity.saturating_sub(1).min(rows.len()) } else { rows.len() }; - let hidden = rows.len() - shown; + let hidden = rows.len() - shown + folded; let overflow = (hidden > 0).then(|| { Row::new([Line::styled( format!("… {hidden} more"), @@ -829,8 +835,8 @@ mod tests { assert!(lines[3].starts_with("graphical.target"), "{screen}"); assert!(lines[4].starts_with("└─ multi-user.target"), "{screen}"); assert!(lines[5].starts_with(" ├─ [/] systemd-rfkill"), "{screen}"); - assert!(lines[6].starts_with(" ├─ [/] docker"), "{screen}"); - assert!(lines[7].starts_with(" └─ [ ] web"), "{screen}"); + assert!(lines[6].starts_with(" └─ [/] docker"), "{screen}"); + assert!(lines[7].starts_with("… 1 more"), "{screen}"); assert!( lines[8].starts_with("× nvidia-powerd.service failed"), "{screen}" @@ -966,6 +972,15 @@ mod tests { ); } + #[test] + fn a_long_tree_keeps_the_room_and_leaves_the_timeline_a_strip() { + let heights = Heights::share(30, 40, 50); + assert_eq!(heights.timeline, MIN_TIMELINE_HEIGHT); + assert_eq!(heights.tree, 30 - MIN_TIMELINE_HEIGHT); + let heights = Heights::share(30, 12, 50); + assert_eq!((heights.tree, heights.timeline), (12, 18)); + } + #[test] fn overflowing_trees_are_cut_with_a_count() { let mut state = BootState::new(Phase::Host);