fix: solve the problem of format print

Author: Ivans-11

Cargo.toml

@@ -47,7 +47,7 @@ riscv = "0.10"
 numeric-enum-macro = "0.2"
 
 # 内部 crate 依赖
-tg-console = { path = "tg-console", version = "0.1.0-preview.1" }
+tg-console = { path = "tg-console", version = "0.1.0-preview.2" }
 tg-linker = { path = "tg-linker", version = "0.1.0-preview.2" }
 tg-syscall = { path = "tg-syscall", version = "0.1.0-preview.2" }
 tg-kernel-context = { path = "tg-kernel-context", version = "0.1.0-preview.1" }

tg-console/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tg-console"
 description = "Provides `print!`, `println!` and `log::Log` with customizable implementations for rCore tutorial."
-version = "0.1.0-preview.1"
+version = "0.1.0-preview.2"
 edition = "2021"
 authors = ["YdrMaster <ydrml@hotmail.com>"]
 repository = "https://github.com/rcore-os/rCore-Tutorial-in-single-workspace"

tg-console/src/lib.rs

@@ -1,4 +1,4 @@
-//! 提供可定制实现的 `print!`、`println!` 和 `log::Log`。
+//! 提供可定制实现的 `print!`、`println!` 和 `log::Log`。
 
 #![no_std]
 #![deny(warnings, missing_docs)]
@@ -31,6 +31,66 @@ pub trait Console: Sync {
 /// 库找到输出的方法：保存一个对象引用，这是一种单例。
 static CONSOLE: Once<&'static dyn Console> = Once::new();
 
+/// 打印缓冲区大小。
+const BUFFER_SIZE: usize = 64;
+
+/// 打印缓冲区，用于收集格式化输出后一次性输出，避免抢占导致输出交错。
+struct PrintBuffer {
+    buffer: [u8; BUFFER_SIZE],
+    pos: usize,
+}
+
+impl PrintBuffer {
+    /// 创建一个新的打印缓冲区。
+    const fn new() -> Self {
+        Self {
+            buffer: [0u8; BUFFER_SIZE],
+            pos: 0,
+        }
+    }
+
+    /// 刷新缓冲区，将内容输出到控制台。
+    fn flush(&mut self) {
+        if self.pos > 0 {
+            if let Some(console) = CONSOLE.get() {
+                // SAFETY: buffer 中的内容是从 str 写入的，保证是有效的 UTF-8
+                let s = unsafe { core::str::from_utf8_unchecked(&self.buffer[..self.pos]) };
+                console.put_str(s);
+            }
+            self.pos = 0;
+        }
+    }
+
+    /// 写入字符串到缓冲区，必要时刷新。
+    fn write(&mut self, s: &str) {
+        let bytes = s.as_bytes();
+        let mut offset = 0;
+
+        while offset < bytes.len() {
+            let remaining_buffer = BUFFER_SIZE - self.pos;
+            let remaining_input = bytes.len() - offset;
+            let to_copy = remaining_buffer.min(remaining_input);
+
+            self.buffer[self.pos..self.pos + to_copy]
+                .copy_from_slice(&bytes[offset..offset + to_copy]);
+            self.pos += to_copy;
+            offset += to_copy;
+
+            // 缓冲区满了，刷新
+            if self.pos == BUFFER_SIZE {
+                self.flush();
+            }
+        }
+    }
+}
+
+impl Write for PrintBuffer {
+    fn write_str(&mut self, s: &str) -> fmt::Result {
+        self.write(s);
+        Ok(())
+    }
+}
+
 /// 用户调用这个函数设置输出的方法。
 pub fn init_console(console: &'static dyn Console) {
     CONSOLE.call_once(|| console);
@@ -65,10 +125,13 @@ pub fn test_log() {
 /// 打印。
 ///
 /// 给宏用的，用户不会直接调它。
+/// 使用栈上缓冲区收集格式化输出，然后一次性输出到控制台。
 #[doc(hidden)]
 #[inline]
 pub fn _print(args: fmt::Arguments) {
-    Logger.write_fmt(args).unwrap();
+    let mut buffer = PrintBuffer::new();
+    buffer.write_fmt(args).unwrap();
+    buffer.flush();
 }
 
 /// 格式化打印。

tg-kernel-vm/src/space/mod.rs

@@ -116,6 +116,12 @@ impl<Meta: VmMeta, M: PageManager<Meta>> AddressSpace<Meta, M> {
             }
             vpn = vpn + 1;
         }
+
+        // 刷新地址空间
+        #[cfg(target_arch = "riscv64")]
+        unsafe {
+            core::arch::asm!("sfence.vma")
+        };
     }
 
     /// 查找指定 VPN 的 PTE 指针（用于修改）

user/src/bin/ch5b_usertest.rs

@@ -12,10 +12,10 @@ const TESTS: &[&str] = &[
     "08power_3",
     "09power_5",
     "10power_7",
-    "sbrk",
     "fork_exit",
     "forktest_simple",
     "12forktest",
+    "sbrk",
 ];
 
 const TEST_NUM: usize = TESTS.len();

user/src/bin/ch6b_usertest.rs

@@ -12,10 +12,10 @@ const TESTS: &[&str] = &[
     "08power_3",
     "09power_5",
     "10power_7",
-    "sbrk",
     "fork_exit",
     "forktest_simple",
     "12forktest",
+    "sbrk",
     "filetest_simple",
     "cat_filea",
 ];

user/src/bin/ch7b_usertest.rs

@@ -12,10 +12,10 @@ const TESTS: &[&str] = &[
     "08power_3",
     "09power_5",
     "10power_7",
-    "sbrk",
     "fork_exit",
     "forktest_simple",
     "12forktest",
+    "sbrk",
     "filetest_simple",
     "cat_filea",
     "sig_simple",