Merge branch 'master' of github.com:Minep/lunaix-os

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

diff --git a/lunaix-os/kernel/lxinit.c b/lunaix-os/kernel/lxinit.c
index ec3425c1df6cd0fc0c141ff10238b223afb830a5..d951a9fc6f5e553f108d9d3d5b36703b3f4195df 100644 (file)
--- a/lunaix-os/kernel/lxinit.c
+++ b/lunaix-os/kernel/lxinit.c
@@ -1,81 +1,90 @@
 #include <hal/cpu.h>
 #include <hal/cpu.h>

-#include <lunaix/syslog.h>
+#include <lunaix/clock.h>
+#include <lunaix/keyboard.h>
+#include <lunaix/lunistd.h>

 #include <lunaix/mm/kalloc.h>
 #include <lunaix/mm/vmm.h>
 #include <lunaix/mm/kalloc.h>
 #include <lunaix/mm/vmm.h>

+#include <lunaix/proc.h>

 #include <lunaix/spike.h>
 #include <lunaix/spike.h>

-#include <lunaix/clock.h>
+#include <lunaix/syslog.h>

 #include <lunaix/timer.h>
 #include <lunaix/timer.h>

-#include <lunaix/keyboard.h>

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

-#include <lunaix/lunistd.h>
-#include <lunaix/proc.h>

 
 extern uint8_t __kernel_start;
 
 LOG_MODULE("INIT")
 
 
 extern uint8_t __kernel_start;
 
 LOG_MODULE("INIT")
 

-void 
-test_timer(void* payload);
+// #define FORK_BOMB_DEMO
+#define WAIT_DEMO

 
 void
 _lxinit_main()
 {
 
 void
 _lxinit_main()
 {

+#ifdef FORK_BOMB_DEMO
+    // fork炸弹
+    for (;;) {
+        pid_t p;
+        if ((p = fork())) {
+            kprintf(KDEBUG "Pinkie Pie #%d: FUN!\n", p);
+        }
+    }
+#endif
+
+#ifdef WAIT_DEMO
+    // 测试wait
+    kprintf("I am parent, going to fork my child and wait.\n");
+    if (!fork()) {
+        kprintf("I am child, going to sleep for 2 seconds\n");
+        sleep(2);
+        kprintf("I am child, I am about to terminated\n");
+        _exit(1);
+    }
+    int status;
+    pid_t child = wait(&status);
+    kprintf(
+      "I am parent, my child (%d) terminated with code: %d.\n", child, status);
+#endif
+
+    sleep(5);
+

     // 这里是就是LunaixOS的第一个进程了！
     // 这里是就是LunaixOS的第一个进程了！

-    for (size_t i = 0; i < 10; i++)
-    {
+    for (size_t i = 0; i < 10; i++) {

         pid_t pid = 0;
         if (!(pid = fork())) {
         pid_t pid = 0;
         if (!(pid = fork())) {

-            while (1)
-            {
-                // kprintf(KINFO "Process %d\n", i);
-                tty_put_char('0'+i);
-                yield();
+            sleep(i);
+            if (i == 3) {
+                i = *(int*)0xdeadc0de; // seg fault!

             }
             }

+            tty_put_char('0' + i);
+            tty_put_char('\n');
+            _exit(0);

         }
         kprintf(KINFO "Forked %d\n", pid);
     }
 
     char buf[64];
 
         }
         kprintf(KINFO "Forked %d\n", pid);
     }
 
     char buf[64];
 

-    kprintf(KINFO "Hello higher half kernel world!\nWe are now running in virtual "
-           "address space!\n\n");
+    kprintf(KINFO "Hello processes!\n");

 
     cpu_get_brand(buf);
     kprintf("CPU: %s\n\n", buf);
 
 
     cpu_get_brand(buf);
     kprintf("CPU: %s\n\n", buf);
 

-    void* k_start = vmm_v2p(&__kernel_start);
-    kprintf(KINFO "The kernel's base address mapping: %p->%p\n", &__kernel_start, k_start);
-
-    // 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;
 
     struct kdb_keyinfo_pkt keyevent;

-    while (1)
-    {
+    while (1) {

         if (!kbd_recv_key(&keyevent)) {
             // yield();
             continue;
         }
         if (!kbd_recv_key(&keyevent)) {
             // yield();
             continue;
         }

-        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));
             tty_sync_cursor();
         }
     }
             tty_put_char((char)(keyevent.keycode & 0x00ff));
             tty_sync_cursor();
         }
     }

-    

 
     spin();
 
     spin();

-}
-
-static datetime_t datetime;
-
-void test_timer(void* payload) {
-    clock_walltime(&datetime);
-
-    kprintf(KWARN "%u/%02u/%02u %02u:%02u:%02u\r",
-           datetime.year,
-           datetime.month,
-           datetime.day,
-           datetime.hour,
-           datetime.minute,
-           datetime.second);

 }
\ No newline at end of file
 }
\ No newline at end of file