From b74e3b37479a7fa763bed1f2c76de612ee51dcbc Mon Sep 17 00:00:00 2001 From: Vladimir Lavor Date: Thu, 29 Oct 2020 12:56:24 +0100 Subject: Stats API: added GetMemory() Retrieved numbers relate to the statseg heap. Change-Id: I72750183db3524481918c71c993b39e65c28ddb6 Signed-off-by: Vladimir Lavor --- examples/multi-vpp/multi_vpp.go | 8 ++++---- examples/simple-client/simple_client.go | 8 ++++---- examples/stats-client/stats_api.go | 9 ++++++++- examples/stream-client/stream_client.go | 8 ++++---- 4 files changed, 20 insertions(+), 13 deletions(-) (limited to 'examples') diff --git a/examples/multi-vpp/multi_vpp.go b/examples/multi-vpp/multi_vpp.go index c42f802..b207ae4 100644 --- a/examples/multi-vpp/multi_vpp.go +++ b/examples/multi-vpp/multi_vpp.go @@ -41,15 +41,15 @@ var ( statsSockAddrVpp2 = flag.String("stats-sock-2", statsclient.DefaultSocketName, "Path to stats socket file of the VPP2") ) -var Errors []error +var errors []error func main() { flag.Parse() fmt.Println("Starting multi-vpp example") defer func() { - if len(Errors) > 0 { - logInfo("Finished with %d errors\n", len(Errors)) + if len(errors) > 0 { + logInfo("Finished with %d errors\n", len(errors)) os.Exit(1) } else { logInfo("Finished successfully\n") @@ -347,5 +347,5 @@ func logInfo(format string, a ...interface{}) { // logError prints error message func logError(err error, msg string) { fmt.Printf("[ERROR]: %s: %v\n", msg, err) - Errors = append(Errors, err) + errors = append(errors, err) } diff --git a/examples/simple-client/simple_client.go b/examples/simple-client/simple_client.go index 10a0ea6..3be2447 100644 --- a/examples/simple-client/simple_client.go +++ b/examples/simple-client/simple_client.go @@ -74,8 +74,8 @@ func main() { // process errors encountered during the example defer func() { - if len(Errors) > 0 { - fmt.Printf("finished with %d errors\n", len(Errors)) + if len(errors) > 0 { + fmt.Printf("finished with %d errors\n", len(errors)) os.Exit(1) } else { fmt.Println("finished successfully") @@ -302,9 +302,9 @@ func marshal(v interface{}) { fmt.Printf("JSON: %s\n", b) } -var Errors []error +var errors []error func logError(err error, msg string) { fmt.Printf("ERROR: %s: %v\n", msg, err) - Errors = append(Errors, err) + errors = append(errors, err) } diff --git a/examples/stats-client/stats_api.go b/examples/stats-client/stats_api.go index 288caea..b1846a6 100644 --- a/examples/stats-client/stats_api.go +++ b/examples/stats-client/stats_api.go @@ -43,7 +43,7 @@ var ( func init() { flag.Usage = func() { - fmt.Fprintf(os.Stderr, "%s: usage [ls|dump|poll|errors|interfaces|nodes|system|buffers] ...\n", os.Args[0]) + fmt.Fprintf(os.Stderr, "%s: usage [ls|dump|poll|errors|interfaces|nodes|system|buffers|memory] ...\n", os.Args[0]) flag.PrintDefaults() os.Exit(1) } @@ -129,6 +129,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, " ")) diff --git a/examples/stream-client/stream_client.go b/examples/stream-client/stream_client.go index fadfe23..f4af859 100644 --- a/examples/stream-client/stream_client.go +++ b/examples/stream-client/stream_client.go @@ -76,8 +76,8 @@ func main() { // process errors encountered during the example defer func() { - if len(Errors) > 0 { - fmt.Printf("finished with %d errors\n", len(Errors)) + if len(errors) > 0 { + fmt.Printf("finished with %d errors\n", len(errors)) os.Exit(1) } else { fmt.Println("finished successfully") @@ -294,9 +294,9 @@ Loop: fmt.Println() } -var Errors []error +var errors []error func logError(err error, msg string) { fmt.Printf("ERROR: %s: %v\n", msg, err) - Errors = append(Errors, err) + errors = append(errors, err) } -- cgit 1.2.3-korg