X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/f13e160f6aa2f74895ecf1f65099265643836210..986ce23ace2f7875a1a561bd947f435a7594146c:/lunaix-os/kernel/process/signal.c diff --git a/lunaix-os/kernel/process/signal.c b/lunaix-os/kernel/process/signal.c index 0f43b1f..e8683a1 100644 --- a/lunaix-os/kernel/process/signal.c +++ b/lunaix-os/kernel/process/signal.c @@ -17,12 +17,12 @@ default_sighandler_term(int signum) 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, + [_SIGTERM] = default_sighandler_term, + [_SIGKILL] = default_sighandler_term, + [_SIGSEGV] = default_sighandler_term, }; -volatile struct proc_sigstate __temp_save; // Referenced in kernel/asm/x86/interrupt.S void* signal_dispatch() @@ -43,6 +43,10 @@ signal_dispatch() return 0; } + // TODO: SIG{INT|TERM|KILL|SEGV} should have highest priority. + // Terminate the process right here if any of unmaskable signal is + // set. + if (!__current->sig_handler[sig_selected] && !default_handlers[sig_selected]) { // 如果该信号没有handler,则忽略 @@ -79,6 +83,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);