From: acevest <zhaoyanbai@126.com>
Date: Fri, 13 Oct 2023 11:25:54 +0000 (+0800)
Subject: 修复serial_monitor的bug
X-Git-Url: http://zhaoyanbai.com/repos/?a=commitdiff_plain;h=36d22dcfabceced3152d730ff76a5997bdf31b54;p=kernel.git

修复serial_monitor的bug
---

diff --git a/scripts/serial_monitor/main.go b/scripts/serial_monitor/main.go
index aa762ef..67bdd28 100644
--- a/scripts/serial_monitor/main.go
+++ b/scripts/serial_monitor/main.go
@@ -40,22 +40,24 @@ func monitor() {
 		}
 	}
 
-	// // 创建一个 WaitGroup 以便在两个协程完成时结束程序
-	// var wg sync.WaitGroup
-	// wg.Add(2)
+	defer conn.Close()
+
+	end := make(chan bool, 0)
 
 	// 将串行控制台的输出发送到屏幕
 	go func() {
 		_, _ = io.Copy(os.Stdout, conn)
-		// wg.Done()
+		log.Printf("qemu -> stdout end\n")
+		end <- true
 	}()
 
 	// 将用户输入发送到串行控制台
 	go func() {
 		_, _ = io.Copy(conn, os.Stdin)
-		// wg.Done()
+		log.Printf("stdin -> qemu end\n")
+		end <- true
 	}()
 
-	// // 等待两个协程完成
-	// wg.Wait()
+	// 只要有一方断开就退出
+	<-end
 }