refactor: rewrite kernel's make script

[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 46500608a3da9a913dd459e16f4b8ab8ca37d9eb..b21d086ebce3667c7397cbb39da75575bfb0ba27 100644 (file)
--- a/lunaix-os/kernel/process/sched.c
+++ b/lunaix-os/kernel/process/sched.c
@@ -6,7 +6,7 @@
 
 #include <lunaix/fs/taskfs.h>
 #include <lunaix/mm/cake.h>
 
 #include <lunaix/fs/taskfs.h>
 #include <lunaix/mm/cake.h>

-#include <lunaix/mm/kalloc.h>
+#include <lunaix/mm/mmap.h>

 #include <lunaix/mm/pmm.h>
 #include <lunaix/mm/valloc.h>
 #include <lunaix/mm/vmm.h>
 #include <lunaix/mm/pmm.h>
 #include <lunaix/mm/valloc.h>
 #include <lunaix/mm/vmm.h>


@@ -18,6 +18,8 @@
 #include <lunaix/syscall.h>
 #include <lunaix/syslog.h>
 
 #include <lunaix/syscall.h>
 #include <lunaix/syslog.h>
 

+#include <klibc/string.h>
+

 volatile struct proc_info* __current;
 
 static struct proc_info dummy_proc;
 volatile struct proc_info* __current;
 
 static struct proc_info dummy_proc;


@@ -58,23 +60,23 @@ sched_init_dummy()
     extern void my_dummy();
     static char dummy_stack[DUMMY_STACK_SIZE] __attribute__((aligned(16)));
 
     extern void my_dummy();
     static char dummy_stack[DUMMY_STACK_SIZE] __attribute__((aligned(16)));
 

-    // memset to 0
-    dummy_proc = (struct proc_info){};
-    dummy_proc.intr_ctx = (isr_param){
-        .registers = { .ds = KDATA_SEG,
-                       .es = KDATA_SEG,
-                       .fs = KDATA_SEG,
-                       .gs = KDATA_SEG,
-                       .esp = (void*)dummy_stack + DUMMY_STACK_SIZE - 20 },
+    struct exec_param* execp =
+      (void*)dummy_stack + DUMMY_STACK_SIZE - sizeof(struct exec_param);
+
+    *execp = (struct exec_param){

         .cs = KCODE_SEG,
         .cs = KCODE_SEG,

-        .eip = (void*)my_dummy,
+        .eflags = cpu_reflags() | 0x0200,
+        .eip = (ptr_t)my_dummy,

         .ss = KDATA_SEG,
         .ss = KDATA_SEG,

-        .eflags = cpu_reflags() | 0x0200

     };
 
     };
 

-    *(u32_t*)(&dummy_stack[DUMMY_STACK_SIZE - 4]) = dummy_proc.intr_ctx.eflags;
-    *(u32_t*)(&dummy_stack[DUMMY_STACK_SIZE - 8]) = KCODE_SEG;
-    *(u32_t*)(&dummy_stack[DUMMY_STACK_SIZE - 12]) = dummy_proc.intr_ctx.eip;
+    // memset to 0
+    dummy_proc = (struct proc_info){};
+    dummy_proc.intr_ctx = (isr_param){ .registers = { .ds = KDATA_SEG,
+                                                      .es = KDATA_SEG,
+                                                      .fs = KDATA_SEG,
+                                                      .gs = KDATA_SEG },
+                                       .execp = execp };

 
     dummy_proc.page_table = cpu_rcr3();
     dummy_proc.state = PS_READY;
 
     dummy_proc.page_table = cpu_rcr3();
     dummy_proc.state = PS_READY;


@@ -97,7 +99,7 @@ run(struct proc_info* proc)
         由于这中间没有进行地址空间的交换，所以第二次跳转使用的是同一个内核栈，而之前默认tss.esp0的值是永远指向最顶部
         这样一来就有可能会覆盖更早的上下文信息（比如嵌套的信号捕获函数）
     */
         由于这中间没有进行地址空间的交换，所以第二次跳转使用的是同一个内核栈，而之前默认tss.esp0的值是永远指向最顶部
         这样一来就有可能会覆盖更早的上下文信息（比如嵌套的信号捕获函数）
     */

-    tss_update_esp(proc->intr_ctx.registers.esp);
+    tss_update_esp(proc->intr_ctx.esp);

 
     apic_done_servicing();
 
 
     apic_done_servicing();
 


@@ -213,12 +215,17 @@ __DEFINE_LXSYSCALL1(unsigned int, sleep, unsigned int, seconds)
 
     struct proc_info* root_proc = sched_ctx._procs[0];
     __current->sleep.wakeup_time = clock_systime() + seconds * 1000;
 
     struct proc_info* root_proc = sched_ctx._procs[0];
     __current->sleep.wakeup_time = clock_systime() + seconds * 1000;

-    llist_append(&root_proc->sleep.sleepers, &__current->sleep.sleepers);
+
+    if (llist_empty(&__current->sleep.sleepers)) {
+        llist_append(&root_proc->sleep.sleepers, &__current->sleep.sleepers);
+    }

 
     __current->intr_ctx.registers.eax = seconds;
 
     block_current();
     schedule();
 
     __current->intr_ctx.registers.eax = seconds;
 
     block_current();
     schedule();

+
+    return 0;

 }
 
 __DEFINE_LXSYSCALL1(unsigned int, alarm, unsigned int, seconds)
 }
 
 __DEFINE_LXSYSCALL1(unsigned int, alarm, unsigned int, seconds)


@@ -324,6 +331,7 @@ alloc_process()
 
     proc->state = PS_CREATED;
     proc->pid = i;
 
     proc->state = PS_CREATED;
     proc->pid = i;

+    proc->mm.pid = i;

     proc->created = clock_systime();
     proc->pgid = proc->pid;
     proc->fdtable = vzalloc(sizeof(struct v_fdtable));
     proc->created = clock_systime();
     proc->pgid = proc->pid;
     proc->fdtable = vzalloc(sizeof(struct v_fdtable));


@@ -365,7 +373,7 @@ commit_process(struct proc_info* process)
 
 // from <kernel/process.c>
 extern void
 
 // from <kernel/process.c>
 extern void

-__del_pagetable(pid_t pid, uintptr_t mount_point);
+__del_pagetable(pid_t pid, ptr_t mount_point);

 
 pid_t
 destroy_process(pid_t pid)
 
 pid_t
 destroy_process(pid_t pid)


@@ -373,8 +381,9 @@ destroy_process(pid_t pid)
     int index = pid;
     if (index <= 0 || index > sched_ctx.ptable_len) {
         __current->k_status = EINVAL;
     int index = pid;
     if (index <= 0 || index > sched_ctx.ptable_len) {
         __current->k_status = EINVAL;

-        return;
+        return -1;

     }
     }

+

     struct proc_info* proc = sched_ctx._procs[index];
     sched_ctx._procs[index] = 0;
 
     struct proc_info* proc = sched_ctx._procs[index];
     sched_ctx._procs[index] = 0;
 


@@ -400,18 +409,18 @@ destroy_process(pid_t pid)
     vfree(proc->fdtable);
     vfree_dma(proc->fxstate);
 
     vfree(proc->fdtable);
     vfree_dma(proc->fxstate);
 

-    // TODO unmap all regions
+    vmm_mount_pd(VMS_MOUNT_1, proc->page_table);
+

     struct mm_region *pos, *n;
     llist_for_each(pos, n, &proc->mm.regions, head)
     {
     struct mm_region *pos, *n;
     llist_for_each(pos, n, &proc->mm.regions, head)
     {

-        vfree(pos);
+        mem_sync_pages(VMS_MOUNT_1, pos, pos->start, pos->end - pos->start, 0);
+        region_release(pos);

     }
 
     }
 

-    vmm_mount_pd(PD_MOUNT_1, proc->page_table);
-
-    __del_pagetable(pid, PD_MOUNT_1);
+    __del_pagetable(pid, VMS_MOUNT_1);

 
 

-    vmm_unmount_pd(PD_MOUNT_1);
+    vmm_unmount_pd(VMS_MOUNT_1);

 
     cake_release(proc_pile, proc);
 
 
     cake_release(proc_pile, proc);