Change of vterm handling logic on backend chardev input event (#40)

[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 a132de8b1e4f76b5acd1daad7a945b558454779f..eef5c7ba4f72b3a57d08d5059f1067fa01622872 100644 (file)
--- a/lunaix-os/kernel/process/signal.c
+++ b/lunaix-os/kernel/process/signal.c
@@ -11,8 +11,6 @@
 
 #include <sys/mm/mempart.h>
 
 
 #include <sys/mm/mempart.h>
 

-// FIXME issues with signal
-

 LOG_MODULE("SIG")
 
 extern struct scheduler sched_ctx; /* kernel/sched.c */
 LOG_MODULE("SIG")
 
 extern struct scheduler sched_ctx; /* kernel/sched.c */


@@ -43,7 +41,7 @@ signal_dispatch()
         return 0;
     }
 
         return 0;
     }
 

-    struct sigregister* sigreg = __current->sigreg;
+    struct sigregistry* sigreg = __current->sigreg;

     struct sigctx* psig = &current_thread->sigctx;
     struct sigact* prev_working = active_signal(current_thread);
     sigset_t mask = psig->sig_mask | (prev_working ? prev_working->sa_mask : 0);
     struct sigctx* psig = &current_thread->sigctx;
     struct sigact* prev_working = active_signal(current_thread);
     sigset_t mask = psig->sig_mask | (prev_working ? prev_working->sa_mask : 0);


@@ -80,7 +78,7 @@ signal_dispatch()
     sigframe->sigact = action->sa_actor;
     sigframe->sighand = action->sa_handler;
 
     sigframe->sigact = action->sa_actor;
     sigframe->sighand = action->sa_handler;
 

-    sigframe->saved_ictx = current_thread->intr_ctx;
+    sigframe->saved_hstate = current_thread->hstate;

 
     sigactive_push(current_thread, sig_selected);
 
 
     sigactive_push(current_thread, sig_selected);
 


@@ -149,8 +147,7 @@ int
 signal_send(pid_t pid, signum_t signum)
 {
     if (signum >= _SIG_NUM) {
 signal_send(pid_t pid, signum_t signum)
 {
     if (signum >= _SIG_NUM) {

-        syscall_result(EINVAL);
-        return -1;
+        return EINVAL;

     }
 
     pid_t sender_pid = __current->pid;
     }
 
     pid_t sender_pid = __current->pid;


@@ -168,8 +165,7 @@ signal_send(pid_t pid, signum_t signum)
     } else {
         // TODO: send to all process.
         //  But I don't want to support it yet.
     } else {
         // TODO: send to all process.
         //  But I don't want to support it yet.

-        syscall_result(EINVAL);
-        return -1;
+        return EINVAL;

     }
 
 send_grp: ;
     }
 
 send_grp: ;


@@ -181,8 +177,7 @@ send_grp: ;
 
 send_single:
     if (proc_terminated(proc)) {
 
 send_single:
     if (proc_terminated(proc)) {

-        syscall_result(EINVAL);
-        return -1;
+        return EINVAL;

     }
 
     proc_setsignal(proc, signum);
     }
 
     proc_setsignal(proc, signum);


@@ -198,9 +193,9 @@ signal_dup_context(struct sigctx* dest_ctx)
 }
 
 void
 }
 
 void

-signal_dup_registers(struct sigregister* dest_reg)
+signal_dup_registry(struct sigregistry* dest_reg)

 {
 {

-    struct sigregister* oldreg = __current->sigreg;
+    struct sigregistry* oldreg = __current->sigreg;

     for (int i = 0; i < _SIG_NUM; i++) {
         struct sigact* oldact = oldreg->signals[i];
         if (!oldact) {
     for (int i = 0; i < _SIG_NUM; i++) {
         struct sigact* oldact = oldreg->signals[i];
         if (!oldact) {


@@ -220,7 +215,7 @@ signal_reset_context(struct sigctx* sigctx) {
 }
 
 void
 }
 
 void

-signal_reset_register(struct sigregister* sigreg) {
+signal_reset_registry(struct sigregistry* sigreg) {

     for (int i = 0; i < _SIG_NUM; i++) {
         struct sigact* act = sigreg->signals[i];
         if (act) {
     for (int i = 0; i < _SIG_NUM; i++) {
         struct sigact* act = sigreg->signals[i];
         if (act) {


@@ -231,8 +226,8 @@ signal_reset_register(struct sigregister* sigreg) {
 }
 
 void
 }
 
 void

-signal_free_registers(struct sigregister* sigreg) {
-    signal_reset_register(sigreg);
+signal_free_registry(struct sigregistry* sigreg) {
+    signal_reset_registry(sigreg);

     vfree(sigreg);
 }
 
     vfree(sigreg);
 }
 


@@ -269,14 +264,14 @@ __DEFINE_LXSYSCALL1(int, sigreturn, struct proc_sig, *sig_ctx)
         schedule();
     }
 
         schedule();
     }
 

-    current_thread->intr_ctx = sig_ctx->saved_ictx;
+    current_thread->hstate = sig_ctx->saved_hstate;

     if (proc_terminated(__current)) {
         __current->exit_code |= PEXITSIG;
     } else if (sigset_test(CORE, sig_ctx->sig_num)) {
         signal_terminate(sig_ctx->sig_num);
     }
 
     if (proc_terminated(__current)) {
         __current->exit_code |= PEXITSIG;
     } else if (sigset_test(CORE, sig_ctx->sig_num)) {
         signal_terminate(sig_ctx->sig_num);
     }
 

-    ptr_t ictx = (ptr_t)current_thread->intr_ctx;
+    ptr_t ictx = (ptr_t)current_thread->hstate;

 
     /*
         Ensure our restored context is within kernel stack
 
     /*
         Ensure our restored context is within kernel stack


@@ -360,7 +355,7 @@ __DEFINE_LXSYSCALL(int, pause)
 
 __DEFINE_LXSYSCALL2(int, kill, pid_t, pid, int, signum)
 {
 
 __DEFINE_LXSYSCALL2(int, kill, pid_t, pid, int, signum)
 {

-    return signal_send(pid, signum);
+    return syscall_result(signal_send(pid, signum));

 }
 
 __DEFINE_LXSYSCALL1(int, sigpending, sigset_t, *sigset)
 }
 
 __DEFINE_LXSYSCALL1(int, sigpending, sigset_t, *sigset)