cmd/bench: fix bench progress bar (#4388)

juicedata · Jan 30, 2024 · 5879e5b · 5879e5b
1 parent 00f2be6
commit 5879e5b
Showing 1 changed file with 7 additions and 12 deletions.
diff --git a/cmd/bench.go b/cmd/bench.go
@@ -363,18 +363,6 @@ func bench(ctx *cli.Context) error {
 	dropCaches()
 	bm.colorful = utils.SupportANSIColor(os.Stdout.Fd())
 	progress := utils.NewProgress(false)
-	if b := bm.big; b != nil {
-		total := int64(bm.threads * b.fcount * b.bcount)
-		b.wbar = progress.AddCountBar("Write big blocks", total)
-		b.rbar = progress.AddCountBar("Read big blocks", total)
-	}
-	if s := bm.small; s != nil {
-		total := int64(bm.threads * s.fcount * s.bcount)
-		s.wbar = progress.AddCountBar("Write small blocks", total)
-		s.rbar = progress.AddCountBar("Read small blocks", total)
-		s.sbar = progress.AddCountBar("Stat small files", int64(bm.threads*s.fcount))
-	}
-
 	/* --- Run Benchmark --- */
 	var stats map[string]float64
 	if mp != "" {
@@ -383,6 +371,8 @@ func bench(ctx *cli.Context) error {
 	var result [][]string
 	result = append(result, []string{"ITEM", "VALUE", "COST"})
 	if b := bm.big; b != nil {
+		total := int64(bm.threads * b.fcount * b.bcount)
+		b.wbar = progress.AddCountBar("Write big blocks", total)
 		cost := b.run("write")
 		b.wbar.Done()
 		line := make([]string, 3)
@@ -393,6 +383,7 @@ func bench(ctx *cli.Context) error {
 		result = append(result, line)
 		dropCaches()
 
+		b.rbar = progress.AddCountBar("Read big blocks", total)
 		cost = b.run("read")
 		b.rbar.Done()
 		line = make([]string, 3)
@@ -403,6 +394,8 @@ func bench(ctx *cli.Context) error {
 		result = append(result, line)
 	}
 	if s := bm.small; s != nil {
+		total := int64(bm.threads * s.fcount * s.bcount)
+		s.wbar = progress.AddCountBar("Write small blocks", total)
 		cost := s.run("write")
 		s.wbar.Done()
 		line := make([]string, 3)
@@ -413,6 +406,7 @@ func bench(ctx *cli.Context) error {
 		result = append(result, line)
 		dropCaches()
 
+		s.rbar = progress.AddCountBar("Read small blocks", total)
 		cost = s.run("read")
 		s.rbar.Done()
 		line = make([]string, 3)
@@ -423,6 +417,7 @@ func bench(ctx *cli.Context) error {
 		result = append(result, line)
 		dropCaches()
 
+		s.sbar = progress.AddCountBar("Stat small files", int64(bm.threads*s.fcount))
 		cost = s.run("stat")
 		s.sbar.Done()
 		line = make([]string, 3)