feat: lru eviction policy on page caches

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

diff --git a/lunaix-os/kernel/sched.c b/lunaix-os/kernel/sched.c
index be9952519fe282993a29154123c89a90f8d7b249..f8f00d40a094d62c31976cd4d54ef577673ba6de 100644 (file)
--- a/lunaix-os/kernel/sched.c
+++ b/lunaix-os/kernel/sched.c
@@ -145,6 +145,12 @@ redo:
     run(next);
 }
 
     run(next);
 }
 

+void
+sched_yieldk()
+{
+    cpu_int(LUNAIX_SCHED);
+}
+

 __DEFINE_LXSYSCALL1(unsigned int, sleep, unsigned int, seconds)
 {
     if (!seconds) {
 __DEFINE_LXSYSCALL1(unsigned int, sleep, unsigned int, seconds)
 {
     if (!seconds) {


@@ -219,7 +225,6 @@ _wait(pid_t wpid, int* status, int options)
     }
 
     wpid = wpid ? wpid : -__current->pgid;
     }
 
     wpid = wpid ? wpid : -__current->pgid;

-    cpu_enable_interrupt();

 repeat:
     llist_for_each(proc, n, &__current->children, siblings)
     {
 repeat:
     llist_for_each(proc, n, &__current->children, siblings)
     {


@@ -238,11 +243,10 @@ repeat:
         return 0;
     }
     // 放弃当前的运行机会
         return 0;
     }
     // 放弃当前的运行机会

-    sched_yield();
+    sched_yieldk();

     goto repeat;
 
 done:
     goto repeat;
 
 done:

-    cpu_disable_interrupt();

     status_flags |= PEXITSIG * (proc->sig_inprogress != 0);
     if (status) {
         *status = proc->exit_code | status_flags;
     status_flags |= PEXITSIG * (proc->sig_inprogress != 0);
     if (status) {
         *status = proc->exit_code | status_flags;


@@ -275,7 +279,7 @@ alloc_process()
     proc->pgid = proc->pid;
     proc->fdtable = vzalloc(sizeof(struct v_fdtable));
 
     proc->pgid = proc->pid;
     proc->fdtable = vzalloc(sizeof(struct v_fdtable));
 

-    llist_init_head(&proc->mm.regions);
+    llist_init_head(&proc->mm.regions.head);

     llist_init_head(&proc->children);
     llist_init_head(&proc->grp_member);
     llist_init_head(&proc->sleep.sleepers);
     llist_init_head(&proc->children);
     llist_init_head(&proc->grp_member);
     llist_init_head(&proc->sleep.sleepers);


@@ -330,7 +334,7 @@ destroy_process(pid_t pid)
     struct mm_region *pos, *n;
     llist_for_each(pos, n, &proc->mm.regions.head, head)
     {
     struct mm_region *pos, *n;
     llist_for_each(pos, n, &proc->mm.regions.head, head)
     {

-        lxfree(pos);
+        vfree(pos);

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