new ch3-2025s

Author: scPointer

.gitignore

@@ -15,5 +15,6 @@ easy-fs-fuse/target/*
 tools/
 pushall.sh
 *.bak
-
-user/*
+ci-user/
+user/
+os/vendor/

os/src/config.rs

@@ -15,8 +15,6 @@ pub const APP_BASE_ADDRESS: usize = 0x80400000;
 /// size limit of app
 pub const APP_SIZE_LIMIT: usize = 0x20000;
 
-/// the max number of syscall
-pub const MAX_SYSCALL_NUM: usize = 500;
 /// clock frequency
 pub const CLOCK_FREQ: usize = 12500000;
 /// the physical memory end

os/src/syscall/mod.rs

@@ -18,22 +18,23 @@ const SYSCALL_EXIT: usize = 93;
 const SYSCALL_YIELD: usize = 124;
 /// gettime syscall
 const SYSCALL_GET_TIME: usize = 169;
-/// taskinfo syscall
-const SYSCALL_TASK_INFO: usize = 410;
+/// trace syscall
+const SYSCALL_TRACE: usize = 410;
 
 mod fs;
 mod process;
 
 use fs::*;
 use process::*;
+
 /// handle syscall exception with `syscall_id` and other arguments
 pub fn syscall(syscall_id: usize, args: [usize; 3]) -> isize {
     match syscall_id {
         SYSCALL_WRITE => sys_write(args[0], args[1] as *const u8, args[2]),
         SYSCALL_EXIT => sys_exit(args[0] as i32),
         SYSCALL_YIELD => sys_yield(),
         SYSCALL_GET_TIME => sys_get_time(args[0] as *mut TimeVal, args[1]),
-        SYSCALL_TASK_INFO => sys_task_info(args[0] as *mut TaskInfo),
+        SYSCALL_TRACE => sys_trace(args[0], args[1], args[2]),
         _ => panic!("Unsupported syscall_id: {}", syscall_id),
     }
 }

os/src/syscall/process.rs

@@ -1,7 +1,6 @@
 //! Process management syscalls
 use crate::{
-    config::MAX_SYSCALL_NUM,
-    task::{exit_current_and_run_next, suspend_current_and_run_next, TaskStatus},
+    task::{exit_current_and_run_next, suspend_current_and_run_next},
     timer::get_time_us,
 };
 
@@ -12,17 +11,6 @@ pub struct TimeVal {
     pub usec: usize,
 }
 
-/// Task information
-#[allow(dead_code)]
-pub struct TaskInfo {
-    /// Task status in it's life cycle
-    status: TaskStatus,
-    /// The numbers of syscall called by task
-    syscall_times: [u32; MAX_SYSCALL_NUM],
-    /// Total running time of task
-    time: usize,
-}
-
 /// task exits and submit an exit code
 pub fn sys_exit(exit_code: i32) -> ! {
     trace!("[kernel] Application exited with code {}", exit_code);
@@ -50,8 +38,8 @@ pub fn sys_get_time(ts: *mut TimeVal, _tz: usize) -> isize {
     0
 }
 
-/// YOUR JOB: Finish sys_task_info to pass testcases
-pub fn sys_task_info(_ti: *mut TaskInfo) -> isize {
-    trace!("kernel: sys_task_info");
+// TODO: implement sys_trace
+pub fn sys_trace(_trace_request: usize, _id: usize, _data: usize) -> isize {
+    trace!("kernel: sys_trace");
     -1
 }