refactor main loop of perf_bench_test.go and let SetWarmTime do only …

…once

Signed-off-by: NiuJ1ao <26167136+NiuJ1ao@users.noreply.github.com>

perf_bench_test.go

@@ -60,7 +60,7 @@ func TestBenchMultiVMRequestPerSecond(t *testing.T) {
 	baseRPS := getCPUIntenseRPS()[*funcName]
 	*funcNames = *funcName
 
-	for i := 4; i <= 8; i += 4 {
+	for i := 4; i <= 20; i += 4 {
 		*vmNum = i
 		*targetReqPerSec = *vmNum * baseRPS
 		*funcNames = *funcName
@@ -110,43 +110,32 @@ func TestBenchRequestPerSecond(t *testing.T) {
 		avgExecTime, realRPS int64
 		vmGroup              sync.WaitGroup
 		ticker               = time.NewTicker(timeInterval)
-		tickerDone           = make(chan bool, 1)
 		remainingRequests    = totalRequests
-		warmupThreshold      = totalRequests - *vmNum - 1
 	)
 
 	if isRunPerf {
 		err := perfStat.Run()
 		require.NoError(t, err, "Start perf stat returned error")
 	}
 
-	go func() {
-		for {
-			select {
-			case <-ticker.C:
-				vmGroup.Add(1)
-				remainingRequests--
-				if remainingRequests == warmupThreshold {
-					perfStat.SetWarmTime()
-				}
-
-				imageName := images[vmID%len(images)]
-				vmIDString := strconv.Itoa(vmID)
-
-				go serveVM(t, vmIDString, imageName, &vmGroup, isSyncOffload, &avgExecTime, &realRPS)
-
-				vmID = (vmID + 1) % *vmNum
-			case <-tickerDone:
-				ticker.Stop()
-				vmGroup.Wait()
-				return
+	for remainingRequests > 0 {
+		if tickerT := <-ticker.C; !tickerT.IsZero() {
+			vmGroup.Add(1)
+			remainingRequests--
+
+			imageName := images[vmID%len(images)]
+			vmIDString := strconv.Itoa(vmID)
+
+			go serveVM(t, vmIDString, imageName, &vmGroup, isSyncOffload, &avgExecTime, &realRPS)
+
+			vmID = (vmID + 1) % *vmNum
+			if vmID == 0 {
+				perfStat.SetWarmTime()
 			}
 		}
-	}()
-
-	for remainingRequests > 0 {
 	}
-	tickerDone <- true
+
+	ticker.Stop()
 	vmGroup.Wait()
 	perfStat.SetTearDownTime()
 

profile/perf.go

@@ -7,13 +7,15 @@ import (
 	"os/exec"
 	"strconv"
 	"strings"
+	"sync"
 	"time"
 
 	log "github.com/sirupsen/logrus"
 )
 
 // PerfStat A instance of perf stat command
 type PerfStat struct {
+	once         sync.Once
 	execTime     float64
 	cmd          *exec.Cmd
 	tStart       time.Time
@@ -53,11 +55,13 @@ func (p *PerfStat) Run() error {
 
 // SetWarmTime sets the time duration until system is warm.
 func (p *PerfStat) SetWarmTime() {
-	p.warmTime = time.Since(p.tStart).Seconds()
+	p.once.Do(func() {
+		p.warmTime = time.Since(p.tStart).Seconds()
 
-	if p.warmTime > p.execTime {
-		log.Warn("System warmup time is longer than perf execution time.")
-	}
+		if p.execTime > 0 && p.warmTime > p.execTime {
+			log.Warn("System warmup time is longer than perf execution time.")
+		}
+	})
 }
 
 // SetTearDownTime sets the time duration until system tears down.
@@ -85,7 +89,7 @@ func (p *PerfStat) parseResult() (map[string]float64, error) {
 		return nil, err
 	}
 
-	// remove perf-tmp file
+	// remove temporary perf.data file
 	if err := os.Remove(p.outFile); err != nil {
 		return nil, err
 	}