Merge branch 'master' into signal-dev

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

diff --git a/lunaix-os/kernel/lxinit.c b/lunaix-os/kernel/lxinit.c
index f7b0f955973d158d302365aed186ce6ce522ec83..fa8458c98eca67c28e782f9a3a7948ea32d283e9 100644 (file)
--- a/lunaix-os/kernel/lxinit.c
+++ b/lunaix-os/kernel/lxinit.c
@@ -15,7 +15,7 @@ extern uint8_t __kernel_start;
 LOG_MODULE("INIT")
 
 // #define FORK_BOMB_DEMO
 LOG_MODULE("INIT")
 
 // #define FORK_BOMB_DEMO

-#define WAIT_DEMO
+// #define WAIT_DEMO

 
 void
 _lxinit_main()
 
 void
 _lxinit_main()


@@ -48,20 +48,16 @@ _lxinit_main()
 
     pid_t p = 0;
 
 
     pid_t p = 0;
 

-    if (!(p = fork())) {
+    if (!fork()) {

         kprintf("Test no hang!");
         kprintf("Test no hang!");

-        sleep(1);
+        sleep(12);

         _exit(0);
     }
 
         _exit(0);
     }
 

-    waitpid(-1, &status, 0);
-    // FIXME: WNOHANG还有点问题……
-    // waitpid(-1, &status, WNOHANG);
-
-    sleep(2);
+    waitpid(-1, &status, WNOHANG);

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

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

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