X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/0cf90cca0c924622f3fee8d2a3fafa8238363dc6..f09e806d5032150564df39a2f7b1192c4d84cf15:/lunaix-os/kernel/process/signal.c?ds=sidebyside

diff --git a/lunaix-os/kernel/process/signal.c b/lunaix-os/kernel/process/signal.c
index 0f43b1f..d12c62e 100644
--- a/lunaix-os/kernel/process/signal.c
+++ b/lunaix-os/kernel/process/signal.c
@@ -9,20 +9,9 @@
 
 extern struct scheduler sched_ctx; /* kernel/sched.c */
 
-void __USER__
-default_sighandler_term(int signum)
-{
-    _exit(signum);
-}
+static u32_t term_sigs =
+  (1 << SIGSEGV) | (1 << SIGINT) | (1 << SIGKILL) | (1 << SIGTERM);
 
-void* default_handlers[_SIG_NUM] = {
-    // TODO: 添加默认handler
-    [_SIGINT] = default_sighandler_term,  [_SIGTERM] = default_sighandler_term,
-    [_SIGKILL] = default_sighandler_term, [_SIGSEGV] = default_sighandler_term,
-    [_SIGINT] = default_sighandler_term,
-};
-
-volatile struct proc_sigstate __temp_save;
 // Referenced in kernel/asm/x86/interrupt.S
 void*
 signal_dispatch()
@@ -43,13 +32,16 @@ signal_dispatch()
         return 0;
     }
 
-    if (!__current->sig_handler[sig_selected] &&
-        !default_handlers[sig_selected]) {
-        // 如果该信号没有handler，则忽略
+    if (!__current->sig_handler[sig_selected]) {
+        if ((term_sigs & (1 << sig_selected))) {
+            terminate_proc(sig_selected);
+            schedule();
+            // never return
+        }
         return 0;
     }
 
-    uintptr_t ustack = __current->ustack_top & ~0xf;
+    ptr_t ustack = __current->ustack_top & ~0xf;
 
     if ((int)(ustack - USTACK_END) < (int)sizeof(struct proc_sig)) {
         // 用户栈没有空间存放信号上下文
@@ -79,6 +71,7 @@ signal_dispatch()
 
         解决办法就是先吧intr_ctx拷贝到一个静态分配的区域里，然后再注入到用户栈。
     */
+    static volatile struct proc_sigstate __temp_save;
     __temp_save.proc_regs = __current->intr_ctx;
     memcpy(__temp_save.fxstate, __current->fxstate, 512);
 
@@ -87,11 +80,6 @@ signal_dispatch()
     sig_ctx->sig_num = sig_selected;
     sig_ctx->signal_handler = __current->sig_handler[sig_selected];
 
-    if (!sig_ctx->signal_handler) {
-        // 如果没有用户自定义的Handler，则使用系统默认Handler。
-        sig_ctx->signal_handler = default_handlers[sig_selected];
-    }
-
     __SIGSET(__current->sig_inprogress, sig_selected);
 
     return sig_ctx;
@@ -145,6 +133,9 @@ __DEFINE_LXSYSCALL1(int, sigreturn, struct proc_sig, *sig_ctx)
     __current->flags &= ~PROC_FINPAUSE;
     __SIGCLEAR(__current->sig_inprogress, sig_ctx->sig_num);
     schedule();
+
+    // never reach!
+    return 0;
 }
 
 __DEFINE_LXSYSCALL3(int,