fix(lab/3): code base not synced

Co-authored-by: GZTime <[email protected]>

Author: tiger2005

src/0x03/pkg/kernel/src/proc/process.rs

@@ -44,13 +44,14 @@ impl Process {
     pub fn new(
         name: String,
         parent: Option<Weak<Process>>,
-        page_table: PageTableContext,
+        proc_vm: Option<ProcessVm>,
         proc_data: Option<ProcessData>,
     ) -> Arc<Self> {
         let name = name.to_ascii_lowercase();
 
         // create context
         let pid = ProcessId::new();
+        let proc_vm = proc_vm.unwrap_or_else(|| ProcessVm::new(PageTableContext::new()));
 
         let inner = ProcessInner {
             name,
@@ -60,7 +61,7 @@ impl Process {
             ticks_passed: 0,
             exit_code: None,
             children: Vec::new(),
-            page_table: Some(page_table),
+            proc_vm: Some(proc_vm),
             proc_data: Some(proc_data.unwrap_or_default()),
         };
 
@@ -117,7 +118,7 @@ impl ProcessInner {
     }
 
     pub fn clone_page_table(&self) -> PageTableContext {
-        self.page_table.as_ref().unwrap().clone_level_4()
+        self.proc_vm.as_ref().unwrap()
     }
 
     pub fn is_ready(&self) -> bool {

src/0x03/pkg/kernel/src/utils/mod.rs

@@ -61,3 +61,31 @@ fn wait(pid: ProcessId) {
         }
     }
 }
+
+const SHORT_UNITS: [&str; 4] = ["B", "K", "M", "G"];
+const UNITS: [&str; 4] = ["B", "KiB", "MiB", "GiB"];
+
+pub fn humanized_size(size: u64) -> (f32, &'static str) {
+    humanized_size_impl(size, false)
+}
+
+pub fn humanized_size_short(size: u64) -> (f32, &'static str) {
+    humanized_size_impl(size, true)
+}
+
+#[inline]
+pub fn humanized_size_impl(size: u64, short: bool) -> (f32, &'static str) {
+    let bytes = size as f32;
+
+    let units = if short { &SHORT_UNITS } else { &UNITS };
+
+    let mut unit = 0;
+    let mut bytes = bytes;
+
+    while bytes >= 1024f32 && unit < units.len() {
+        bytes /= 1024f32;
+        unit += 1;
+    }
+
+    (bytes, units[unit])
+}