add count option to 'stat diff' for benchmark

Signed-off-by: Naoki MATSUMOTO <[email protected]>

cmd/ctr-cli/stat/stat.go

@@ -6,6 +6,7 @@ import (
 	"io"
 	"os"
 	"path/filepath"
+	"strconv"
 	"time"
 
 	"github.com/naoki9911/fuse-diff-containerd/pkg/benchmark"
@@ -103,6 +104,11 @@ func diffCommand() *cli.Command {
 				Required: false,
 				Value:    "pathB",
 			},
+			&cli.IntFlag{
+				Name:     "count",
+				Required: false,
+				Value:    1,
+			},
 		},
 	}
 
@@ -134,7 +140,15 @@ func diffAction(c *cli.Context) error {
 	}
 
 	defer fmt.Println("done")
-	return diffImpl(pathA, pathB, pm, b, c.String("pathALabel"), c.String("pathBLabel"), pathA, pathB)
+	for i := 0; i < c.Int("count"); i++ {
+		b.SetLabel("count", strconv.Itoa(i))
+		err = diffImpl(pathA, pathB, pm, b, c.String("pathALabel"), c.String("pathBLabel"), pathA, pathB)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
 }
 
 func doBoth[T, U any](pathA, pathB T, f func(path T) (U, error)) (U, U, error) {

pkg/benchmark/benchmark.go

@@ -46,6 +46,10 @@ func (b *Benchmark) SetDefaultLabels(l map[string]string) {
 	b.defaultLabels = l
 }
 
+func (b *Benchmark) SetLabel(k, v string) {
+	b.defaultLabels[k] = v
+}
+
 func (b *Benchmark) Close() error {
 	err := b.logFile.Close()
 	if err != nil {

tests/bench_impl.sh

@@ -92,7 +92,7 @@ for ((i=0; i < $(expr ${#IMAGE_VERSIONS[@]} - 1); i++));do
 			fi
 			set -u
 
-			$BIN_CTR_CLI --labels $LABELS,old:$LOWER,new:$UPPER,mode:binary-diff,out:$LOWER-$UPPER stat diff --benchmark --pathALabel native --pathBLabel di3fs $UPPER /tmp/fuse
+			$BIN_CTR_CLI --labels $LABELS,old:$LOWER,new:$UPPER,mode:binary-diff,out:$LOWER-$UPPER stat diff --benchmark --pathALabel native --pathBLabel di3fs --count 5 $UPPER /tmp/fuse
 		fi
 		fusermount3 -u /tmp/fuse
 	done

tests/plot_file_io.py

@@ -23,6 +23,8 @@
         # ignore 0-bytes file
         if fileSize == 0:
             continue
+        if labels["count"] != "0":
+            continue
         elapsedUS = r["elapsedMicroseconds"]
         tag = "{}".format(pathLabel)
         if tag not in stat_open:

tests/plot_file_io_with_type.py

@@ -48,6 +48,8 @@
             continue
         if pathLabel != "di3fs":
             continue
+        if labels["count"] != "0":
+            continue
         tag = "{}:{}-{}".format(imageName, old, new)
         entryType = files[tag][path]