Changeset 2282 for trunk/src

Timestamp:

Feb 24, 2009, 5:08:51 AM (16 years ago)

Author:

bird

Message:

kash: hacked signal delivery, some trap+kill tests.

Location:

trunk/src/kash

Files:

• Makefile.kmk (modified) (1 diff)
• shinstance.c (modified) (2 diffs)
• tests/Makefile.kmk (added)
• tests/trap-exit-1 (added)
• tests/trap-int-1 (added)
• tests/trap-term-1 (added)

trunk/src/kash/Makefile.kmk

@@ -182 +182 @@
 endif
 
+# Include the sub-makefile.
+include $(PATH_SUB_CURRENT)/tests/Makefile.kmk
+
 include $(FILE_KBUILD_SUB_FOOTER)
 
+

trunk/src/kash/shinstance.c

@@ -347 +347 @@
 static void sh_sig_common_handler(int signo)
 {
+    shmtxtmp tmp;
+    shinstance *psh;
+
     fprintf(stderr, "sh_sig_common_handler: signo=%d:%s\n", signo, sys_signame[signo]);
+    shmtx_enter(&g_sh_mtx, &tmp);
+
+/** @todo signal focus chain or something? Atm there will only be one shell,
+ *        so it's not really important until we go threaded for real... */
+    psh = g_sh_tail;
+    while (psh != NULL)
+    {
+        if (psh->sigactions[signo].sh_handler == SH_SIG_DFL)
+            /* implement... */;
+        else if (psh->sigactions[signo].sh_handler != SIG_IGN)
+            psh->sigactions[signo].sh_handler(psh, signo);
+
+        psh = psh->prev;
+    }
+
+    shmtx_leave(&g_sh_mtx, &tmp);
 }
 
@@ -578 +597 @@
     rc = -1;
 # else
-    //fprintf(stderr, "kill(%d, %d)\n", pid, signo);
+    fprintf(stderr, "kill(%d, %d)\n", pid, signo);
     rc = kill(pid, signo);
 # endif