fix: qps

Author: BUGLAN

README.md

@@ -14,6 +14,16 @@ go get github.com/BUGLAN/stress
 stress -c 200 -n 10 -u https://www.baidu.com
 ```
 
+## 指标解释
+
+* 请求数: 当前发出的所有请求数量
+* 成功数: 当前发出的所有请求数量中成功数量
+* 失败数: 当前发出的所有请求数量中失败数量
+* QPS: 每秒钟处理请求数量
+* 最长耗时: 成功请求数量里面单个请求最长耗时
+* 最短耗时: 成功请求数量里面单个请求最短耗时
+* 平均耗时: 成功请求平均耗时
+
 ## 感谢
 
 * https://github.com/link1st/go-stress-testing

main.go

@@ -41,7 +41,7 @@ func main() {
 
 	ch := make(chan *model.ReqResult, 200)
 	wgReceive.Add(1)
-	go server.ReceiveData(ch, &wgReceive)
+	go server.ReceiveData(ch,startTime, &wgReceive)
 
 	for i := 0; i < model.Coroutines; i++ {
 		wg.Add(1)

server/statistic.go

@@ -2,14 +2,13 @@ package server
 
 import (
 	"fmt"
-	"math"
 	"sync"
 	"time"
 
 	"github.com/BUGLAN/stress/model"
 )
 
-func ReceiveData(ch chan *model.ReqResult, wg *sync.WaitGroup) {
+func ReceiveData(ch chan *model.ReqResult, startTime time.Time, wg *sync.WaitGroup) {
 	defer wg.Done()
 	stopChan := make(chan struct{})
 	ticker := time.NewTicker(time.Second * 1)
@@ -26,17 +25,18 @@ func ReceiveData(ch chan *model.ReqResult, wg *sync.WaitGroup) {
 		avgTime          float64 // 平均请求耗时
 		concurrentNum    uint64  // 并发数
 		currRequestNum   uint64  // 当前请求数
+		elapsedTime      int     // 耗时
 	)
 
 	// 排除minTime为0的情况
-	minTime = math.MaxFloat64
 
 	go func() {
 		for {
 			select {
 			case <-ticker.C:
+				elapsedTime += 1
 				// 定时输出相应的指标
-				out(totalProcessTime, concurrentNum, totalSuccessNum, totalFailureNum, qps, maxTime, minTime, avgTime)
+				out(elapsedTime, concurrentNum, totalSuccessNum, totalFailureNum, qps, maxTime, minTime, avgTime)
 			case <-stopChan:
 				fmt.Println()
 				return
@@ -59,7 +59,9 @@ func ReceiveData(ch chan *model.ReqResult, wg *sync.WaitGroup) {
 		// fmt.Printf("minTime %f\n", minTime)
 
 		// 最小耗时
-		if data.ProcessTime < minTime {
+		if minTime == 0 {
+			minTime = data.ProcessTime
+		} else if data.ProcessTime < minTime {
 			minTime = data.ProcessTime
 		}
 
@@ -79,7 +81,7 @@ func ReceiveData(ch chan *model.ReqResult, wg *sync.WaitGroup) {
 		avgTime = totalProcessTime / float64(concurrentNum)
 
 		// qps
-		qps = 1e9 / avgTime
+		qps = float64(totalSuccessNum) / float64(elapsedTime)
 
 	}
 
@@ -92,18 +94,18 @@ func ReceiveData(ch chan *model.ReqResult, wg *sync.WaitGroup) {
 	_ = concurrentNum
 	_ = currRequestNum
 	// 最后的输出到控制台 传入
-	out(totalProcessTime, concurrentNum, totalSuccessNum, totalFailureNum, qps, maxTime, minTime, avgTime)
+	out(elapsedTime, concurrentNum, totalSuccessNum, totalFailureNum, qps, maxTime, minTime, avgTime)
 
 }
 
 func tableHeader() {
 	fmt.Printf("\n")
-	fmt.Println(" 耗时│ 并发数│ 成功数│ 失败数│   QPS  │最长耗时│最短耗时│平均耗时│ 错误码")
-	fmt.Println("─────┼───────┼───────┼───────┼────────┼────────┼────────┼────────┼────────")
+	fmt.Println(" 耗时│ 请求数│ 成功数│ 失败数│   QPS  │最长耗时│最短耗时│平均耗时")
+	fmt.Println("─────┼───────┼───────┼───────┼────────┼────────┼────────┼────────")
 }
 
 // out 输出到控制台 单位为纳秒(ns)
-func out(totalProcessTime float64, concurrentNum, totalSuccessNum, totalFailureNum uint64, qps, maxTime, minTime, avgTime float64) {
-	fmt.Printf("%4.2fs│%7d│%7d│%7d│%8.2f│%8.2fs│%8.2fs│%8.2fs│错误码\n", totalProcessTime/1e9, concurrentNum, totalSuccessNum, totalFailureNum, qps, maxTime/1e9, minTime/1e9, avgTime/1e9)
+func out(elapsedTime int, concurrentNum, totalSuccessNum, totalFailureNum uint64, qps, maxTime, minTime, avgTime float64) {
+	fmt.Printf("%4ds│%7d│%7d│%7d│%8.2f│%7.2fs│%7.2fs│%7.2fs \n", elapsedTime, concurrentNum, totalSuccessNum, totalFailureNum, qps, maxTime/1e9, minTime/1e9, avgTime/1e9)
 
 }

server/work.go

@@ -35,6 +35,8 @@ func Process(url string, ch chan *model.ReqResult, requestTime int64, wg *sync.W
 		}
 	}
 
+	// verify 验证 进行验证 (errcode)
+
 	ch <- &model.ReqResult{
 		IsSuccess:   isSuccess,
 		StatusCode:  200,

verify/errcode.go

@@ -0,0 +1 @@
+package verify

verify/status.go

@@ -0,0 +1 @@
+package verify