add new

os/src/task/task.rs

@@ -16,7 +16,6 @@ use alloc::vec::Vec;
 use alloc::string::{String, ToString};
 use spin::{Mutex, MutexGuard};
 use crate::fs::{File, ProcInfo, ProcInfoList, Stdin, Stdout};
-//czy
 use super::Serialize;
 
 #[derive(Copy, Clone, Serialize)]
@@ -155,9 +154,8 @@ impl TaskControlBlock {
                     Some(Arc::new(Stdout)),
                     // 2 -> stderr
                     Some(Arc::new(Stdout)),
-                    // ? -> proc_info
-                    // 注意调用号严格来说不是自己分配的，打开一个新文件默认分配能分配的最小调用号
-                     Some(Arc::new(ProcInfoList {})),
+                    // 3 -> proc_info
+                    Some(Arc::new(ProcInfoList {})),
                 ],
                 start_time: 0,
                 cpu_time: 0,

os/target/riscv64gc-unknown-none-elf/release/.fingerprint/os-41ca51d7c7825e66/output-bin-os

@@ -5,7 +5,7 @@
 {"message":"unused import: `Deserialize`","code":{"code":"unused_imports","explanation":null},"level":"warning","spans":[{"file_name":"src/fs/proc.rs","byte_start":231,"byte_end":242,"line_start":10,"line_end":10,"column_start":23,"column_end":34,"is_primary":true,"text":[{"text":"use super::{Serialize,Deserialize};","highlight_start":23,"highlight_end":34}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"remove the unused import","code":null,"level":"help","spans":[{"file_name":"src/fs/proc.rs","byte_start":230,"byte_end":242,"line_start":10,"line_end":10,"column_start":22,"column_end":34,"is_primary":true,"text":[{"text":"use super::{Serialize,Deserialize};","highlight_start":22,"highlight_end":34}],"label":null,"suggested_replacement":"","suggestion_applicability":"MachineApplicable","expansion":null}],"children":[],"rendered":null}],"rendered":"\u001b[0m\u001b[1m\u001b[33mwarning\u001b[0m\u001b[0m\u001b[1m: unused import: `Deserialize`\u001b[0m\n\u001b[0m  \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m--> \u001b[0m\u001b[0msrc/fs/proc.rs:10:23\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m|\u001b[0m\n\u001b[0m\u001b[1m\u001b[38;5;12m10\u001b[0m\u001b[0m \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m| \u001b[0m\u001b[0muse super::{Serialize,Deserialize};\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m| \u001b[0m\u001b[0m                      \u001b[0m\u001b[0m\u001b[1m\u001b[33m^^^^^^^^^^^\u001b[0m\n\n"}
 {"message":"unused variable: `start_time`","code":{"code":"unused_variables","explanation":null},"level":"warning","spans":[{"file_name":"src/task/mod.rs","byte_start":963,"byte_end":973,"line_start":39,"line_end":39,"column_start":9,"column_end":19,"is_primary":true,"text":[{"text":"    let start_time = get_time_ms();","highlight_start":9,"highlight_end":19}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"`#[warn(unused_variables)]` on by default","code":null,"level":"note","spans":[],"children":[],"rendered":null},{"message":"if this is intentional, prefix it with an underscore","code":null,"level":"help","spans":[{"file_name":"src/task/mod.rs","byte_start":963,"byte_end":973,"line_start":39,"line_end":39,"column_start":9,"column_end":19,"is_primary":true,"text":[{"text":"    let start_time = get_time_ms();","highlight_start":9,"highlight_end":19}],"label":null,"suggested_replacement":"_start_time","suggestion_applicability":"MachineApplicable","expansion":null}],"children":[],"rendered":null}],"rendered":"\u001b[0m\u001b[1m\u001b[33mwarning\u001b[0m\u001b[0m\u001b[1m: unused variable: `start_time`\u001b[0m\n\u001b[0m  \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m--> \u001b[0m\u001b[0msrc/task/mod.rs:39:9\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m|\u001b[0m\n\u001b[0m\u001b[1m\u001b[38;5;12m39\u001b[0m\u001b[0m \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m| \u001b[0m\u001b[0m    let start_time = get_time_ms();\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m| \u001b[0m\u001b[0m        \u001b[0m\u001b[0m\u001b[1m\u001b[33m^^^^^^^^^^\u001b[0m\u001b[0m \u001b[0m\u001b[0m\u001b[1m\u001b[33mhelp: if this is intentional, prefix it with an underscore: `_start_time`\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m|\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m= \u001b[0m\u001b[0m\u001b[1mnote\u001b[0m\u001b[0m: `#[warn(unused_variables)]` on by default\u001b[0m\n\n"}
 {"message":"unused variable: `start_time`","code":{"code":"unused_variables","explanation":null},"level":"warning","spans":[{"file_name":"src/task/processor.rs","byte_start":1427,"byte_end":1437,"line_start":51,"line_end":51,"column_start":21,"column_end":31,"is_primary":true,"text":[{"text":"                let start_time = get_time_ms();","highlight_start":21,"highlight_end":31}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"if this is intentional, prefix it with an underscore","code":null,"level":"help","spans":[{"file_name":"src/task/processor.rs","byte_start":1427,"byte_end":1437,"line_start":51,"line_end":51,"column_start":21,"column_end":31,"is_primary":true,"text":[{"text":"                let start_time = get_time_ms();","highlight_start":21,"highlight_end":31}],"label":null,"suggested_replacement":"_start_time","suggestion_applicability":"MachineApplicable","expansion":null}],"children":[],"rendered":null}],"rendered":"\u001b[0m\u001b[1m\u001b[33mwarning\u001b[0m\u001b[0m\u001b[1m: unused variable: `start_time`\u001b[0m\n\u001b[0m  \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m--> \u001b[0m\u001b[0msrc/task/processor.rs:51:21\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m|\u001b[0m\n\u001b[0m\u001b[1m\u001b[38;5;12m51\u001b[0m\u001b[0m \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m| \u001b[0m\u001b[0m                let start_time = get_time_ms();\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m| \u001b[0m\u001b[0m                    \u001b[0m\u001b[0m\u001b[1m\u001b[33m^^^^^^^^^^\u001b[0m\u001b[0m \u001b[0m\u001b[0m\u001b[1m\u001b[33mhelp: if this is intentional, prefix it with an underscore: `_start_time`\u001b[0m\n\n"}
-{"message":"unused variable: `buf`","code":{"code":"unused_variables","explanation":null},"level":"warning","spans":[{"file_name":"src/fs/proc.rs","byte_start":2351,"byte_end":2354,"line_start":102,"line_end":102,"column_start":21,"column_end":24,"is_primary":true,"text":[{"text":"    fn write(&self, buf: UserBuffer) -> usize {","highlight_start":21,"highlight_end":24}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"if this is intentional, prefix it with an underscore","code":null,"level":"help","spans":[{"file_name":"src/fs/proc.rs","byte_start":2351,"byte_end":2354,"line_start":102,"line_end":102,"column_start":21,"column_end":24,"is_primary":true,"text":[{"text":"    fn write(&self, buf: UserBuffer) -> usize {","highlight_start":21,"highlight_end":24}],"label":null,"suggested_replacement":"_buf","suggestion_applicability":"MachineApplicable","expansion":null}],"children":[],"rendered":null}],"rendered":"\u001b[0m\u001b[1m\u001b[33mwarning\u001b[0m\u001b[0m\u001b[1m: unused variable: `buf`\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m--> \u001b[0m\u001b[0msrc/fs/proc.rs:102:21\u001b[0m\n\u001b[0m    \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m|\u001b[0m\n\u001b[0m\u001b[1m\u001b[38;5;12m102\u001b[0m\u001b[0m \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m| \u001b[0m\u001b[0m    fn write(&self, buf: UserBuffer) -> usize {\u001b[0m\n\u001b[0m    \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m| \u001b[0m\u001b[0m                    \u001b[0m\u001b[0m\u001b[1m\u001b[33m^^^\u001b[0m\u001b[0m \u001b[0m\u001b[0m\u001b[1m\u001b[33mhelp: if this is intentional, prefix it with an underscore: `_buf`\u001b[0m\n\n"}
-{"message":"variable does not need to be mutable","code":{"code":"unused_mut","explanation":null},"level":"warning","spans":[{"file_name":"src/fs/proc.rs","byte_start":1116,"byte_end":1123,"line_start":63,"line_end":63,"column_start":20,"column_end":27,"is_primary":true,"text":[{"text":"    fn read(&self, mut buf: UserBuffer) -> usize {","highlight_start":20,"highlight_end":27}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"`#[warn(unused_mut)]` on by default","code":null,"level":"note","spans":[],"children":[],"rendered":null},{"message":"remove this `mut`","code":null,"level":"help","spans":[{"file_name":"src/fs/proc.rs","byte_start":1116,"byte_end":1120,"line_start":63,"line_end":63,"column_start":20,"column_end":24,"is_primary":true,"text":[{"text":"    fn read(&self, mut buf: UserBuffer) -> usize {","highlight_start":20,"highlight_end":24}],"label":null,"suggested_replacement":"","suggestion_applicability":"MachineApplicable","expansion":null}],"children":[],"rendered":null}],"rendered":"\u001b[0m\u001b[1m\u001b[33mwarning\u001b[0m\u001b[0m\u001b[1m: variable does not need to be mutable\u001b[0m\n\u001b[0m  \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m--> \u001b[0m\u001b[0msrc/fs/proc.rs:63:20\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m|\u001b[0m\n\u001b[0m\u001b[1m\u001b[38;5;12m63\u001b[0m\u001b[0m \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m| \u001b[0m\u001b[0m    fn read(&self, mut buf: UserBuffer) -> usize {\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m| \u001b[0m\u001b[0m                   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m----\u001b[0m\u001b[0m\u001b[1m\u001b[33m^^^\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m| \u001b[0m\u001b[0m                   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m|\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m| \u001b[0m\u001b[0m                   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12mhelp: remove this `mut`\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m|\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m= \u001b[0m\u001b[0m\u001b[1mnote\u001b[0m\u001b[0m: `#[warn(unused_mut)]` on by default\u001b[0m\n\n"}
-{"message":"variable does not need to be mutable","code":{"code":"unused_mut","explanation":null},"level":"warning","spans":[{"file_name":"src/fs/proc.rs","byte_start":1162,"byte_end":1179,"line_start":66,"line_end":66,"column_start":13,"column_end":30,"is_primary":true,"text":[{"text":"        let mut vec_proc_info:Vec<ProcInfo>= get_info().0;","highlight_start":13,"highlight_end":30}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"remove this `mut`","code":null,"level":"help","spans":[{"file_name":"src/fs/proc.rs","byte_start":1162,"byte_end":1166,"line_start":66,"line_end":66,"column_start":13,"column_end":17,"is_primary":true,"text":[{"text":"        let mut vec_proc_info:Vec<ProcInfo>= get_info().0;","highlight_start":13,"highlight_end":17}],"label":null,"suggested_replacement":"","suggestion_applicability":"MachineApplicable","expansion":null}],"children":[],"rendered":null}],"rendered":"\u001b[0m\u001b[1m\u001b[33mwarning\u001b[0m\u001b[0m\u001b[1m: variable does not need to be mutable\u001b[0m\n\u001b[0m  \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m--> \u001b[0m\u001b[0msrc/fs/proc.rs:66:13\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m|\u001b[0m\n\u001b[0m\u001b[1m\u001b[38;5;12m66\u001b[0m\u001b[0m \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m| \u001b[0m\u001b[0m        let mut vec_proc_info:Vec<ProcInfo>= get_info().0;\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m| \u001b[0m\u001b[0m            \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m----\u001b[0m\u001b[0m\u001b[1m\u001b[33m^^^^^^^^^^^^^\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m| \u001b[0m\u001b[0m            \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m|\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m| \u001b[0m\u001b[0m            \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12mhelp: remove this `mut`\u001b[0m\n\n"}
+{"message":"unused variable: `buf`","code":{"code":"unused_variables","explanation":null},"level":"warning","spans":[{"file_name":"src/fs/proc.rs","byte_start":2334,"byte_end":2337,"line_start":102,"line_end":102,"column_start":21,"column_end":24,"is_primary":true,"text":[{"text":"    fn write(&self, buf: UserBuffer) -> usize {","highlight_start":21,"highlight_end":24}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"if this is intentional, prefix it with an underscore","code":null,"level":"help","spans":[{"file_name":"src/fs/proc.rs","byte_start":2334,"byte_end":2337,"line_start":102,"line_end":102,"column_start":21,"column_end":24,"is_primary":true,"text":[{"text":"    fn write(&self, buf: UserBuffer) -> usize {","highlight_start":21,"highlight_end":24}],"label":null,"suggested_replacement":"_buf","suggestion_applicability":"MachineApplicable","expansion":null}],"children":[],"rendered":null}],"rendered":"\u001b[0m\u001b[1m\u001b[33mwarning\u001b[0m\u001b[0m\u001b[1m: unused variable: `buf`\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m--> \u001b[0m\u001b[0msrc/fs/proc.rs:102:21\u001b[0m\n\u001b[0m    \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m|\u001b[0m\n\u001b[0m\u001b[1m\u001b[38;5;12m102\u001b[0m\u001b[0m \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m| \u001b[0m\u001b[0m    fn write(&self, buf: UserBuffer) -> usize {\u001b[0m\n\u001b[0m    \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m| \u001b[0m\u001b[0m                    \u001b[0m\u001b[0m\u001b[1m\u001b[33m^^^\u001b[0m\u001b[0m \u001b[0m\u001b[0m\u001b[1m\u001b[33mhelp: if this is intentional, prefix it with an underscore: `_buf`\u001b[0m\n\n"}
+{"message":"variable does not need to be mutable","code":{"code":"unused_mut","explanation":null},"level":"warning","spans":[{"file_name":"src/fs/proc.rs","byte_start":1099,"byte_end":1106,"line_start":63,"line_end":63,"column_start":20,"column_end":27,"is_primary":true,"text":[{"text":"    fn read(&self, mut buf: UserBuffer) -> usize {","highlight_start":20,"highlight_end":27}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"`#[warn(unused_mut)]` on by default","code":null,"level":"note","spans":[],"children":[],"rendered":null},{"message":"remove this `mut`","code":null,"level":"help","spans":[{"file_name":"src/fs/proc.rs","byte_start":1099,"byte_end":1103,"line_start":63,"line_end":63,"column_start":20,"column_end":24,"is_primary":true,"text":[{"text":"    fn read(&self, mut buf: UserBuffer) -> usize {","highlight_start":20,"highlight_end":24}],"label":null,"suggested_replacement":"","suggestion_applicability":"MachineApplicable","expansion":null}],"children":[],"rendered":null}],"rendered":"\u001b[0m\u001b[1m\u001b[33mwarning\u001b[0m\u001b[0m\u001b[1m: variable does not need to be mutable\u001b[0m\n\u001b[0m  \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m--> \u001b[0m\u001b[0msrc/fs/proc.rs:63:20\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m|\u001b[0m\n\u001b[0m\u001b[1m\u001b[38;5;12m63\u001b[0m\u001b[0m \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m| \u001b[0m\u001b[0m    fn read(&self, mut buf: UserBuffer) -> usize {\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m| \u001b[0m\u001b[0m                   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m----\u001b[0m\u001b[0m\u001b[1m\u001b[33m^^^\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m| \u001b[0m\u001b[0m                   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m|\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m| \u001b[0m\u001b[0m                   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12mhelp: remove this `mut`\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m|\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m= \u001b[0m\u001b[0m\u001b[1mnote\u001b[0m\u001b[0m: `#[warn(unused_mut)]` on by default\u001b[0m\n\n"}
+{"message":"variable does not need to be mutable","code":{"code":"unused_mut","explanation":null},"level":"warning","spans":[{"file_name":"src/fs/proc.rs","byte_start":1145,"byte_end":1162,"line_start":66,"line_end":66,"column_start":13,"column_end":30,"is_primary":true,"text":[{"text":"        let mut vec_proc_info:Vec<ProcInfo>= get_info().0;","highlight_start":13,"highlight_end":30}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"remove this `mut`","code":null,"level":"help","spans":[{"file_name":"src/fs/proc.rs","byte_start":1145,"byte_end":1149,"line_start":66,"line_end":66,"column_start":13,"column_end":17,"is_primary":true,"text":[{"text":"        let mut vec_proc_info:Vec<ProcInfo>= get_info().0;","highlight_start":13,"highlight_end":17}],"label":null,"suggested_replacement":"","suggestion_applicability":"MachineApplicable","expansion":null}],"children":[],"rendered":null}],"rendered":"\u001b[0m\u001b[1m\u001b[33mwarning\u001b[0m\u001b[0m\u001b[1m: variable does not need to be mutable\u001b[0m\n\u001b[0m  \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m--> \u001b[0m\u001b[0msrc/fs/proc.rs:66:13\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m|\u001b[0m\n\u001b[0m\u001b[1m\u001b[38;5;12m66\u001b[0m\u001b[0m \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m| \u001b[0m\u001b[0m        let mut vec_proc_info:Vec<ProcInfo>= get_info().0;\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m| \u001b[0m\u001b[0m            \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m----\u001b[0m\u001b[0m\u001b[1m\u001b[33m^^^^^^^^^^^^^\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m| \u001b[0m\u001b[0m            \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m|\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m| \u001b[0m\u001b[0m            \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12mhelp: remove this `mut`\u001b[0m\n\n"}
 {"message":"10 warnings emitted","code":null,"level":"warning","spans":[],"children":[],"rendered":"\u001b[0m\u001b[1m\u001b[33mwarning\u001b[0m\u001b[0m\u001b[1m: 10 warnings emitted\u001b[0m\n\n"}

user/src/bin/monitor.rs

@@ -16,7 +16,6 @@ use user_lib::*;
 
 const PROC_INFO: usize = 3;
 const WHITE_SPACE: u8 = 32;
-const LOOP_TIMES:usize=30;
 
 #[derive(Copy, Clone, Deserialize)]
 pub struct SyscallCount {
@@ -90,8 +89,6 @@ pub fn main() {
             if proc_stat[i].status == TaskStatus::Zombie {
                 continue;
             }
-<<<<<<< HEAD
-            
             //println!("{}   ", proc_stat[i].name);
             print!(
                 "{:<15}{:<10}{:<10}",
@@ -170,29 +167,12 @@ pub fn main() {
                 print!("\n{:<82}", "");
             }
             if sycall_cnt.syscall_getpid.0 != 0 {
-=======
-            println!("\x1b[2J");
-            println!("-----------------------------------------------------------------------------------------------------------------------");
-            println!("           rCore-Tutorial-v3 Resource Monitor                            Time: {} s", time_sec);
-            println!("-----------------------------------------------------------------------------------------------------------------------\n");
-
-            let proc_stat: Vec<ProcInfoDirect> = from_str(&temp).unwrap();
-            println!("Process   |   pid   |   ppid   |   status   |   heap   |   mem   |   cpu time  |     syscall    |  times  |  duration  ");
-            println!("-----------------------------------------------------------------------------------------------------------------------\n");
-            for i in 0..proc_stat.len() {
-                if proc_stat[i].status == TaskStatus::Zombie {
-                    continue;
-                }
-                
-                //println!("{}   ", proc_stat[i].name);
->>>>>>> 60373bbac37ce2b8b21ce5c7d69a17753b7a17f2
                 print!(
                     "{:<18}{:^4}      {}ms",
                     "SYSCALL_GETPID", sycall_cnt.syscall_getpid.0, sycall_cnt.syscall_getpid.1
                 );
                 print!("\n{:<82}", "");
             }
-<<<<<<< HEAD
             if sycall_cnt.syscall_fork.0 != 0 {
                 print!(
                     "{:<18}{:^4}      {}ms",
@@ -216,16 +196,10 @@ pub fn main() {
             }
             println!("");
         }
-        println!("-----------------------------------------------------------------------------------------------------------------------\n\n\n");
+        print!("-----------------------------------------------------------------------------------------------------------------------\n");
     
         //println!("{}   ", proc_stat[i].total_size);
         //println!("{}   ", proc_stat[i].cpu_time);
-=======
-            println!("-----------------------------------------------------------------------------------------------------------------------");
-        
-            //println!("{}   ", proc_stat[i].total_size);
-            //println!("{}   ", proc_stat[i].cpu_time);
->>>>>>> 60373bbac37ce2b8b21ce5c7d69a17753b7a17f2
     }