feat: pause(2) support

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

diff --git a/lunaix-os/kernel/sched.c b/lunaix-os/kernel/sched.c
index ee25ebb39f36bff3349adcd436c4438bef073cca..50f5f67ceaa6cf209d885fd7e9b78ebaa3ef8635 100644 (file)
--- a/lunaix-os/kernel/sched.c
+++ b/lunaix-os/kernel/sched.c
@@ -49,8 +49,16 @@ run(struct proc_info* proc)
     }
     proc->state = PROC_RUNNING;
 
     }
     proc->state = PROC_RUNNING;
 

-    // FIXME: 这里还是得再考虑一下。
-    // tss_update_esp(__current->intr_ctx.esp);
+    /*
+        将tss.esp0设置为上次调度前的esp值。
+        当处理信号时，上下文信息是不会恢复的，而是保存在用户栈中，然后直接跳转进位于用户空间的sig_wrapper进行
+          信号的处理。当用户自定义的信号处理函数返回时，sigreturn的系统调用才开始进行上下文的恢复（或者说是进行
+          另一次调度。
+        由于这中间没有进行地址空间的交换，所以第二次跳转使用的是同一个内核栈，而之前默认tss.esp0的值是永远指向最顶部
+        这样一来就有可能会覆盖更早的上下文信息（比如嵌套的信号捕获函数）
+    */
+    tss_update_esp(proc->intr_ctx.registers.esp);
+

     apic_done_servicing();
 
     asm volatile("pushl %0\n"
     apic_done_servicing();
 
     asm volatile("pushl %0\n"


@@ -168,8 +176,8 @@ done:
     return destroy_process(proc->pid);
 }
 
     return destroy_process(proc->pid);
 }
 

-pid_t
-alloc_pid()
+struct proc_info*
+alloc_process()

 {
     pid_t i = 0;
     for (;
 {
     pid_t i = 0;
     for (;


@@ -180,29 +188,35 @@ alloc_pid()
     if (i == MAX_PROCESS) {
         panick("Panic in Ponyville shimmer!");
     }
     if (i == MAX_PROCESS) {
         panick("Panic in Ponyville shimmer!");
     }

-    return i;
-}
-
-void
-push_process(struct proc_info* process)
-{
-    int index = process->pid;
-    if (index < 0 || index > sched_ctx.ptable_len) {
-        __current->k_status = LXINVLDPID;
-        return;
-    }

 
 

-    if (index == sched_ctx.ptable_len) {
+    if (i == sched_ctx.ptable_len) {

         sched_ctx.ptable_len++;
     }
 
         sched_ctx.ptable_len++;
     }
 

-    sched_ctx._procs[index] = *process;
+    struct proc_info* proc = &sched_ctx._procs[i];
+    memset(proc, 0, sizeof(*proc));

 
 

-    process = &sched_ctx._procs[index];
+    proc->state = PROC_CREATED;
+    proc->pid = i;
+    proc->created = clock_systime();
+    proc->pgid = proc->pid;

 
 

-    // make sure the reference is relative to process table
-    llist_init_head(&process->children);
-    llist_init_head(&process->grp_member);
+    llist_init_head(&proc->mm.regions);
+    llist_init_head(&proc->children);
+    llist_init_head(&proc->grp_member);
+
+    return proc;
+}
+
+void
+commit_process(struct proc_info* process)
+{
+    assert(process == &sched_ctx._procs[process->pid]);
+
+    if (process->state != PROC_CREATED) {
+        __current->k_status = LXINVL;
+        return;
+    }

 
     // every process is the child of first process (pid=1)
     if (process->parent) {
 
     // every process is the child of first process (pid=1)
     if (process->parent) {


@@ -230,12 +244,10 @@ destroy_process(pid_t pid)
     proc->state = PROC_DESTROY;
     llist_delete(&proc->siblings);
 
     proc->state = PROC_DESTROY;
     llist_delete(&proc->siblings);
 

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

     }
 
     vmm_mount_pd(PD_MOUNT_1, proc->page_table);
     }
 
     vmm_mount_pd(PD_MOUNT_1, proc->page_table);


@@ -253,6 +265,8 @@ terminate_proc(int exit_code)
     __current->state = PROC_TERMNAT;
     __current->exit_code = exit_code;
 
     __current->state = PROC_TERMNAT;
     __current->exit_code = exit_code;
 

+    __SET_SIGNAL(__current->parent->sig_pending, _SIGCHLD);
+

     schedule();
 }
 
     schedule();
 }