peony/ableos
1
0
Fork 0
forked from AbleOS/ableos
Code Pull requests Activity

More tracing

Browse source
This commit is contained in:
able 2023-09-13 02:19:37 -05:00
parent e0aa63bebf
commit 008a8eb336
6 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kernel/src/arch/aarch64/mod.rs
View file

@ -32,3 +32,5 @@ pub fn spin_loop() -> ! {
pub fn hardware_random_u64() -> u64 { pub fn hardware_random_u64() -> u64 {
0 0
} }
pub fn register_dump() {}

1
kernel/src/arch/x86_64/device_info_collector.rs
View file

@ -53,6 +53,7 @@ fn collect_cpu_info(device_tree: &mut DeviceTree) {
} }
pub fn collect_device_info() { pub fn collect_device_info() {
log::trace!("Collecting devices on x86_64");
// Lock device tree // Lock device tree
unsafe { unsafe {
DEVICE_TREE.force_unlock(); DEVICE_TREE.force_unlock();

2
kernel/src/arch/x86_64/mod.rs
View file

@ -45,7 +45,6 @@ unsafe extern "C" fn _kernel_start() -> ! {
.expect("tried to get physical memory mapping offset from Limine") .expect("tried to get physical memory mapping offset from Limine")
.offset, .offset,
)); ));
allocator::init(INITIAL_KERNEL_HEAP_START, INITIAL_KERNEL_HEAP_SIZE as _); allocator::init(INITIAL_KERNEL_HEAP_START, INITIAL_KERNEL_HEAP_SIZE as _);
static MMAP_REQ: MemmapRequest = MemmapRequest::new(0); static MMAP_REQ: MemmapRequest = MemmapRequest::new(0);
@ -115,6 +114,7 @@ unsafe extern "C" fn _kernel_start() -> ! {
// TODO: Add in rdseed and rdrand as sources for randomness // TODO: Add in rdseed and rdrand as sources for randomness
let _rand = xml::XMLElement::new("Random"); let _rand = xml::XMLElement::new("Random");
log::trace!("Getting boot modules");
let bm = MOD_REQ.get_response().get(); let bm = MOD_REQ.get_response().get();
let mut bootmodules = alloc::vec::Vec::new(); let mut bootmodules = alloc::vec::Vec::new();

4
kernel/src/kmain.rs
View file

@ -33,7 +33,9 @@ pub fn kmain(cmdline: &str, boot_modules: BootModules) -> ! {
let dt = DEVICE_TREE.lock(); let dt = DEVICE_TREE.lock();
info!("Device Tree: {}", dt); // TODO(Able): This line causes a deadlock
// info!("Device Tree: {}", dt);
info!("Boot complete. Moving to init_system"); info!("Boot complete. Moving to init_system");
// TODO: schedule the disk driver from the initramfs // TODO: schedule the disk driver from the initramfs

2
kernel/src/logger.rs
View file

@ -4,7 +4,7 @@ use log::{Level, SetLoggerError};
pub fn init() -> Result<(), SetLoggerError> { pub fn init() -> Result<(), SetLoggerError> {
log::set_logger(&crate::logger::Logger)?; log::set_logger(&crate::logger::Logger)?;
log::set_max_level(log::LevelFilter::Debug); log::set_max_level(log::LevelFilter::Trace);
Ok(()) Ok(())
} }

2
kernel/src/task.rs
View file

@ -106,6 +106,7 @@ struct Task {
impl Task { impl Task {
pub fn new(future: impl Future<Output = ()> + Send + 'static) -> Self { pub fn new(future: impl Future<Output = ()> + Send + 'static) -> Self {
log::trace!("New task scheduled");
Self { Self {
future: Box::pin(future), future: Box::pin(future),
} }
@ -129,6 +130,7 @@ struct TaskWaker {
impl Wake for TaskWaker { impl Wake for TaskWaker {
fn wake(self: Arc<Self>) { fn wake(self: Arc<Self>) {
log::trace!("Woke Task-{:?}", self.id);
self.wake_by_ref(); self.wake_by_ref();
} }