Fix:修复一些问题

Author: fengf233

internal/perf/group.go

@@ -7,6 +7,7 @@ import (
 	"net"
 	"net/http"
 	"strings"
+	"sync"
 	"time"
 
 	"golang.org/x/time/rate"
@@ -160,6 +161,13 @@ func (tg *TcpGroup) task() {
 	}
 }
 
+// 添加一个 bufio.Reader 对象池
+var bufioReaderPool = &sync.Pool{
+	New: func() interface{} {
+		return bufio.NewReader(nil)
+	},
+}
+
 func (tg *TcpGroup) doReq(conn net.Conn, httpByte []byte) (*ReqResult, error) {
 	start := time.Now()
 
@@ -175,17 +183,22 @@ func (tg *TcpGroup) doReq(conn net.Conn, httpByte []byte) (*ReqResult, error) {
 		return nil, fmt.Errorf("set read deadline: %w", err)
 	}
 
-	resp, err := http.ReadResponse(bufio.NewReader(conn), nil)
+	// 从对象池获取 reader
+	br := bufioReaderPool.Get().(*bufio.Reader)
+	br.Reset(conn)
+	defer bufioReaderPool.Put(br)
+
+	resp, err := http.ReadResponse(br, nil)
 	if err != nil {
 		return nil, fmt.Errorf("read response: %w", err)
 	}
 	defer resp.Body.Close()
 
 	respTime := time.Since(start).Nanoseconds()
 
-	return &ReqResult{
-		code:    resp.StatusCode,
-		start:   start,
-		reqtime: respTime,
-	}, nil
+	result := GetReqResult()
+	result.code = resp.StatusCode
+	result.start = start
+	result.reqtime = respTime
+	return result, nil
 }

internal/perf/params.go

@@ -79,7 +79,7 @@ func newRandomInt(pc *ParamsConf) (*RandomInt, error) {
 }
 
 func (r *RandomInt) replace(src []byte) []byte {
-	return bytes.Replace(src, r.name, Randomer.IntBytes(r.start, r.end), -1)
+	return bytes.ReplaceAll(src, r.name, Randomer.IntBytes(r.start, r.end))
 }
 
 type RandomStr struct {
@@ -103,7 +103,7 @@ func newRandomStr(pc *ParamsConf) (*RandomStr, error) {
 }
 
 func (r *RandomStr) replace(src []byte) []byte {
-	return bytes.Replace(src, r.name, Randomer.StrBytes(r.length), -1)
+	return bytes.ReplaceAll(src, r.name, Randomer.StrBytes(r.length))
 }
 
 // validate 验证参数配置

internal/perf/pool.go

@@ -271,8 +271,12 @@ func (pool *ConnPool) getConn(dialer *net.Dialer) (net.Conn, error) {
 }
 
 func (pool *ConnPool) Get() *MyConn {
-	myconn := <-pool.connsChan
-	return myconn
+	select {
+	case <-pool.ctx.ctx.Done():
+		return nil
+	case myconn := <-pool.connsChan:
+		return myconn
+	}
 }
 
 // 获取连接
@@ -321,23 +325,22 @@ func (pool *ConnPool) factory() {
 		select {
 		case <-pool.ctx.ctx.Done():
 			return
-		case conn, ok := <-pool.factoryChan:
+		case myconn, ok := <-pool.factoryChan:
 			if !ok {
 				return
 			}
 
-			conn.Close()
+			myconn.Close()
 			atomic.AddInt32(&ActiveConnCount, -1)
-
-			newConn, err := pool.getConn(conn.dialer)
+			newConn, err := pool.getConn(myconn.dialer)
 			if err != nil {
-				pool.factoryChan <- conn // retry
+				pool.factoryChan <- myconn // retry
 				continue
 			}
 
-			conn.Conn = newConn
+			myconn.Conn = newConn
 			atomic.AddInt32(&ActiveConnCount, 1)
-			pool.connsChan <- conn
+			pool.connsChan <- myconn
 		}
 	}
 }

internal/perf/report.go

@@ -47,6 +47,25 @@ type ReqResult struct {
 	reqtime int64
 }
 
+var reqResultPool = &sync.Pool{
+	New: func() interface{} {
+		return &ReqResult{}
+	},
+}
+
+// GetReqResult 从对象池获取 ReqResult 对象
+func GetReqResult() *ReqResult {
+	return reqResultPool.Get().(*ReqResult)
+}
+
+func PutReqResult(r *ReqResult) {
+	// 重置对象状态
+	r.code = 0
+	r.start = time.Time{}
+	r.reqtime = 0
+	reqResultPool.Put(r)
+}
+
 func NewReport(ctx *RunCtx, maxResult int) *Report {
 	return &Report{
 		Success:       0,
@@ -101,6 +120,7 @@ func (r *Report) Printer() {
 				r.initStartTime(result.start)
 				isStarted = true
 				lastPrintTime = result.start
+				PutReqResult(result)
 				continue
 			}
 
@@ -110,6 +130,7 @@ func (r *Report) Printer() {
 				r.printProgress(rowFormat)
 				lastPrintTime = result.start
 			}
+			PutReqResult(result)
 		default:
 		}
 	}

internal/server/web.go

@@ -122,7 +122,9 @@ func (s *WebServer) handleStopTest(w http.ResponseWriter, r *http.Request) {
 		atomic.StoreInt32(&s.isRunning, 0)
 
 		result := s.getFinshTestResult()
-
+		if result.Duration == 0 {
+			result = TestResult{0, 0, 0, 0, 0, 0, 0, 0, map[int]int{}}
+		}
 		w.WriteHeader(http.StatusOK)
 		json.NewEncoder(w).Encode(map[string]interface{}{
 			"status": "stopped",

web/index.html

@@ -36,6 +36,17 @@
         .layui-card {
             margin-bottom: 15px;
         }
+        .layui-card {
+            margin-bottom: 15px;
+            border: 1px solid #d9d9d9;  /* 加深边框颜色 */
+            background-color: #f5f5f5;  /* 加深背景颜色 */
+        }
+        
+        /* 加深卡片头部边框颜色和背景 */
+        .layui-card-header {
+            border-bottom: 1px solid #d9d9d9;  /* 加深边框颜色 */
+            background-color: #f0f0f0;  /* 加深头部背景颜色 */
+        }
     </style>
 </head>
 <body class="layui-layout-body">