Change of vterm handling logic on backend chardev input event (#40)

[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 91cf61becdc53c0d2a8411f1f7426990531f4eea..82a2aa9abc15b9c4a13a15e950218c1f4f2b9412 100644 (file)
--- a/lunaix-os/kernel/process/sched.c
+++ b/lunaix-os/kernel/process/sched.c
@@ -33,6 +33,8 @@ struct scheduler sched_ctx;
 
 struct cake_pile *proc_pile ,*thread_pile;
 
 
 struct cake_pile *proc_pile ,*thread_pile;
 

+#define root_process   (sched_ctx.procs[1])
+

 LOG_MODULE("SCHED")
 
 void
 LOG_MODULE("SCHED")
 
 void


@@ -256,7 +258,6 @@ __DEFINE_LXSYSCALL1(unsigned int, alarm, unsigned int, seconds)
 
     bed->alarm_time = seconds ? now + seconds : 0;
 
 
     bed->alarm_time = seconds ? now + seconds : 0;
 

-    struct proc_info* root_proc = sched_ctx.procs[0];

     if (llist_empty(&bed->sleepers)) {
         llist_append(&sched_ctx.sleepers, &bed->sleepers);
     }
     if (llist_empty(&bed->sleepers)) {
         llist_append(&sched_ctx.sleepers, &bed->sleepers);
     }


@@ -435,7 +436,7 @@ commit_process(struct proc_info* process)
     // every process is the child of first process (pid=1)
     if (!process->parent) {
         if (likely(!kernel_process(process))) {
     // every process is the child of first process (pid=1)
     if (!process->parent) {
         if (likely(!kernel_process(process))) {

-            process->parent = sched_ctx.procs[1];
+            process->parent = root_process;

         } else {
             process->parent = process;
         }
         } else {
             process->parent = process;
         }


@@ -474,6 +475,20 @@ destory_thread(struct thread* thread)
     cake_release(thread_pile, thread);
 }
 
     cake_release(thread_pile, thread);
 }
 

+static void
+orphan_children(struct proc_info* proc)
+{
+    struct proc_info *root;
+    struct proc_info *pos, *n;
+
+    root = root_process;
+
+    llist_for_each(pos, n, &proc->children, siblings) {
+        pos->parent = root;
+        llist_append(&root->children, &pos->siblings);
+    }
+}
+

 void 
 delete_process(struct proc_info* proc)
 {
 void 
 delete_process(struct proc_info* proc)
 {


@@ -520,6 +535,8 @@ delete_process(struct proc_info* proc)
         destory_thread(pos);
     }
 
         destory_thread(pos);
     }
 

+    orphan_children(proc);
+

     procvm_unmount_release(mm);
 
     cake_release(proc_pile, proc);
     procvm_unmount_release(mm);
 
     cake_release(proc_pile, proc);