replace '\n' '\r' to ' ' in judge_libctest

Author: cyh21

api/src/imp/task/thread.rs

@@ -6,7 +6,7 @@ use axtask::{current, yield_now, TaskExtMut, TaskExtRef};
 use macro_rules_attribute::apply;
 use num_enum::TryFromPrimitive;
 use starry_core::{
-    ctypes::{WaitFlags, WaitStatus},
+    ctypes::{WaitFlags, WaitStatus, RLimit, RLIMIT_AS, RLIMIT_NOFILE, RLIMIT_STACK},
     task::{exec, wait_pid},
 };
 
@@ -148,12 +148,7 @@ pub fn sys_wait4(pid: i32, exit_code_ptr: UserPtr<i32>, option: u32) -> LinuxRes
     let exit_code_ptr = exit_code_ptr.nullable(UserPtr::get)?;
     info!("wait4: pid: {}, exit_code_ptr: {:?}, option: {}", pid, exit_code_ptr, option);
     loop {
-<<<<<<< HEAD:src/syscall_imp/task/thread.rs
-        let answer = wait_pid(pid, exit_code_ptr.unwrap_or_else(ptr::null_mut));
-        info!("wait4: answer: {:?}", answer);
-=======
         let answer = unsafe { wait_pid(pid, exit_code_ptr.unwrap_or_else(ptr::null_mut)) };
->>>>>>> main:api/src/imp/task/thread.rs
         match answer {
             Ok(pid) => {
                 return Ok(pid as isize);
@@ -292,28 +287,3 @@ pub fn sys_prlimit64(
 pub fn sys_gettid() -> LinuxResult<isize> {
     Ok(current().id().as_u64() as isize)
 }
-
-#[apply(syscall_instrument)]
-pub fn sys_fork() -> LinuxResult<isize> {
-    info!("fork");
-    info!("transfer to clone");
-    // let flags = 17;
-    // let user_stack = 0;
-    // let ptid = 0;
-    // let arg3 = 0;
-    // let arg4 = 0;
-    // sys_clone(flags, user_stack, ptid, arg3, arg4)
-    let stack = None;
-
-    let curr_task = current();
-
-    if let Ok(new_task_id) = curr_task
-        .task_ext()
-        .clone_task(17, stack, 0, 0, 0)
-    {
-        info!("fork: new_task_id: {}", new_task_id);
-        Ok(new_task_id as isize)
-    } else {
-        Err(LinuxError::ENOMEM)
-    }
-}

apps/oscomp/judge_libctest.py

@@ -3,6 +3,9 @@
 
 # TODO: Add more commands to test here
 libctest_baseline = """
+========== START entry-static.exe argv ==========
+Pass!
+========== END entry-static.exe argv ==========
 ========== START entry-static.exe qsort ==========
 Pass!
 ========== END entry-static.exe qsort ==========
@@ -12,11 +15,12 @@ def parse_libctest(output):
     ans = {}
     key = ""
     for line in output.split("\n"):
+        line = line.replace('\n', '').replace('\r', '')
         if "START entry-static.exe" in line:
             key = "libctest static " + line.split(" ")[3]
         elif "START entry-dynamic.exe" in line:
             key = "libctest dynamic " + line.split(" ")[3]
-        if (line == "Pass!" or line == "Pass!\r") and key != "":
+        if (line == "Pass!") and key != "":
             ans[key] = 1
     return ans
 

apps/oscomp/testcase_list

@@ -1 +1,2 @@
-/musl/basic/fork
+/musl/runtest.exe -w entry-static.exe argv
+/musl/runtest.exe -w entry-static.exe qsort

core/src/task.rs

@@ -106,7 +106,10 @@ impl TaskExt {
             current().id_name(),
             axconfig::plat::KERNEL_STACK_SIZE,
         );
-
+        #[cfg(any(target_arch = "x86_64", target_arch = "aarch64"))]
+        unsafe {
+            new_task.ctx_mut().set_tls(axhal::arch::read_thread_pointer().into());
+        }
         let current_task = current();
         let mut current_aspace = current_task.task_ext().aspace.lock();
         let mut new_aspace = current_aspace.clone_or_err()?;
@@ -205,11 +208,11 @@ impl TaskExt {
         self.heap_top.store(top, Ordering::Release)
     }
 
-    pub(crate) fn get_stack_size(&self) -> u64 {
+    pub fn get_stack_size(&self) -> u64 {
         self.stack_size.load(Ordering::Acquire)
     }
 
-    pub(crate) fn set_stack_size(&self, size: u64) {
+    pub fn set_stack_size(&self, size: u64) {
         self.stack_size.store(size, Ordering::Release)
     }
 }

scripts/oscomp_test.sh

@@ -69,7 +69,24 @@ busybox_testlist=("/$LIBC/busybox sh /$LIBC/busybox_testcode.sh")
 iozone_testlist=("/$LIBC/busybox sh /$LIBC/iozone_testcode.sh")
 lua_testlist=("/$LIBC/busybox sh /$LIBC/lua_testcode.sh")
 # libctest_testlist=("/$LIBC/busybox sh /$LIBC/libctest_testcode.sh")
-libctest_testlist=("/musl/runtest.exe -w entry-static.exe qsort")
+libctest_testlist=(
+    "/$LIBC/runtest.exe -w entry-static.exe argv"
+    "/$LIBC/runtest.exe -w entry-static.exe qsort"
+    # "/$LIBC/runtest.exe -w entry-static.exe memmem_oob_read"
+    # "/$LIBC/runtest.exe -w entry-static.exe string_strchr"
+    # "/$LIBC/runtest.exe -w entry-static.exe ungetc"
+    # "/$LIBC/runtest.exe -w entry-static.exe statvfs_syscall_list"
+    # "/$LIBC/runtest.exe -w entry-static.exe strtod"
+    # "/$LIBC/runtest.exe -w entry-static.exe wcsncpy_read_overflow_syscall_list"
+    # "/$LIBC/runtest.exe -w entry-static.exe regex_backref_0_syscall_list"
+    # "/$LIBC/runtest.exe -w entry-static.exe sigprocmask_internal_syscall_list"
+    # "/$LIBC/runtest.exe -w entry-static.exe setvbuf_unget_syscall_list"
+    # "/$LIBC/runtest.exe -w entry-static.exe iswspace_null"
+    # "/$LIBC/runtest.exe -w entry-static.exe scanf_nullbyte_char_syscall_list"
+    # "/$LIBC/runtest.exe -w entry-static.exe memmem_oob"
+    # "/$LIBC/runtest.exe -w entry-static.exe malloc_0"
+    # "/$LIBC/runtest.exe -w entry-static.exe wcsstr_false_negative_syscall_list"
+)
 
 testcases_type=(
     "basic"

src/syscall.rs

@@ -130,7 +130,7 @@ fn handle_syscall(tf: &TrapFrame, syscall_num: usize) -> isize {
             tf.arg3().into(),
         ),
         #[cfg(target_arch = "x86_64")]
-        Sysno::fork => sys_fork(),
+        Sysno::fork => sys_clone(17, 0, 0, 0, 0),
         _ => {
             warn!("Unimplemented syscall: {}", syscall_num);
             axtask::exit(LinuxError::ENOSYS as _)