Merge branch 'console-dev'

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

diff --git a/lunaix-os/kernel/lxinit.c b/lunaix-os/kernel/lxinit.c
index e6ca67bf05febd3aa36cfb934eb0b6c5fa87f923..a767ec738e5dd9de408b3519549c3b8f050ff4f3 100644 (file)
--- a/lunaix-os/kernel/lxinit.c
+++ b/lunaix-os/kernel/lxinit.c
@@ -1,14 +1,14 @@
 #include <hal/cpu.h>
-#include <lunaix/syslog.h>
-#include <lunaix/mm/kalloc.h>
-#include <lunaix/mm/vmm.h>
-#include <lunaix/spike.h>
 #include <lunaix/clock.h>
-#include <lunaix/timer.h>
 #include <lunaix/keyboard.h>
-#include <lunaix/tty/tty.h>
 #include <lunaix/lunistd.h>
+#include <lunaix/lxconsole.h>
+#include <lunaix/mm/kalloc.h>
+#include <lunaix/mm/vmm.h>
 #include <lunaix/proc.h>
+#include <lunaix/spike.h>
+#include <lunaix/syslog.h>
+#include <lunaix/timer.h>
 
 extern uint8_t __kernel_start;
 
@@ -16,8 +16,9 @@ LOG_MODULE("INIT")
 
 // #define FORK_BOMB_DEMO
 #define WAIT_DEMO
+#define IN_USER_MODE
 
-void
+void __USER__
 _lxinit_main()
 {
 #ifdef FORK_BOMB_DEMO
@@ -25,11 +26,12 @@ _lxinit_main()
     for (;;) {
         pid_t p;
         if ((p = fork())) {
-            kprintf(KDEBUG "Forked %d\n", p);
+            kprintf(KDEBUG "Pinkie Pie #%d: FUN!\n", p);
         }
     }
 #endif
 
+    int status;
 #ifdef WAIT_DEMO
     // 测试wait
     kprintf("I am parent, going to fork my child and wait.\n");
@@ -39,27 +41,45 @@ _lxinit_main()
         kprintf("I am child, I am about to terminated\n");
         _exit(1);
     }
-    int status;
+    wait(&status);
     pid_t child = wait(&status);
-    kprintf("I am parent, my child (%d) terminated with code: %d.\n", child, status);
+    kprintf("I am parent, my child (%d) terminated normally with code: %d.\n",
+            child,
+            WEXITSTATUS(status));
 #endif
-    
-    // 这里是就是LunaixOS的第一个进程了！
-    for (size_t i = 0; i < 10; i++)
-    {
+
+    pid_t p = 0;
+
+    if (!fork()) {
+        kprintf("Test no hang!\n");
+        sleep(6);
+        _exit(0);
+    }
+
+    waitpid(-1, &status, WNOHANG);
+
+    for (size_t i = 0; i < 5; i++) {
         pid_t pid = 0;
         if (!(pid = fork())) {
             sleep(i);
             if (i == 3) {
-                i = *(int*)0xdeadc0de;    // seg fault!
+                i = *(int*)0xdeadc0de; // seg fault!
             }
-            tty_put_char('0'+i);
-            tty_put_char('\n');
+            kprintf(KINFO "%d\n", i);
             _exit(0);
         }
         kprintf(KINFO "Forked %d\n", pid);
     }
 
+    while ((p = wait(&status)) >= 0) {
+        short code = WEXITSTATUS(status);
+        if (WIFEXITED(status)) {
+            kprintf(KINFO "Process %d exited with code %d\n", p, code);
+        } else {
+            kprintf(KWARN "Process %d aborted with code %d\n", p, code);
+        }
+    }
+
     char buf[64];
 
     kprintf(KINFO "Hello processes!\n");
@@ -67,22 +87,22 @@ _lxinit_main()
     cpu_get_brand(buf);
     kprintf("CPU: %s\n\n", buf);
 
-    // no lxmalloc here! This can only be used within kernel, but here, we are in a dedicated process!
-    // any access to kernel method must be done via syscall
+    // no lxmalloc here! This can only be used within kernel, but here, we are
+    // in a dedicated process! any access to kernel method must be done via
+    // syscall
 
     struct kdb_keyinfo_pkt keyevent;
-    while (1)
-    {
+    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();
+        if ((keyevent.state & KBD_KEY_FPRESSED) &&
+            (keyevent.keycode & 0xff00) <= KEYPAD) {
+            console_write_char((char)(keyevent.keycode & 0x00ff));
+            // FIXME: io to vga port is privileged and cause #GP in user mode
+            // tty_sync_cursor();
         }
     }
-    
-
     spin();
 }
\ No newline at end of file