This commit is contained in:
@@ -14,7 +14,7 @@ use prometeu_hal::{
|
||||
use prometeu_system::{CrashReport, LatestRenderFrameStore};
|
||||
|
||||
const BOOT_TICK_LIMIT: usize = 64;
|
||||
const LOGICAL_FRAME_TICK_LIMIT: usize = 100_000;
|
||||
const HOST_FRAME_ADVANCE_TICK_LIMIT: usize = 100_000;
|
||||
|
||||
/// One published logical frame plus the automation counter.
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
@@ -68,7 +68,7 @@ pub enum HostError {
|
||||
AlreadyBooted,
|
||||
BootFailed { reason: String, report: Option<CrashReport> },
|
||||
InvalidState { operation: &'static str, status: HostExecutionStatus },
|
||||
LogicalFrameDidNotClose,
|
||||
FrameAdvanceWatchdogExpired { host_tick_limit: usize },
|
||||
FrameNotPublished { previous: Option<FrameId> },
|
||||
NoFrameAvailable,
|
||||
}
|
||||
@@ -81,8 +81,11 @@ impl fmt::Display for HostError {
|
||||
Self::InvalidState { operation, status } => {
|
||||
write!(f, "{operation} is invalid while execution is {status:?}")
|
||||
}
|
||||
Self::LogicalFrameDidNotClose => {
|
||||
write!(f, "logical frame did not reach FrameSync, end of ROM, or a fault")
|
||||
Self::FrameAdvanceWatchdogExpired { host_tick_limit } => {
|
||||
write!(
|
||||
f,
|
||||
"headless host frame-advance watchdog expired after {host_tick_limit} firmware ticks"
|
||||
)
|
||||
}
|
||||
Self::FrameNotPublished { .. } => {
|
||||
write!(f, "logical frame closed without its canonical published frame")
|
||||
@@ -217,19 +220,20 @@ impl HeadlessHost {
|
||||
self.firmware.os.vm().set_paused(false);
|
||||
self.firmware.os.vm().request_debug_step();
|
||||
|
||||
for _ in 0..LOGICAL_FRAME_TICK_LIMIT {
|
||||
for _ in 0..HOST_FRAME_ADVANCE_TICK_LIMIT {
|
||||
self.tick_once();
|
||||
if let Some(report) = self.get_fault() {
|
||||
self.finish_frame_step();
|
||||
self.finish_frame_advance();
|
||||
return Ok(AdvanceFrameOutcome::Faulted(report));
|
||||
}
|
||||
if !matches!(self.firmware.state, FirmwareState::GameRunning(_)) {
|
||||
self.finish_frame_advance();
|
||||
return Ok(AdvanceFrameOutcome::Terminated);
|
||||
}
|
||||
|
||||
let logical_frame_index = self.firmware.os.vm().logical_frame_index();
|
||||
if logical_frame_index > start {
|
||||
self.finish_frame_step();
|
||||
self.finish_frame_advance();
|
||||
let frame = self
|
||||
.platform
|
||||
.store
|
||||
@@ -247,8 +251,10 @@ impl HeadlessHost {
|
||||
}
|
||||
}
|
||||
|
||||
self.finish_frame_step();
|
||||
Err(HostError::LogicalFrameDidNotClose)
|
||||
self.finish_frame_advance();
|
||||
Err(HostError::FrameAdvanceWatchdogExpired {
|
||||
host_tick_limit: HOST_FRAME_ADVANCE_TICK_LIMIT,
|
||||
})
|
||||
}
|
||||
|
||||
pub fn advance_frames(&mut self, count: u64) -> Result<AdvanceFramesOutcome, HostError> {
|
||||
@@ -349,7 +355,7 @@ impl HeadlessHost {
|
||||
}
|
||||
}
|
||||
|
||||
fn finish_frame_step(&mut self) {
|
||||
fn finish_frame_advance(&mut self) {
|
||||
self.firmware.os.vm().set_paused(true);
|
||||
self.firmware.os.vm().clear_debug_step_request();
|
||||
}
|
||||
@@ -423,3 +429,69 @@ impl RuntimePlatform for HeadlessPlatform {
|
||||
self.hardware.telemetry()
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use std::fs;
|
||||
|
||||
use prometeu_bytecode::assembler::assemble;
|
||||
use prometeu_bytecode::model::{BytecodeModule, Export, FunctionMeta};
|
||||
|
||||
use super::{AdvanceFrameOutcome, HeadlessHost};
|
||||
|
||||
#[test]
|
||||
fn termination_during_frame_advance_clears_host_step_control() {
|
||||
let cartridge = non_closing_cartridge();
|
||||
let mut host = HeadlessHost::new();
|
||||
host.boot(cartridge.to_string_lossy()).expect("boot non-closing cartridge");
|
||||
host.firmware.request_home_from_host();
|
||||
|
||||
assert_eq!(
|
||||
host.advance_frame().expect("lifecycle termination"),
|
||||
AdvanceFrameOutcome::Terminated
|
||||
);
|
||||
assert!(host.firmware.os.vm().paused());
|
||||
assert!(!host.firmware.os.vm().debug_step_requested());
|
||||
|
||||
fs::remove_dir_all(cartridge).expect("remove test cartridge");
|
||||
}
|
||||
|
||||
fn non_closing_cartridge() -> std::path::PathBuf {
|
||||
let directory = std::env::temp_dir().join(format!(
|
||||
"prometeu-headless-termination-cleanup-{}-{}",
|
||||
std::process::id(),
|
||||
std::time::SystemTime::now()
|
||||
.duration_since(std::time::UNIX_EPOCH)
|
||||
.expect("system clock")
|
||||
.as_nanos()
|
||||
));
|
||||
fs::create_dir_all(&directory).expect("create test cartridge");
|
||||
|
||||
let code = assemble("JMP 0\n").expect("assemble non-closing program");
|
||||
let module = BytecodeModule {
|
||||
version: 0,
|
||||
const_pool: vec![],
|
||||
functions: vec![FunctionMeta {
|
||||
code_offset: 0,
|
||||
code_len: code.len() as u32,
|
||||
param_slots: 0,
|
||||
local_slots: 0,
|
||||
return_slots: 0,
|
||||
max_stack_slots: 1,
|
||||
}],
|
||||
code,
|
||||
debug_info: None,
|
||||
exports: vec![Export { symbol: "main".into(), func_idx: 0 }],
|
||||
syscalls: vec![],
|
||||
}
|
||||
.serialize();
|
||||
fs::write(directory.join("program.pbx"), module).expect("write test program");
|
||||
fs::write(
|
||||
directory.join("manifest.json"),
|
||||
"{\n \"magic\": \"PMTU\",\n \"cartridge_version\": 1,\n \"app_id\": 91,\n \"title\": \"Termination Cleanup\",\n \"app_version\": \"0.1.0\",\n \"app_mode\": \"Game\",\n \"capabilities\": []\n}\n",
|
||||
)
|
||||
.expect("write test manifest");
|
||||
|
||||
directory
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user