refactor: Reorganize scripts and improve shell module

Author: YanLien

.github/workflows/test.yml

@@ -41,7 +41,7 @@ jobs:
         cargo version
         export DISK_IMG="${{ github.workspace }}/disk-aarch64.img"
         export VM_CONFIGS="$(pwd)/configs/vms/nimbos-aarch64-qemu-smp1.toml"
-        ./auto_interrupt.sh ./axvisor.sh run --plat ${{ matrix.plat }} --vmconfigs $VM_CONFIGS --features fs,ept-level-4 --arceos-args DISK_IMG=$DISK_IMG,BUS=mmio,BLK=y,MEM=8g
+        ./scripts/auto_interrupt.sh ./axvisor.sh run --plat ${{ matrix.plat }} --vmconfigs $VM_CONFIGS --features fs,ept-level-4 --arceos-args DISK_IMG=$DISK_IMG,BUS=mmio,BLK=y,MEM=8g
 
   aarch64-generic-phytiumpi:
     runs-on: [self-hosted, linux, phytiumpi]
@@ -135,4 +135,4 @@ jobs:
         cargo version
         export DISK_IMG="${{ github.workspace }}/disk-x86_64.img"
         export VM_CONFIGS="$(pwd)/configs/vms/nimbos-x86_64-qemu-smp1.toml"
-        ./auto_interrupt.sh ./axvisor.sh run --plat ${{ matrix.plat }} --vmconfigs $VM_CONFIGS --features fs --arceos-args DISK_IMG=$DISK_IMG,BLK=y
+        ./scripts/auto_interrupt.sh ./axvisor.sh run --plat ${{ matrix.plat }} --vmconfigs $VM_CONFIGS --features fs --arceos-args DISK_IMG=$DISK_IMG,BLK=y

auto_interrupt.sh renamed to scripts/auto_interrupt.sh

@@ -10,18 +10,19 @@ COMMAND=("$@")
 echo "执行命令: ${COMMAND[*]}"
 
 "${COMMAND[@]}" 2>&1 | while IFS= read -r line; do
-    echo "输出: $line"
+    echo "$line"
 
     if [[ "$line" == *"[OK] Default guest initialized"* ]]; then
-        echo "检测到Shell就绪信号！发送中断信号..."
-        
-        PROCESS_NAME=$(basename "${COMMAND[0]}")
-        PIDS=$(pgrep -f "${COMMAND[0]}")
-        
-        for PID in $PIDS; do
-            echo "发送 SIGINT 到进程 $PID"
-            kill -INT "$PID" 2>/dev/null
+        echo "检测到完成信号，退出中..."
+
+        sleep 2
+
+        pgrep -f "qemu" 2>/dev/null | while read pid; do
+            echo "kill -9 $pid"
+            kill -9 "$pid" 2>/dev/null || true
         done
+
+        pkill -9 -f "${COMMAND[0]}" 2>/dev/null
 
         break
     fi

src/shell/mod.rs

@@ -1,6 +1,5 @@
 mod command;
 
-use std::time::{Duration, Instant};
 use std::io::prelude::*;
 use std::println;
 use std::string::ToString;
@@ -45,9 +44,7 @@ pub fn console_init() {
         let mut temp_buf = [0u8; 1];
 
         let ch = match stdin.read(&mut temp_buf) {
-            Ok(1) => {
-                temp_buf[0]
-            }
+            Ok(1) => temp_buf[0],
             _ => {
                 continue;
             }