X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=examples%2Fperf-bench%2Fperf-bench.go;h=a7ec1469e2975051f85243fd668f0cff70c85e6a;hb=df67791c6ffc96331f75aec7d3addfe2efca7739;hp=b246e6c2744d9bf669bf444ea5e8a53b8c0e1b67;hpb=c4522fe10317b1729a0820dc880afc78c663f64d;p=govpp.git

diff --git a/examples/perf-bench/perf-bench.go b/examples/perf-bench/perf-bench.go
index b246e6c..a7ec146 100644
--- a/examples/perf-bench/perf-bench.go
+++ b/examples/perf-bench/perf-bench.go
@@ -17,17 +17,18 @@
 package main
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"log"
+	"os"
 	"time"
 
 	"github.com/pkg/profile"
 	"github.com/sirupsen/logrus"
 
-	"git.fd.io/govpp.git/adapter"
 	"git.fd.io/govpp.git/adapter/socketclient"
-	"git.fd.io/govpp.git/adapter/vppapiclient"
+	"git.fd.io/govpp.git/adapter/statsclient"
 	"git.fd.io/govpp.git/api"
 	"git.fd.io/govpp.git/core"
 	"git.fd.io/govpp.git/examples/binapi/vpe"
@@ -40,12 +41,14 @@ const (
 
 func main() {
 	// parse optional flags
-	var sync, prof, sock bool
+	var sync bool
 	var cnt int
+	var sock, prof string
 	flag.BoolVar(&sync, "sync", false, "run synchronous perf test")
-	flag.BoolVar(&sock, "sock", false, "use socket client for VPP API")
+	flag.StringVar(&sock, "api-socket", socketclient.DefaultSocketName, "Path to VPP API socket")
+	flag.String("stats-socket", statsclient.DefaultSocketName, "Path to VPP stats socket")
 	flag.IntVar(&cnt, "count", 0, "count of requests to be sent to VPP")
-	flag.BoolVar(&prof, "prof", false, "generate profile data")
+	flag.StringVar(&prof, "prof", "", "enable profiling mode [mem, cpu]")
 	flag.Parse()
 
 	if cnt == 0 {
@@ -57,16 +60,19 @@ func main() {
 		}
 	}
 
-	if prof {
-		defer profile.Start().Stop()
+	switch prof {
+	case "mem":
+		defer profile.Start(profile.MemProfile, profile.MemProfileRate(1)).Stop()
+	case "cpu":
+		defer profile.Start(profile.CPUProfile).Stop()
+	case "":
+	default:
+		fmt.Printf("invalid profiling mode: %q\n", prof)
+		flag.Usage()
+		os.Exit(1)
 	}
 
-	var a adapter.VppAPI
-	if sock {
-		a = socketclient.NewVppClient("/run/vpp-api.sock")
-	} else {
-		a = vppapiclient.NewVppClient("")
-	}
+	a := socketclient.NewVppClient(sock)
 
 	// connect to VPP
 	conn, err := core.Connect(a)
@@ -93,9 +99,11 @@ func main() {
 	if sync {
 		// run synchronous test
 		syncTest(ch, cnt)
+		//syncTest2(conn, cnt)
 	} else {
 		// run asynchronous test
 		asyncTest(ch, cnt)
+		//asyncTest2(conn, cnt)
 	}
 
 	elapsed := time.Since(start)
@@ -118,6 +126,27 @@ func syncTest(ch api.Channel, cnt int) {
 	}
 }
 
+func syncTest2(conn api.Connection, cnt int) {
+	fmt.Printf("Running synchronous perf test with %d requests...\n", cnt)
+
+	stream, err := conn.NewStream(context.Background())
+	if err != nil {
+		log.Fatalln("Error NewStream:", err)
+	}
+	for i := 0; i < cnt; i++ {
+		if err := stream.SendMsg(&vpe.ControlPing{}); err != nil {
+			log.Fatalln("Error SendMsg:", err)
+		}
+		if msg, err := stream.RecvMsg(); err != nil {
+			log.Fatalln("Error RecvMsg:", err)
+		} else if _, ok := msg.(*vpe.ControlPingReply); ok {
+			// ok
+		} else {
+			log.Fatalf("unexpected reply: %v", msg.GetMessageName())
+		}
+	}
+}
+
 func asyncTest(ch api.Channel, cnt int) {
 	fmt.Printf("Running asynchronous perf test with %d requests...\n", cnt)
 
@@ -138,3 +167,35 @@ func asyncTest(ch api.Channel, cnt int) {
 		}
 	}
 }
+
+func asyncTest2(conn api.Connection, cnt int) {
+	fmt.Printf("Running asynchronous perf test with %d requests...\n", cnt)
+
+	ctxChan := make(chan api.Stream, cnt)
+
+	go func() {
+		for i := 0; i < cnt; i++ {
+			stream, err := conn.NewStream(context.Background())
+			if err != nil {
+				log.Fatalln("Error NewStream:", err)
+			}
+			if err := stream.SendMsg(&vpe.ControlPing{}); err != nil {
+				log.Fatalln("Error SendMsg:", err)
+			}
+			ctxChan <- stream
+		}
+		close(ctxChan)
+		fmt.Printf("Sending asynchronous requests finished\n")
+	}()
+
+	for ctx := range ctxChan {
+		if msg, err := ctx.RecvMsg(); err != nil {
+			log.Fatalln("Error RecvMsg:", err)
+		} else if _, ok := msg.(*vpe.ControlPingReply); ok {
+			// ok
+		} else {
+			log.Fatalf("unexpected reply: %v", msg.GetMessageName())
+		}
+		ctx.Close()
+	}
+}