X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=examples%2Fstats-client%2Fstats_api.go;h=0ccfa897a58eed909d610db27406f347917858e1;hb=4e16c7100cc7f8dddca051ff393460d7a1a77c98;hp=288caeaf9745255b9dca3295208dacfdc3d3bb1e;hpb=809b69ea4a90455445c34bbad7d8e5fea5cf3462;p=govpp.git

diff --git a/examples/stats-client/stats_api.go b/examples/stats-client/stats_api.go
index 288caea..0ccfa89 100644
--- a/examples/stats-client/stats_api.go
+++ b/examples/stats-client/stats_api.go
@@ -39,11 +39,12 @@ var (
 	statsSocket = flag.String("socket", statsclient.DefaultSocketName, "Path to VPP stats socket")
 	dumpAll     = flag.Bool("all", false, "Dump all stats including ones with zero values")
 	pollPeriod  = flag.Duration("period", time.Second*5, "Polling interval period")
+	async       = flag.Bool("async", false, "Use asynchronous connection")
 )
 
 func init() {
 	flag.Usage = func() {
-		fmt.Fprintf(os.Stderr, "%s: usage [ls|dump|poll|errors|interfaces|nodes|system|buffers] <patterns>...\n", os.Args[0])
+		fmt.Fprintf(os.Stderr, "%s: usage [ls|dump|poll|errors|interfaces|nodes|system|buffers|memory] <patterns>...\n", os.Args[0])
 		flag.PrintDefaults()
 		os.Exit(1)
 	}
@@ -58,11 +59,33 @@ func main() {
 		patterns = flag.Args()[1:]
 	}
 
-	client := statsclient.NewStatsClient(*statsSocket)
-
-	c, err := core.ConnectStats(client)
-	if err != nil {
-		log.Fatalln("Connecting failed:", err)
+	var (
+		client *statsclient.StatsClient
+		c      *core.StatsConnection
+		err    error
+	)
+
+	if *async {
+		var statsChan chan core.ConnectionEvent
+		client = statsclient.NewStatsClient(*statsSocket)
+		c, statsChan, err = core.AsyncConnectStats(client, core.DefaultMaxReconnectAttempts, core.DefaultReconnectInterval)
+		if err != nil {
+			log.Fatalln("Asynchronous connecting failed:", err)
+		}
+		select {
+		case e := <-statsChan:
+			if e.State == core.Connected {
+				// OK
+			} else {
+				log.Fatalf("VPP stats asynchronous connection failed: %s\n", e.State.String())
+			}
+		}
+	} else {
+		client = statsclient.NewStatsClient(*statsSocket)
+		c, err = core.ConnectStats(client)
+		if err != nil {
+			log.Fatalln("Connecting failed:", err)
+		}
 	}
 	defer c.Disconnect()
 
@@ -114,10 +137,15 @@ func main() {
 		}
 		n := 0
 		for _, counter := range stats.Errors {
-			if skipZeros && counter.Value == 0 {
+			var sum uint32
+			for _, valuePerWorker := range counter.Values {
+				sum += uint32(valuePerWorker)
+			}
+
+			if skipZeros && sum == 0 {
 				continue
 			}
-			fmt.Printf(" - %v\n", counter)
+			fmt.Printf(" - %v %d (per worker: %v)\n", counter.CounterName, sum, counter.Values)
 			n++
 		}
 		fmt.Printf("Listed %d (%d) error counters\n", n, len(stats.Errors))
@@ -129,6 +157,13 @@ func main() {
 		}
 		fmt.Printf("Buffer stats: %+v\n", stats)
 
+	case "memory":
+		stats := new(api.MemoryStats)
+		if err := c.GetMemoryStats(stats); err != nil {
+			log.Fatalln("getting memory stats failed:", err)
+		}
+		fmt.Printf("Memory stats: %+v\n", stats)
+
 	case "dump":
 		fmt.Printf("Dumping stats.. %s\n", strings.Join(patterns, " "))