Merge pull request #20 from Arceos-monolithic/zlm_1_6

Zlm 第一阶段任务六（杨金全）
Arceos-monolithic · Feb 29, 2024 · 6fea32e · 6fea32e
2 parents 9ab4610 + ad8df99
commit 6fea32e
Show file tree

Hide file tree

Showing 9 changed files with 122 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -38,6 +38,7 @@ make run
 ```shell
 # 构建镜像
 ./build_img.sh sdcard
+
 # 运行 Unikernel 架构内核
 make run
 

diff --git a/modules/axprocess/src/api.rs b/modules/axprocess/src/api.rs
@@ -57,7 +57,7 @@ pub fn exit_current_task(exit_code: i32) -> ! {
 
     let curr_id = current_task.id().as_u64();
 
-    info!("exit task id {} with code {}", curr_id, exit_code);
+    info!("exit task id {} with code _{}_", curr_id, exit_code);
     clear_wait(
         if current_task.is_leader() {
             process.pid()
@@ -231,11 +231,12 @@ pub unsafe fn wait_pid(pid: isize, exit_code_ptr: *mut i32) -> Result<u64, WaitS
             answer_status = WaitStatus::Running;
             if let Some(exit_code) = child.get_code_if_exit() {
                 answer_status = WaitStatus::Exited;
+                info!("wait pid _{}_ with code _{}_", child.pid(), exit_code);
                 exit_task_id = index;
                 if !exit_code_ptr.is_null() {
                     unsafe {
                         // 因为没有切换页表，所以可以直接填写
-                        *exit_code_ptr = exit_code;
+                        *exit_code_ptr = exit_code << 8;
                     }
                 }
                 answer_id = child.pid();
@@ -245,10 +246,11 @@ pub unsafe fn wait_pid(pid: isize, exit_code_ptr: *mut i32) -> Result<u64, WaitS
             // 找到了对应的进程
             if let Some(exit_code) = child.get_code_if_exit() {
                 answer_status = WaitStatus::Exited;
+                info!("wait pid _{}_ with code _{:?}_", child.pid(), exit_code);
                 exit_task_id = index;
                 if !exit_code_ptr.is_null() {
                     unsafe {
-                        *exit_code_ptr = exit_code;
+                        *exit_code_ptr = exit_code << 8;
                         // 用于WEXITSTATUS设置编码
                     }
                 }

diff --git a/testcases/testsuits-x86_64-linux-musl/wait b/testcases/testsuits-x86_64-linux-musl/wait
diff --git a/testcases/testsuits-x86_64-linux-musl/wait.c b/testcases/testsuits-x86_64-linux-musl/wait.c
@@ -0,0 +1,55 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <signal.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+// // #define WEXITSTATUS(s) (((s)&0xff00) >> 8)
+// // #define WIFEXITED(s)   (!WTERMSIG(s))
+// #define WIFEXITED(s)   ((s)&0x7f)
+
+int main(void)
+{
+    pid_t pid, wpid;
+    int status;
+    int i = 0;
+    pid = fork();
+    // printf(" %d \n", pid);
+    if (pid == -1) {
+        // fork失败
+        perror("fork failed");
+        exit(EXIT_FAILURE);
+    } else if (pid == 0) {               //子进程
+        printf("Child --- My Parent is %d\n", getppid());
+        sleep(5);
+        // 子进程的任务完成，现在退出
+        printf("Child Process is exiting\n");
+        exit(9); // 退出子进程
+    } else if(pid > 0) {           //父进程
+        wpid = wait(&status);   //等待回收子进程
+
+        printf("Status %d\n", status);
+
+        if(wpid == -1) {
+            perror("wait error:");
+            exit(1);
+        }
+
+        while(i < 3) {
+            printf("Parent Pid = %d, SonPid = %d\n", getpid(), pid);
+            sleep(1);
+            i++;
+        }
+
+        printf("Parent: Status %d WIFEXITED(status) == %d\n", status, WIFEXITED(status));
+
+        //WEXITSTATUS get the return code
+        printf("Parent: Status %d The return code WEXITSTATUS(status) == %d\n", status, WEXITSTATUS(status));
+    } else {
+        perror("for error");
+        exit(1);
+    }
+
+    return 0;
+}
diff --git a/testcases/testsuits-x86_64-linux-musl/wait1 b/testcases/testsuits-x86_64-linux-musl/wait1
diff --git a/testcases/testsuits-x86_64-linux-musl/wait1.c b/testcases/testsuits-x86_64-linux-musl/wait1.c
@@ -0,0 +1,55 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <signal.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+// // #define WEXITSTATUS(s) (((s)&0xff00) >> 8)
+// // #define WIFEXITED(s)   (!WTERMSIG(s))
+// #define WIFEXITED(s)   ((s)&0x7f)
+
+int main(void)
+{
+    pid_t pid, wpid;
+    int status;
+    int i = 0;
+    pid = fork();
+    // printf(" %d \n", pid);
+    if (pid == -1) {
+        // fork失败
+        perror("fork failed");
+        exit(EXIT_FAILURE);
+    } else if (pid == 0) {               //子进程
+        printf("Child --- My Parent is %d\n", getppid());
+        sleep(5);
+        // 子进程的任务完成，现在退出
+        printf("Child Process is exiting\n");
+        exit(0); // 退出子进程
+    } else if(pid > 0) {           //父进程
+        wpid = wait(&status);   //等待回收子进程
+
+        printf("Status %d\n", status);
+
+        if(wpid == -1) {
+            perror("wait error:");
+            exit(1);
+        }
+
+        while(i < 3) {
+            printf("Parent Pid = %d, SonPid = %d\n", getpid(), pid);
+            sleep(1);
+            i++;
+        }
+
+        printf("Parent: Status %d WIFEXITED(status) == %d\n", status, WIFEXITED(status));
+
+        //WEXITSTATUS get the return code
+        printf("Parent: Status %d The return code WEXITSTATUS(status) == %d\n", status, WEXITSTATUS(status));
+    } else {
+        perror("for error");
+        exit(1);
+    }
+
+    return 0;
+}
diff --git a/ulib/axstarry/syscall_entry/src/test.rs b/ulib/axstarry/syscall_entry/src/test.rs
@@ -313,6 +313,8 @@ pub const OSTRAIN_TESTCASES: &[&str] = &[
 pub const SDCARD_TESTCASES: &[&str] = &[
     // "busybox sh",
     "./MediaServer -h",
+    // "./wait",
+    //"./wait1"
     // "./arch_prctl",
     // "busybox sh ./test_all.sh",
     // "./riscv64-linux-musl-native/bin/riscv64-linux-musl-gcc ./hello.c -static",

diff --git a/ulib/axstarry/syscall_task/src/imp/task.rs b/ulib/axstarry/syscall_task/src/imp/task.rs
@@ -191,6 +191,7 @@ pub fn syscall_vfork() -> SyscallResult {
 
 /// 等待子进程完成任务，若子进程没有完成，则自身yield
 /// 当前仅支持WNOHANG选项，即若未完成时则不予等待，直接返回0
+/// WIFEXITED(s) WEXITSTATUS(s)
 pub fn syscall_wait4(pid: isize, exit_code_ptr: *mut i32, option: WaitFlags) -> SyscallResult {
     loop {
         let answer = unsafe { wait_pid(pid, exit_code_ptr) };

diff --git a/ulib/axstarry/syscall_utils/src/ctypes.rs b/ulib/axstarry/syscall_utils/src/ctypes.rs
@@ -172,9 +172,9 @@ impl UtsName {
     /// 默认的 UtsName，并没有统一标准
     pub fn default() -> Self {
         Self {
-            sysname: Self::from_str("YoimiyaOS"),
-            nodename: Self::from_str("YoimiyaOS - machine[0]"),
-            release: Self::from_str("114"),
+            sysname: Self::from_str("Starry"),
+            nodename: Self::from_str("Starry - machine[0]"),
+            release: Self::from_str("100"),
             version: Self::from_str("1.0"),
             machine: Self::from_str("RISC-V 64 on SIFIVE FU740"),
             domainname: Self::from_str("https://github.com/Azure-stars/arceos"),