feat: The waitpid family!

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

diff --git a/lunaix-os/kernel/lxinit.c b/lunaix-os/kernel/lxinit.c
index d951a9fc6f5e553f108d9d3d5b36703b3f4195df..f7b0f955973d158d302365aed186ce6ce522ec83 100644 (file)
--- a/lunaix-os/kernel/lxinit.c
+++ b/lunaix-os/kernel/lxinit.c
@@ -30,6 +30,7 @@ _lxinit_main()
     }
 #endif
 
     }
 #endif
 

+    int status;

 #ifdef WAIT_DEMO
     // 测试wait
     kprintf("I am parent, going to fork my child and wait.\n");
 #ifdef WAIT_DEMO
     // 测试wait
     kprintf("I am parent, going to fork my child and wait.\n");


@@ -39,13 +40,25 @@ _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);
     }

-    int status;

     pid_t child = 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
 
 #endif
 

-    sleep(5);
+    pid_t p = 0;
+
+    if (!(p = fork())) {
+        kprintf("Test no hang!");
+        sleep(1);
+        _exit(0);
+    }
+
+    waitpid(-1, &status, 0);
+    // FIXME: WNOHANG还有点问题……
+    // waitpid(-1, &status, WNOHANG);
+
+    sleep(2);

 
     // 这里是就是LunaixOS的第一个进程了！
     for (size_t i = 0; i < 10; i++) {
 
     // 这里是就是LunaixOS的第一个进程了！
     for (size_t i = 0; i < 10; i++) {


@@ -62,6 +75,15 @@ _lxinit_main()
         kprintf(KINFO "Forked %d\n", pid);
     }
 
         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");
     char buf[64];
 
     kprintf(KINFO "Hello processes!\n");