X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/aa2843fdbdd9b5cc579d198fd1a9ec874642706e..59ecf21e36b2332f6adf2a568ef555283d8c119a:/lunaix-os/kernel/process/sched.c

diff --git a/lunaix-os/kernel/process/sched.c b/lunaix-os/kernel/process/sched.c
index 82c73c0..bec2fae 100644
--- a/lunaix-os/kernel/process/sched.c
+++ b/lunaix-os/kernel/process/sched.c
@@ -2,8 +2,8 @@
 #include <sys/interrupts.h>
 #include <sys/mm/mempart.h>
 
-#include <hal/cpu.h>
 #include <hal/intc.h>
+#include <sys/cpu.h>
 
 #include <lunaix/fs/taskfs.h>
 #include <lunaix/mm/cake.h>
@@ -42,9 +42,8 @@ sched_init()
     proc_pile = cake_new_pile("proc", sizeof(struct proc_info), 1, 0);
     cake_set_constructor(proc_pile, cake_ctor_zeroing);
 
-    sched_ctx = (struct scheduler){ ._procs = vzalloc(PROC_TABLE_SIZE),
-                                    .ptable_len = 0,
-                                    .procs_index = 0 };
+    sched_ctx = (struct scheduler){
+        ._procs = vzalloc(PROC_TABLE_SIZE), .ptable_len = 0, .procs_index = 0};
 
     // TODO initialize dummy_proc
     sched_init_dummy();
@@ -96,6 +95,9 @@ can_schedule(struct proc_info* proc)
     if ((proc->state & PS_PAUSED)) {
         return !!(sh->sig_pending & ~1);
     }
+    if ((proc->state & PS_BLOCKED)) {
+        return sigset_test(sh->sig_pending, _SIGINT);
+    }
 
     if (sigset_test(sh->sig_pending, _SIGCONT)) {
         sigset_clear(sh->sig_pending, _SIGSTOP);
@@ -112,7 +114,7 @@ check_sleepers()
 {
     struct proc_info* leader = sched_ctx._procs[0];
     struct proc_info *pos, *n;
-    time_t now = clock_systime();
+    time_t now = clock_systime() / 1000;
     llist_for_each(pos, n, &leader->sleep.sleepers, sleep.sleepers)
     {
         if (proc_terminated(pos)) {
@@ -191,12 +193,14 @@ __DEFINE_LXSYSCALL1(unsigned int, sleep, unsigned int, seconds)
         return 0;
     }
 
+    time_t systime = clock_systime() / 1000;
+
     if (__current->sleep.wakeup_time) {
-        return (__current->sleep.wakeup_time - clock_systime()) / 1000U;
+        return (__current->sleep.wakeup_time - systime);
     }
 
     struct proc_info* root_proc = sched_ctx._procs[0];
-    __current->sleep.wakeup_time = clock_systime() + seconds;
+    __current->sleep.wakeup_time = systime + seconds;
 
     if (llist_empty(&__current->sleep.sleepers)) {
         llist_append(&root_proc->sleep.sleepers, &__current->sleep.sleepers);
@@ -213,7 +217,7 @@ __DEFINE_LXSYSCALL1(unsigned int, sleep, unsigned int, seconds)
 __DEFINE_LXSYSCALL1(unsigned int, alarm, unsigned int, seconds)
 {
     time_t prev_ddl = __current->sleep.alarm_time;
-    time_t now = clock_systime();
+    time_t now = clock_systime() / 1000;
 
     __current->sleep.alarm_time = seconds ? now + seconds : 0;
 
@@ -222,7 +226,7 @@ __DEFINE_LXSYSCALL1(unsigned int, alarm, unsigned int, seconds)
         llist_append(&root_proc->sleep.sleepers, &__current->sleep.sleepers);
     }
 
-    return prev_ddl ? (prev_ddl - now) / 1000 : 0;
+    return prev_ddl ? (prev_ddl - now) : 0;
 }
 
 __DEFINE_LXSYSCALL1(void, exit, int, status)
@@ -322,6 +326,8 @@ alloc_process()
     llist_init_head(&proc->children);
     llist_init_head(&proc->grp_member);
     llist_init_head(&proc->sleep.sleepers);
+
+    iopoll_init(&proc->pollctx);
     waitq_init(&proc->waitqueue);
 
     sched_ctx._procs[i] = proc;
@@ -371,6 +377,8 @@ destroy_process(pid_t pid)
     llist_delete(&proc->tasks);
     llist_delete(&proc->sleep.sleepers);
 
+    iopoll_free(pid, &proc->pollctx);
+
     taskfs_invalidate(pid);
 
     if (proc->cwd) {