implements PLN-0140
This commit is contained in:
@@ -170,6 +170,14 @@ impl Firmware {
|
||||
|
||||
pub fn request_home_from_host(&mut self) {
|
||||
self.os.info(LogSource::Pos, "Host requested Home/SystemOS".to_string());
|
||||
if let FirmwareState::GameRunning(step) = &self.state {
|
||||
if let Err(error) = self.os.lifecycle().request_home_from_game(step.task_id) {
|
||||
self.os.warn(
|
||||
LogSource::Pos,
|
||||
format!("Home/SystemOS request could not pause Game: {error:?}"),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -188,7 +196,10 @@ mod tests {
|
||||
use prometeu_system::process::ProcessState;
|
||||
use prometeu_system::task::{TaskId, TaskState};
|
||||
use prometeu_system::windows::WindowOwner;
|
||||
use prometeu_system::{CrashReport, discover_games_root};
|
||||
use prometeu_system::{
|
||||
CrashReport, ForegroundOwner, GameLifecycleEventKind, ResidentGameState,
|
||||
discover_games_root,
|
||||
};
|
||||
use std::fs;
|
||||
use std::path::PathBuf;
|
||||
use std::sync::atomic::{AtomicU64, Ordering};
|
||||
@@ -732,6 +743,44 @@ mod tests {
|
||||
assert_eq!(firmware.os.windows().window_count(), 0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn host_home_request_pauses_then_suspends_game_before_next_vm_tick() {
|
||||
let mut firmware = Firmware::new(None);
|
||||
let mut platform = TestPlatform::new();
|
||||
let signals = InputSignals::default();
|
||||
|
||||
firmware.load_cartridge(valid_cartridge(AppMode::Game));
|
||||
firmware.tick(&signals, &mut platform);
|
||||
|
||||
let task_id = match &firmware.state {
|
||||
FirmwareState::GameRunning(step) => step.task_id,
|
||||
other => panic!("expected GameRunning state, got {:?}", other),
|
||||
};
|
||||
let tick_index_before_home = firmware.os.vm().tick_index();
|
||||
|
||||
firmware.request_home_from_host();
|
||||
|
||||
assert_eq!(firmware.os.lifecycle().foreground_owner(), ForegroundOwner::Game(task_id));
|
||||
assert_eq!(
|
||||
firmware.os.lifecycle().resident_game().map(|game| game.state),
|
||||
Some(ResidentGameState::PauseRequested { remaining_ticks: 1 })
|
||||
);
|
||||
assert_eq!(
|
||||
firmware.os.lifecycle().pending_game_lifecycle_events().last().map(|event| event.kind),
|
||||
Some(GameLifecycleEventKind::Pause)
|
||||
);
|
||||
|
||||
firmware.tick(&signals, &mut platform);
|
||||
|
||||
assert!(matches!(firmware.state, FirmwareState::HubHome(_)));
|
||||
assert_eq!(firmware.os.lifecycle().task_state(task_id), Some(TaskState::Suspended));
|
||||
assert_eq!(
|
||||
firmware.os.lifecycle().process_state_for_task(task_id),
|
||||
Ok(ProcessState::Suspended)
|
||||
);
|
||||
assert_eq!(firmware.os.vm().tick_index(), tick_index_before_home);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn direct_game_boot_does_not_depend_on_userland_run_cart_syscall() {
|
||||
assert!(Syscall::from_u32(0x0002).is_none());
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
use crate::firmware::firmware_state::{AppCrashesStep, FirmwareState};
|
||||
use crate::firmware::firmware_state::{AppCrashesStep, FirmwareState, HubHomeStep};
|
||||
use crate::firmware::prometeu_context::PrometeuContext;
|
||||
use prometeu_hal::log::{LogLevel, LogSource};
|
||||
use prometeu_system::CrashReport;
|
||||
@@ -36,6 +36,19 @@ impl GameRunningStep {
|
||||
return Some(FirmwareState::AppCrashes(AppCrashesStep { report }));
|
||||
}
|
||||
|
||||
match ctx.os.lifecycle().advance_game_pause_budget(self.task_id) {
|
||||
Ok(true) => return Some(FirmwareState::HubHome(HubHomeStep)),
|
||||
Ok(false) => {}
|
||||
Err(_) => {
|
||||
let report = CrashReport::VmPanic {
|
||||
message: "failed to advance game pause budget".to_string(),
|
||||
pc: None,
|
||||
};
|
||||
let _ = ctx.os.lifecycle().crash_task(self.task_id, Some(&report));
|
||||
return Some(FirmwareState::AppCrashes(AppCrashesStep { report }));
|
||||
}
|
||||
}
|
||||
|
||||
let result = ctx.os.vm().tick(ctx.vm, ctx.signals, ctx.platform);
|
||||
|
||||
if let Some(report) = result {
|
||||
|
||||
Reference in New Issue
Block a user