Second Extended Filesystem (ext2) and other improvements (#33)

[lunaix-os.git] / lunaix-os / kernel / process / signal.c

diff --git a/lunaix-os/kernel/process/signal.c b/lunaix-os/kernel/process/signal.c
index eef5c7ba4f72b3a57d08d5059f1067fa01622872..2f84098d0f5817eeb988b49f196c9322d7c28434 100644 (file)
--- a/lunaix-os/kernel/process/signal.c
+++ b/lunaix-os/kernel/process/signal.c
@@ -6,6 +6,8 @@
 #include <lunaix/syscall.h>
 #include <lunaix/syslog.h>
 #include <lunaix/mm/valloc.h>
 #include <lunaix/syscall.h>
 #include <lunaix/syslog.h>
 #include <lunaix/mm/valloc.h>

+#include <lunaix/switch.h>
+#include <lunaix/kpreempt.h>

 
 #include <klibc/string.h>
 
 
 #include <klibc/string.h>
 


@@ -28,17 +30,19 @@ signal_terminate(int caused_by)
 }
 
 // Referenced in kernel/asm/x86/interrupt.S
 }
 
 // Referenced in kernel/asm/x86/interrupt.S

-void*
-signal_dispatch()
+void
+signal_dispatch(struct signpost_result* result)

 {
 {

+    continue_switch(result);
+

     if (kernel_process(__current)) {
         // signal is undefined under 'kernel process'
     if (kernel_process(__current)) {
         // signal is undefined under 'kernel process'

-        return 0;
+        return;

     }
 
     if (!pending_sigs(current_thread)) {
         // 没有待处理信号
     }
 
     if (!pending_sigs(current_thread)) {
         // 没有待处理信号

-        return 0;
+        return;

     }
 
     struct sigregistry* sigreg = __current->sigreg;
     }
 
     struct sigregistry* sigreg = __current->sigreg;


@@ -46,29 +50,28 @@ signal_dispatch()
     struct sigact* prev_working = active_signal(current_thread);
     sigset_t mask = psig->sig_mask | (prev_working ? prev_working->sa_mask : 0);
 
     struct sigact* prev_working = active_signal(current_thread);
     sigset_t mask = psig->sig_mask | (prev_working ? prev_working->sa_mask : 0);
 

-    int sig_selected = 31 - clz(psig->sig_pending & ~mask);
+    int sig_selected = msbiti - clz(psig->sig_pending & ~mask);

     sigset_clear(psig->sig_pending, sig_selected);
 
     if (!sig_selected) {
         // SIG0 is reserved
     sigset_clear(psig->sig_pending, sig_selected);
 
     if (!sig_selected) {
         // SIG0 is reserved

-        return 0;
+        return;

     }
 
     struct sigact* action = sigreg->signals[sig_selected];
     if (!action || !action->sa_actor) {
         if (sigset_test(TERMSIG, sig_selected)) {
             signal_terminate(sig_selected);
     }
 
     struct sigact* action = sigreg->signals[sig_selected];
     if (!action || !action->sa_actor) {
         if (sigset_test(TERMSIG, sig_selected)) {
             signal_terminate(sig_selected);

-            schedule();
-            // never return
+            giveup_switch(result);

         }
         }

-        return 0;
+        return;

     }
 
     ptr_t ustack = current_thread->ustack_top;
     ptr_t ustack_start = current_thread->ustack->start;
     if ((int)(ustack - ustack_start) < (int)sizeof(struct proc_sig)) {
         // 用户栈没有空间存放信号上下文
     }
 
     ptr_t ustack = current_thread->ustack_top;
     ptr_t ustack_start = current_thread->ustack->start;
     if ((int)(ustack - ustack_start) < (int)sizeof(struct proc_sig)) {
         // 用户栈没有空间存放信号上下文

-        return 0;
+        return;

     }
 
     struct proc_sig* sigframe =
     }
 
     struct proc_sig* sigframe =


@@ -82,7 +85,7 @@ signal_dispatch()
 
     sigactive_push(current_thread, sig_selected);
 
 
     sigactive_push(current_thread, sig_selected);
 

-    return sigframe;
+    redirect_switch(result, __ptr(sigframe));

 }
 
 static inline void must_inline
 }
 
 static inline void must_inline


@@ -347,7 +350,7 @@ __DEFINE_LXSYSCALL2(int, sys_sigaction, int, signum, struct sigaction*, action)
 __DEFINE_LXSYSCALL(int, pause)
 {
     pause_current_thread();
 __DEFINE_LXSYSCALL(int, pause)
 {
     pause_current_thread();

-    sched_pass();
+    yield_current();

 
     syscall_result(EINTR);
     return -1;
 
     syscall_result(EINTR);
     return -1;


@@ -371,7 +374,7 @@ __DEFINE_LXSYSCALL1(int, sigsuspend, sigset_t, *mask)
     sigctx->sig_mask = (*mask) & ~UNMASKABLE;
 
     pause_current_thread();
     sigctx->sig_mask = (*mask) & ~UNMASKABLE;
 
     pause_current_thread();

-    sched_pass();
+    yield_current();

 
     sigctx->sig_mask = tmp;
     return -1;
 
     sigctx->sig_mask = tmp;
     return -1;