From a2801adffebb6a3679e41789b38ba925ed32832b Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Fri, 6 Jan 2017 08:18:50 -0800 Subject: Message API was awkward. The use of a single function to get both size and length actually turned out to be awkward to use; better to have separate functions to get each. While here, disable some of the initialization/fork checks, because it turns out they aren't needed. --- perf/perf.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'perf') diff --git a/perf/perf.c b/perf/perf.c index 36e563fc..7f0349f6 100644 --- a/perf/perf.c +++ b/perf/perf.c @@ -314,7 +314,6 @@ latency_server(const char *addr, int msgsize, int trips) nng_msg *msg; int rv; int i; - size_t len; if ((rv = nng_open(&s, NNG_PROTO_PAIR)) != 0) { die("nng_socket: %s", nng_strerror(rv)); @@ -331,9 +330,9 @@ latency_server(const char *addr, int msgsize, int trips) if ((rv = nng_recvmsg(s, &msg, 0)) != 0) { die("nng_recvmsg: %s", nng_strerror(rv)); } - nng_msg_body(msg, &len); - if (len != msgsize) { - die("wrong message size: %d != %d", len, msgsize); + if (nng_msg_len(msg) != msgsize) { + die("wrong message size: %d != %d", nng_msg_len(msg), + msgsize); } if ((rv = nng_sendmsg(s, msg, 0)) != 0) { die("nng_sendmsg: %s", nng_strerror(rv)); @@ -389,10 +388,8 @@ throughput_server(const char *addr, int msgsize, int count) if ((rv = nng_recvmsg(s, &msg, 0)) != 0) { die("nng_recvmsg: %s", nng_strerror(rv)); } - size_t len; - nng_msg_body(msg, &len); - if (len != msgsize) { - die("wrong message size: %d != %d", len, + if (nng_msg_len(msg) != msgsize) { + die("wrong message size: %d != %d", nng_msg_len(msg), msgsize); } nni_msg_free(msg); -- cgit v1.2.3-70-g09d2