taskfs fix up, minor refactoring

[lunaix-os.git] / lunaix-os / kernel / process / sched.c

diff --git a/lunaix-os/kernel/process/sched.c b/lunaix-os/kernel/process/sched.c
index 945fc01bf6db0a8ae5edb1fcc48f867732fb3cbd..be02c57f79bd181a9e1156b20410cff581f111ff 100644 (file)
--- a/lunaix-os/kernel/process/sched.c
+++ b/lunaix-os/kernel/process/sched.c
@@ -1,7 +1,7 @@
-#include <sys/abi.h>
-#include <sys/mm/mempart.h>
+#include <asm/abi.h>
+#include <asm/mempart.h>
 
-#include <sys/cpu.h>
+#include <asm/cpu.h>
 
 #include <lunaix/fs/taskfs.h>
 #include <lunaix/mm/cake.h>
@@ -20,8 +20,6 @@
 #include <lunaix/hart_state.h>
 #include <lunaix/kpreempt.h>
 
-#include <lunaix/generic/isrm.h>
-
 #include <klibc/string.h>
 
 struct thread empty_thread_obj;
@@ -221,7 +219,6 @@ schedule()
     sched_ctx.procs_index = to_check->process->pid;
 
 done:
-    isrm_notify_eos(0);
     run(to_check);
 
     fail("unexpected return from scheduler");
@@ -346,7 +343,7 @@ get_free_pid() {
         ;
     
     if (unlikely(i == MAX_PROCESS)) {
-        panick("Panic in Ponyville shimmer!");
+        fail("Panic in Ponyville shimmer!");
     }
 
     return i;
@@ -449,7 +446,7 @@ commit_process(struct proc_info* process)
         assert(!proc_terminated(process->parent));
     }
 
-    if (sched_ctx.proc_list) {
+    if (likely(sched_ctx.proc_list)) {
         llist_append(sched_ctx.proc_list, &process->tasks);
     } else {
         sched_ctx.proc_list = &process->tasks;
@@ -593,7 +590,7 @@ terminate_proccess(struct proc_info* proc, int exit_code) {
     assert(!kernel_process(proc));
 
     if (proc->pid == 1) {
-        panick("Attempt to kill init");
+        fail("Attempt to kill init");
     }
 
     terminate_proc_only(proc, exit_code);