AbleOS/ableos
2
2
Fork 13
Code Issues Pull requests 1 Projects Releases Wiki Activity

scheduler but i stole the code from the engine and tried to stuff it into the scheduler and i have no idea if it works or not but it porbably does

Browse source
This commit is contained in:
MunirG05 2023-07-10 23:43:42 +05:30
parent 359d62c1b0
commit bb27f48f4a
3 changed files with 29 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
a.out Normal file
View file

2
kernel/src/kmain.rs
View file

@ -66,7 +66,7 @@ pub fn kmain(cmdline: &str, boot_modules: BootModules) -> ! {
// use {crate::host::TrapHandler, hbvm::vm::Vm};
let mut sched = Scheduler::new();
sched.new_process(prog.clone());
sched.scheduler_loop();
sched.scheduler_run();
// let mut vm;
// unsafe {
// vm = Vm::new_unchecked(&prog, TrapHandler);

31
kernel/src/scheduler.rs
View file

@ -1,16 +1,29 @@
use alloc::{collections::VecDeque, vec::Vec, rc::Rc, slice};
use hbvm::validate::validate;
use {
alloc::{collections::VecDeque, rc::Rc, slice, vec::Vec},
hbvm::validate::validate,
};
use {crate::host::TrapHandler, hbvm::vm::Vm};
pub struct Scheduler<'a> {
data: VecDeque<Vm<'a, TrapHandler>>,
pub tick_callback: Option<fn() -> u64>,
pub last_timer_count: u64,
pub tick_limit: u64,
}
// NOTE: This is a very simple schduler and it sucks and should be replaced with a better one
// Written By Yours Truly: Munir
impl Scheduler<'_> {
pub fn new() -> Self {
Self {
data: VecDeque::new(),
tick_callback: None,
last_timer_count: 0,
tick_limit: 64,
}
}
pub fn new_process(&mut self, program: Vec<u8>) {
@ -19,8 +32,6 @@ impl Scheduler<'_> {
let binding = Rc::try_unwrap(prog_arc).ok().unwrap();
#[allow(clippy::redundant_else)]
if let Err(e) = validate(&program.as_slice()) {
log::error!("Program validation error: {e:?}");
@ -35,11 +46,21 @@ impl Scheduler<'_> {
}
}
pub fn scheduler_loop(&mut self){
pub fn scheduler_run(&mut self) -> Option<u32> {
loop {
let mut prog = self.data.pop_front().unwrap();
prog.run().unwrap();
self.data.push_back(prog);
if self.tick_callback.is_some() {
let ret = self.tick_callback.unwrap()();
if (ret - self.last_timer_count) >= self.tick_limit {
return Some(0);
}
}
break;
}
Some(1)
}
}