优化shell log

Author: ZR233

Cargo.lock

@@ -1,18 +1,20 @@
 [package]
-name = "uboot-shell"
-version = "0.1.9"
-edition = "2024"
-description = "A crate for communicating with u-boot"
 authors = ["周睿 <zrufo747@outlook.com>"]
-license = "MIT"
-keywords = ["u-boot", "shell", "embedded"]
 categories = ["os", "embedded", "development-tools"]
+description = "A crate for communicating with u-boot"
+edition = "2024"
+keywords = ["u-boot", "shell", "embedded"]
+license = "MIT"
+name = "uboot-shell"
 repository = "https://github.com/ZR233/ostool/ostool"
+version = "0.1.10"
 
 [dependencies]
 colored = "3"
+log = "0.4"
 
 [dev-dependencies]
+indicatif = "0.18"
 ntest = "0.9"
 serialport = "4.6"
-indicatif = "0.17"
+env_logger = "0.11"

uboot-shell/Cargo.toml

@@ -1,53 +1,63 @@
 use std::{
-    io::Read,
     net::TcpStream,
-    process::{Child, Command, Stdio},
+    process::{Child, Command},
     time::Duration,
 };
 
+use log::{debug, info};
 use uboot_shell::UbootShell;
 
 fn main() {
+    env_logger::init();
+
     let (mut out, mut uboot) = new_uboot();
 
-    uboot.loady(0x40200000, "Cargo.toml", |_r, _a| {}).unwrap();
+    uboot
+        .loady(0x40200000, "Cargo.toml", |r, a| {
+            debug!("{r}/{a}");
+        })
+        .unwrap();
 
-    println!("finish");
+    info!("finish");
     let _ = out.kill();
     let _ = out.wait();
 }
 
 fn new_uboot() -> (Child, UbootShell) {
-    // qemu-system-aarch64 -machine virt -cpu cortex-a57 -nographic -bios assets/u-boot.bin
-    let mut out = Command::new("qemu-system-aarch64")
+    // qemu-system-aarch64 -machine virt -cpu cortex-a57 -nographic -bios assets/u-boot.bin -serial tcp::12345,server
+    let out = Command::new("qemu-system-aarch64")
         .args([
             "-machine",
             "virt",
             "-cpu",
             "cortex-a57",
             "-nographic",
             "-serial",
-            "tcp::12345,server,nowait",
+            "tcp::12345,server",
             "-bios",
             "assets/u-boot.bin",
         ])
-        .stdout(Stdio::piped())
         .spawn()
         .unwrap();
 
-    let stdout = out.stdout.take().unwrap();
-    let mut buff = vec![];
-    for i in stdout.bytes() {
-        buff.push(i.unwrap());
-        if String::from_utf8_lossy(&buff).contains("qemu") {
-            break;
+    let tx;
+
+    loop {
+        std::thread::sleep(Duration::from_millis(100));
+        match TcpStream::connect("127.0.0.1:12345") {
+            Ok(s) => {
+                tx = s;
+                break;
+            }
+            Err(e) => {
+                println!("wait for qemu serial port ready: {e}");
+            }
         }
     }
 
-    let tx = TcpStream::connect("127.0.0.1:12345").unwrap();
-
     let rx = tx.try_clone().unwrap();
-    rx.set_read_timeout(Some(Duration::from_secs(1))).unwrap();
-
+    rx.set_read_timeout(Some(Duration::from_millis(300)))
+        .unwrap();
+    println!("connect ok");
     (out, UbootShell::new(tx, rx).unwrap())
 }