diff options
author | Nathan Skrzypczak <nathan.skrzypczak@gmail.com> | 2022-04-27 18:39:03 +0200 |
---|---|---|
committer | Nathan Skrzypczak <nathan.skrzypczak@gmail.com> | 2022-05-30 18:49:13 +0200 |
commit | 4102c72bce694babd94a481b1201d33895a6f9c5 (patch) | |
tree | 1b11238ca4706008c88712f26942dd74ab9c14a6 /examples/perf-bench | |
parent | a4112fac7b86fe09650d2bb57969fe46404edd7d (diff) |
Update generated binapi to v22.02 & makefile changes
This patch does some small updates to the Makefile.
* `make gen-binapi-from-code` is removed, and moves to
`gen-binapi-local`
* `make build` is patched to build cmd & examples
* `make binapi-generator` to build the api-generator
without other binaries, as they typically require its
output to build.
* `make gen-binapi-local` runs the locally built binapi-generator
to update the local bindings. It expects ${VPP_DIR} to be set and
to point to a local vpp repository checked out with the right version
* `make gen-binapi-internal` runs the locally built binapi-generator
to update the bindings in `internal/testbinapi/binapi2001`
Regarding VPP, notable changes when moving to v22.02 are :
- ControlPing moved from vpe to memclnt
- CliInband went from vpe to vlib
Signed-off-by: Nathan Skrzypczak <nathan.skrzypczak@gmail.com>
Change-Id: Ie5cd2d5ded7ecaffd9abc3ca675df40be272b1fa
Diffstat (limited to 'examples/perf-bench')
-rw-r--r-- | examples/perf-bench/perf-bench.go | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/examples/perf-bench/perf-bench.go b/examples/perf-bench/perf-bench.go index 6472068..f7a9857 100644 --- a/examples/perf-bench/perf-bench.go +++ b/examples/perf-bench/perf-bench.go @@ -30,7 +30,7 @@ import ( "git.fd.io/govpp.git/adapter/socketclient" "git.fd.io/govpp.git/adapter/statsclient" "git.fd.io/govpp.git/api" - "git.fd.io/govpp.git/binapi/vpe" + "git.fd.io/govpp.git/binapi/memclnt" "git.fd.io/govpp.git/core" ) @@ -117,8 +117,8 @@ func syncTest(ch api.Channel, cnt int) { fmt.Printf("Running synchronous perf test with %d requests...\n", cnt) for i := 0; i < cnt; i++ { - req := &vpe.ControlPing{} - reply := &vpe.ControlPingReply{} + req := &memclnt.ControlPing{} + reply := &memclnt.ControlPingReply{} if err := ch.SendRequest(req).ReceiveReply(reply); err != nil { log.Fatalln("Error in reply:", err) @@ -134,12 +134,12 @@ func syncTest2(conn api.Connection, cnt int) { log.Fatalln("Error NewStream:", err) } for i := 0; i < cnt; i++ { - if err := stream.SendMsg(&vpe.ControlPing{}); err != nil { + if err := stream.SendMsg(&memclnt.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 { + } else if _, ok := msg.(*memclnt.ControlPingReply); ok { // ok } else { log.Fatalf("unexpected reply: %v", msg.GetMessageName()) @@ -154,14 +154,14 @@ func asyncTest(ch api.Channel, cnt int) { go func() { for i := 0; i < cnt; i++ { - ctxChan <- ch.SendRequest(&vpe.ControlPing{}) + ctxChan <- ch.SendRequest(&memclnt.ControlPing{}) } close(ctxChan) fmt.Printf("Sending asynchronous requests finished\n") }() for ctx := range ctxChan { - reply := &vpe.ControlPingReply{} + reply := &memclnt.ControlPingReply{} if err := ctx.ReceiveReply(reply); err != nil { log.Fatalln("Error in reply:", err) } @@ -179,7 +179,7 @@ func asyncTest2(conn api.Connection, cnt int) { if err != nil { log.Fatalln("Error NewStream:", err) } - if err := stream.SendMsg(&vpe.ControlPing{}); err != nil { + if err := stream.SendMsg(&memclnt.ControlPing{}); err != nil { log.Fatalln("Error SendMsg:", err) } ctxChan <- stream @@ -191,7 +191,7 @@ func asyncTest2(conn api.Connection, cnt int) { for ctx := range ctxChan { if msg, err := ctx.RecvMsg(); err != nil { log.Fatalln("Error RecvMsg:", err) - } else if _, ok := msg.(*vpe.ControlPingReply); ok { + } else if _, ok := msg.(*memclnt.ControlPingReply); ok { // ok } else { log.Fatalf("unexpected reply: %v", msg.GetMessageName()) |