Compare commits
0
Commits
No files matched your search
+2
-5
@@ -21,7 +21,7 @@ use crate::fs::FileSystem;
|
||||
use core::panic::PanicInfo;
|
||||
use drivers::vga::{self, Color, ColorCode};
|
||||
use multiboot2::BootInformation;
|
||||
use task::{executor::EXECUTOR, keyboard, Task};
|
||||
use task::{executor::Executor, keyboard, Task};
|
||||
|
||||
use alloc::sync::Arc;
|
||||
use core::cell::RefCell;
|
||||
@@ -61,14 +61,11 @@ pub extern "C" fn julios_main(multiboot_info_addr: usize) -> ! {
|
||||
println!("***JuliOS V0.1.0***");
|
||||
serial_println!("Hello serial");
|
||||
|
||||
let mut executor = EXECUTOR.try_lock().unwrap();
|
||||
let mut executor = Executor::new();
|
||||
executor.spawn(Task::new(drivers::atapi::init()));
|
||||
executor.spawn(Task::new(keyboard::print_keypresses()));
|
||||
executor.spawn(Task::new(get_file()));
|
||||
executor.spawn(Task::new(proc::scheduler::scheduler_run()));
|
||||
|
||||
EXECUTOR.force_unlock(); // Ouioui t'inquietes
|
||||
|
||||
executor.run();
|
||||
}
|
||||
|
||||
|
||||
@@ -1,15 +1,7 @@
|
||||
use crate::utils::AsyncMutex;
|
||||
|
||||
use super::{Task, TaskId};
|
||||
|
||||
use alloc::{collections::BTreeMap, sync::Arc, task::Wake};
|
||||
use core::task::{Context, Poll, Waker};
|
||||
use crossbeam_queue::ArrayQueue;
|
||||
use lazy_static::lazy_static;
|
||||
|
||||
lazy_static! {
|
||||
pub static ref EXECUTOR: AsyncMutex<Executor> = AsyncMutex::new(Executor::new());
|
||||
}
|
||||
|
||||
pub struct Executor {
|
||||
tasks: BTreeMap<TaskId, Task>,
|
||||
|
||||