implements PLN-0155
This commit is contained in:
@@ -5,7 +5,6 @@ use crate::task::TaskId;
|
||||
use crate::vm_session::{VmSession, VmSessionError};
|
||||
use prometeu_hal::app_mode::AppMode;
|
||||
use prometeu_hal::cartridge::Cartridge;
|
||||
use prometeu_vm::VirtualMachine;
|
||||
use std::sync::Arc;
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
@@ -72,7 +71,6 @@ impl<'a> SessionsFacade<'a> {
|
||||
|
||||
pub fn load_vm_cartridge(
|
||||
&mut self,
|
||||
legacy_vm: &mut VirtualMachine,
|
||||
cartridge: &Cartridge,
|
||||
) -> Result<LoadedVmCartridge, CrashReport> {
|
||||
let existing_game_task = if cartridge.app_mode == AppMode::Game {
|
||||
@@ -100,7 +98,6 @@ impl<'a> SessionsFacade<'a> {
|
||||
|
||||
if !reused_existing_session {
|
||||
self.initialize_session_cartridge(task_id, cartridge)?;
|
||||
self.initialize_legacy_active_vm(legacy_vm, cartridge)?;
|
||||
}
|
||||
|
||||
Ok(LoadedVmCartridge { task_id, app_mode: cartridge.app_mode, reused_existing_session })
|
||||
@@ -122,6 +119,10 @@ impl<'a> SessionsFacade<'a> {
|
||||
self.os.vm_sessions.len()
|
||||
}
|
||||
|
||||
pub fn clear_vm_sessions(&mut self) {
|
||||
self.os.vm_sessions.clear();
|
||||
}
|
||||
|
||||
fn create_vm_session_for_task(&mut self, task_id: TaskId) -> Result<(), VmSessionError> {
|
||||
let task = self.os.task_manager.get(task_id).expect("session task should exist").clone();
|
||||
let process = self
|
||||
@@ -157,13 +158,4 @@ impl<'a> SessionsFacade<'a> {
|
||||
session.clear_cartridge_service_state();
|
||||
session.runtime.initialize_vm(&mut self.os.log_service, &mut session.vm, cartridge)
|
||||
}
|
||||
|
||||
fn initialize_legacy_active_vm(
|
||||
&mut self,
|
||||
legacy_vm: &mut VirtualMachine,
|
||||
cartridge: &Cartridge,
|
||||
) -> Result<(), CrashReport> {
|
||||
self.os.clear_cartridge_service_state();
|
||||
self.os.vm_runtime.initialize_vm(&mut self.os.log_service, legacy_vm, cartridge)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user