feat: signal support (tested!)

[lunaix-os.git] / lunaix-os / kernel / lxinit.c

diff --git a/lunaix-os/kernel/lxinit.c b/lunaix-os/kernel/lxinit.c
index f7b0f955973d158d302365aed186ce6ce522ec83..1485c3411e4d95266642876f8481f0b9b3168173 100644 (file)
--- a/lunaix-os/kernel/lxinit.c
+++ b/lunaix-os/kernel/lxinit.c
@@ -5,6 +5,7 @@
 #include <lunaix/mm/kalloc.h>
 #include <lunaix/mm/vmm.h>
 #include <lunaix/proc.h>
+#include <lunaix/signal.h>
 #include <lunaix/spike.h>
 #include <lunaix/syslog.h>
 #include <lunaix/timer.h>
@@ -16,8 +17,15 @@ LOG_MODULE("INIT")
 
 // #define FORK_BOMB_DEMO
 #define WAIT_DEMO
+#define IN_USER_MODE
 
-void
+void __USER__
+sigchild_handler(int signum)
+{
+    kprintf(KINFO "SIGCHLD received\n");
+}
+
+void __USER__
 _lxinit_main()
 {
 #ifdef FORK_BOMB_DEMO
@@ -30,6 +38,8 @@ _lxinit_main()
     }
 #endif
 
+    signal(_SIGCHLD, sigchild_handler);
+
     int status;
 #ifdef WAIT_DEMO
     // 测试wait
@@ -48,19 +58,14 @@ _lxinit_main()
 
     pid_t p = 0;
 
-    if (!(p = fork())) {
-        kprintf("Test no hang!");
-        sleep(1);
+    if (!fork()) {
+        kprintf("Test no hang!\n");
+        sleep(6);
         _exit(0);
     }
 
-    waitpid(-1, &status, 0);
-    // FIXME: WNOHANG还有点问题……
-    // waitpid(-1, &status, WNOHANG);
-
-    sleep(2);
+    waitpid(-1, &status, WNOHANG);
 
-    // 这里是就是LunaixOS的第一个进程了！
     for (size_t i = 0; i < 10; i++) {
         pid_t pid = 0;
         if (!(pid = fork())) {
@@ -98,15 +103,15 @@ _lxinit_main()
     struct kdb_keyinfo_pkt keyevent;
     while (1) {
         if (!kbd_recv_key(&keyevent)) {
-            // yield();
+            yield();
             continue;
         }
         if ((keyevent.state & KBD_KEY_FPRESSED) &&
             (keyevent.keycode & 0xff00) <= KEYPAD) {
             tty_put_char((char)(keyevent.keycode & 0x00ff));
-            tty_sync_cursor();
+            // FIXME: io to vga port is privileged and cause #GP in user mode
+            // tty_sync_cursor();
         }
     }
-
     spin();
 }
\ No newline at end of file