From 98bf7b67543b36b6fe49f2b68c115ebeaf630603 Mon Sep 17 00:00:00 2001 From: Miguel Date: Wed, 22 Aug 2018 16:35:12 +0200 Subject: cleanup logging --- kernel/scheduler.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'kernel/scheduler.c') diff --git a/kernel/scheduler.c b/kernel/scheduler.c index 6cd63fe..5cc5508 100644 --- a/kernel/scheduler.c +++ b/kernel/scheduler.c @@ -45,7 +45,7 @@ volatile int add_task(uint32_t esp, uint32_t vmem) } } - panic(FOOLOS_MODULE_NAME,"out of task slots!"); + kpanic("out of task slots!"); } // @@ -75,7 +75,7 @@ volatile uint32_t my_scheduler(uint32_t oldesp) if(task_list[pid].active && !task_list[pid].waiting) { // if(current_task!=pid) -// log(FOOLOS_MODULE_NAME,5,"switch from %d to %d", current_task, pid); +// klog("switch from %d to %d", current_task, pid); current_task=pid; install_tss(task_list[pid].esp0); @@ -86,7 +86,7 @@ volatile uint32_t my_scheduler(uint32_t oldesp) } - panic(FOOLOS_MODULE_NAME,"nothing to schedule!"); + kpanic("nothing to schedule!"); } // this gets called by our clock interrupt regularly! @@ -105,19 +105,19 @@ volatile uint32_t task_exit(uint32_t oldesp) task_list[current_task].active=false; int parent_pid=task_list[current_task].parent; - log(FOOLOS_MODULE_NAME,5,"[%d] exit ", current_task); + klog("[%d] exit ", current_task); if(task_list[parent_pid].active) { if(task_list[parent_pid].waiting) { - log(FOOLOS_MODULE_NAME,5,"[%d] wake up", parent_pid); + klog("[%d] wake up", parent_pid); task_list[parent_pid].waiting=false; } else { - log(FOOLOS_MODULE_NAME,5,"[%d] skipwait", parent_pid); + klog("[%d] skipwait", parent_pid); task_list[parent_pid].skipwait=true; } @@ -131,7 +131,7 @@ volatile uint32_t task_exit(uint32_t oldesp) volatile uint32_t task_wait(uint32_t oldesp) { - log(FOOLOS_MODULE_NAME,5,"[%d] wait", current_task); + klog("[%d] wait", current_task); if(task_list[current_task].skipwait) { task_list[current_task].skipwait=false; @@ -146,7 +146,7 @@ volatile uint32_t task_wait(uint32_t oldesp) volatile uint32_t task_fork(uint32_t oldesp) { int pid=add_task(oldesp,vmem_new_space_dir(task_list[current_task].vmem)); - log(FOOLOS_MODULE_NAME,5,"[%d] forked -> [%d] (free blocks remaining: %d )", current_task, pid,mem_get_free_blocks_count()); + klog("[%d] forked -> [%d] (free blocks remaining: %d )", current_task, pid,mem_get_free_blocks_count()); return pid; } -- cgit v1.2.3