finish ch3

Author: kdb17wsl

os/src/syscall/mod.rs

@@ -27,8 +27,11 @@ mod process;
 use fs::*;
 use process::*;
 
+use crate::task::TASK_MANAGER;
+
 /// handle syscall exception with `syscall_id` and other arguments
 pub fn syscall(syscall_id: usize, args: [usize; 3]) -> isize {
+    TASK_MANAGER.syscall_count(syscall_id);
     match syscall_id {
         SYSCALL_WRITE => sys_write(args[0], args[1] as *const u8, args[2]),
         SYSCALL_EXIT => sys_exit(args[0] as i32),

os/src/syscall/process.rs

@@ -1,6 +1,6 @@
 //! Process management syscalls
 use crate::{
-    task::{exit_current_and_run_next, suspend_current_and_run_next},
+    task::{TASK_MANAGER, exit_current_and_run_next, suspend_current_and_run_next},
     timer::get_time_us,
 };
 
@@ -41,5 +41,21 @@ pub fn sys_get_time(ts: *mut TimeVal, _tz: usize) -> isize {
 // TODO: implement the syscall
 pub fn sys_trace(_trace_request: usize, _id: usize, _data: usize) -> isize {
     trace!("kernel: sys_trace");
-    -1
+    match _trace_request {
+        0 => {
+            let addr = _id as *const u8;
+            unsafe { core::ptr::read_volatile(addr) as isize }
+        },
+        1 => {
+            let addr = _id as *mut u8;
+            unsafe { core::ptr::write_volatile(addr, _data as u8) };
+            0
+        },
+        2 => {
+            TASK_MANAGER.get_syscall_count(_id) as isize
+        },
+        _ => {
+            -1
+        }
+    }
 }

os/src/task/mod.rs

@@ -45,6 +45,8 @@ pub struct TaskManagerInner {
     tasks: [TaskControlBlock; MAX_APP_NUM],
     /// id of current `Running` task
     current_task: usize,
+    /// syscall count for each syscall id
+    syscall_count: [[usize; 512]; MAX_APP_NUM],
 }
 
 lazy_static! {
@@ -65,6 +67,7 @@ lazy_static! {
                 UPSafeCell::new(TaskManagerInner {
                     tasks,
                     current_task: 0,
+                    syscall_count: [[0; 512]; MAX_APP_NUM],
                 })
             },
         }
@@ -135,6 +138,19 @@ impl TaskManager {
             panic!("All applications completed!");
         }
     }
+
+    /// Get syscall count for a syscall id.
+    pub fn get_syscall_count(&self, syscall_id: usize) -> usize {
+        let inner = self.inner.exclusive_access();
+        inner.syscall_count[inner.current_task][syscall_id]
+    }
+
+    /// Increment syscall count for a syscall id.
+    pub fn syscall_count(&self, syscall_id: usize) {
+        let mut inner = self.inner.exclusive_access();
+        let current = inner.current_task;
+        inner.syscall_count[current][syscall_id] += 1;
+    }
 }
 
 /// Run the first task in task list.