diff --git a/apps/solidcraft/src/main.rs b/apps/solidcraft/src/main.rs index c4cfcf40f..3d18f9e93 100644 --- a/apps/solidcraft/src/main.rs +++ b/apps/solidcraft/src/main.rs @@ -1145,12 +1145,13 @@ fn main() -> eframe::Result { } /// egui-wgpu is about to start a step of getting the graphics device and the window's surface up: -/// the crash journal keeps it, and the adapter once it is picked. +/// the crash journal keeps it until the app runs (a window opened later goes through the same +/// steps), and the adapter once it is picked. fn startup_step(step: &'static str, detail: &str) { if step == eframe::egui_wgpu::STEP_ADAPTER_CHOSEN { solidcraft_engine::crash::set_environment(&format!("Renderer: {detail}")); } - solidcraft_engine::crash::phase(step); + solidcraft_engine::crash::startup_step(step); } /// The renderer settings: with `cpu`, the software adapter (WARP, lavapipe, llvmpipe). The diff --git a/crates/engine/src/crash.rs b/crates/engine/src/crash.rs index a56d2e089..e307c645d 100644 --- a/crates/engine/src/crash.rs +++ b/crates/engine/src/crash.rs @@ -365,9 +365,22 @@ pub fn phase(step: &str) { j.write(&line); j.phase = Some(line); j.phase_step = Some(step.to_string()); + j.running |= step == RUNNING; } } +/// A step of getting a window's graphics up (egui-wgpu's `window surface`, `surface configure`, +/// …): the [`phase`] until the app is [`RUNNING`], ignored after. A window opened later (the +/// agent chat on its own, say) goes through the same steps, and must not make a crash an hour +/// later read as a crash during startup (#8776). +pub fn startup_step(step: &str) { + let Some(s) = STATE.get() else { return }; + if s.journal.lock().is_ok_and(|j| j.running) { + return; + } + phase(step); +} + /// Where a native crash handler writes what it caught for this run: a small JSON file /// (`code`, `name`, `address`, `module`, `offset`, `detail`, `thread`, and from macOS /// `thread_name` and `frames`) and a minidump. The next @@ -622,6 +635,8 @@ struct Journal { /// The latest startup step's line and name, and the renderer's line (kept across rebases). phase: Option, phase_step: Option, + /// The app reached [`RUNNING`] once: later startup steps are not startup ([`startup_step`]). + running: bool, environment: Option, } @@ -642,6 +657,7 @@ impl Journal { running_at: None, phase: None, phase_step: None, + running: false, environment: None, }; j.rebase(&json!("new"), 0); @@ -889,6 +905,7 @@ fn unclean_exit(dir: &Path, build: &Build, journal: &Path) { running_at: None, phase: None, phase_step: None, + running: false, environment: None, }), known: Mutex::new(list(dir).into_iter().filter_map(|s| sig_of(&s.id).map(|sig| (sig, (0, s.id)))).collect()), diff --git a/crates/engine/src/crash_tests.rs b/crates/engine/src/crash_tests.rs index 1c13991ee..0c4608562 100644 --- a/crates/engine/src/crash_tests.rs +++ b/crates/engine/src/crash_tests.rs @@ -50,6 +50,15 @@ fn child() { } std::process::abort(); } + // Up and running, then a second window's surface (the agent chat on its own), then dying. + if mode == "late_surface" { + startup_step("window surface"); + startup_step("surface configure"); + phase(RUNNING); + startup_step("window surface"); + startup_step("surface configure"); + std::process::abort(); + } set_environment("Renderer: test"); let mut s = Session { crash_journal: true, ..Default::default() }; s.execute("solid.box", &json!({"length": 10, "width": 20, "height": 30})).unwrap(); @@ -443,6 +452,21 @@ fn a_crash_signal_is_reported_with_its_thread_and_its_walk_up_the_stack() { let _ = fs::remove_dir_all(&d); } +#[test] +fn a_window_surface_after_startup_is_not_a_startup_crash() { + let d = fresh_dir("late_surface"); + let (_, ok) = run_child(&d, "late_surface"); + assert!(!ok, "the child aborted"); + let (_, ok) = run_child(&d, "none"); + assert!(ok); + let (s, v) = only_report(&d); + assert_eq!(s.kind, "unclean_exit"); + assert!(!s.message.contains("during startup"), "{}", s.message); + assert!(s.message.contains("between commands"), "{}", s.message); + assert!(v.get("startup_phase").is_none(), "{v}"); + let _ = fs::remove_dir_all(&d); +} + #[test] fn startup_steps_survive_a_rebase_and_running_ends_startup() { let d = fresh_dir("rebase");