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 fa5ce38783fc301b35e5fa0e452fcc9522acc933..a767ec738e5dd9de408b3519549c3b8f050ff4f3 100644 (file)
--- a/lunaix-os/kernel/lxinit.c
+++ b/lunaix-os/kernel/lxinit.c
@@ -2,14 +2,13 @@
 #include <lunaix/clock.h>
 #include <lunaix/keyboard.h>
 #include <lunaix/lunistd.h>
 #include <lunaix/clock.h>
 #include <lunaix/keyboard.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/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>
 #include <lunaix/spike.h>
 #include <lunaix/syslog.h>
 #include <lunaix/timer.h>

-#include <lunaix/tty/tty.h>

 
 extern uint8_t __kernel_start;
 
 
 extern uint8_t __kernel_start;
 


@@ -19,20 +18,6 @@ LOG_MODULE("INIT")
 #define WAIT_DEMO
 #define IN_USER_MODE
 
 #define WAIT_DEMO
 #define IN_USER_MODE
 

-void __USER__
-sigchild_handler(int signum)
-{
-    kprintf(KINFO "SIGCHLD received\n");
-}
-
-void __USER__
-sigsegv_handler(int signum)
-{
-    pid_t pid = getpid();
-    kprintf(KWARN "SIGSEGV received on process %d\n", pid);
-    _exit(signum);
-}
-

 void __USER__
 _lxinit_main()
 {
 void __USER__
 _lxinit_main()
 {


@@ -46,9 +31,6 @@ _lxinit_main()
     }
 #endif
 
     }
 #endif
 

-    signal(_SIGCHLD, sigchild_handler);
-    signal(_SIGSEGV, sigsegv_handler);
-

     int status;
 #ifdef WAIT_DEMO
     // 测试wait
     int status;
 #ifdef WAIT_DEMO
     // 测试wait


@@ -59,7 +41,7 @@ _lxinit_main()
         kprintf("I am child, I am about to terminated\n");
         _exit(1);
     }
         kprintf("I am child, I am about to terminated\n");
         _exit(1);
     }

-    pause();
+    wait(&status);

     pid_t child = wait(&status);
     kprintf("I am parent, my child (%d) terminated normally with code: %d.\n",
             child,
     pid_t child = wait(&status);
     kprintf("I am parent, my child (%d) terminated normally with code: %d.\n",
             child,


@@ -79,13 +61,11 @@ _lxinit_main()
     for (size_t i = 0; i < 5; i++) {
         pid_t pid = 0;
         if (!(pid = fork())) {
     for (size_t i = 0; i < 5; i++) {
         pid_t pid = 0;
         if (!(pid = fork())) {

-            signal(_SIGSEGV, sigsegv_handler);

             sleep(i);
             if (i == 3) {
                 i = *(int*)0xdeadc0de; // seg fault!
             }
             sleep(i);
             if (i == 3) {
                 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);
             _exit(0);
         }
         kprintf(KINFO "Forked %d\n", pid);


@@ -93,11 +73,7 @@ _lxinit_main()
 
     while ((p = wait(&status)) >= 0) {
         short code = WEXITSTATUS(status);
 
     while ((p = wait(&status)) >= 0) {
         short code = WEXITSTATUS(status);

-        if (WIFSIGNALED(status)) {
-            kprintf(KINFO "Process %d terminated by signal, exit_code: %d\n",
-                    p,
-                    code);
-        } else if (WIFEXITED(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);
             kprintf(KINFO "Process %d exited with code %d\n", p, code);
         } else {
             kprintf(KWARN "Process %d aborted with code %d\n", p, code);


@@ -123,7 +99,7 @@ _lxinit_main()
         }
         if ((keyevent.state & KBD_KEY_FPRESSED) &&
             (keyevent.keycode & 0xff00) <= KEYPAD) {
         }
         if ((keyevent.state & KBD_KEY_FPRESSED) &&
             (keyevent.keycode & 0xff00) <= KEYPAD) {

-            tty_put_char((char)(keyevent.keycode & 0x00ff));
+            console_write_char((char)(keyevent.keycode & 0x00ff));

             // FIXME: io to vga port is privileged and cause #GP in user mode
             // tty_sync_cursor();
         }
             // FIXME: io to vga port is privileged and cause #GP in user mode
             // tty_sync_cursor();
         }