From fb27a000d9383b503761d0124e7bd41115d70c9a Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Thu, 24 Mar 2011 11:53:55 +0100 Subject: send/recv was changed to send/recv/sendmsg/recvmsg send/recv now complies with POSIX by using raw buffers instead of message objects and by returning number of bytes sent/recvd instead of 0/-1. The return value is changed accordingly for sendmsg and recvmsg. Note that related man pages will be fixed in a separate patch. Signed-off-by: Martin Sustrik --- perf/local_lat.cpp | 12 ++++++------ perf/local_thr.cpp | 12 ++++++------ perf/remote_lat.cpp | 12 ++++++------ perf/remote_thr.cpp | 6 +++--- 4 files changed, 21 insertions(+), 21 deletions(-) (limited to 'perf') diff --git a/perf/local_lat.cpp b/perf/local_lat.cpp index 8d51662..999e799 100644 --- a/perf/local_lat.cpp +++ b/perf/local_lat.cpp @@ -68,18 +68,18 @@ int main (int argc, char *argv []) } for (i = 0; i != roundtrip_count; i++) { - rc = zmq_recv (s, &msg, 0); - if (rc != 0) { - printf ("error in zmq_recv: %s\n", zmq_strerror (errno)); + rc = zmq_recvmsg (s, &msg, 0); + if (rc < 0) { + printf ("error in zmq_recvmsg: %s\n", zmq_strerror (errno)); return -1; } if (zmq_msg_size (&msg) != message_size) { printf ("message of incorrect size received\n"); return -1; } - rc = zmq_send (s, &msg, 0); - if (rc != 0) { - printf ("error in zmq_send: %s\n", zmq_strerror (errno)); + rc = zmq_sendmsg (s, &msg, 0); + if (rc < 0) { + printf ("error in zmq_sendmsg: %s\n", zmq_strerror (errno)); return -1; } } diff --git a/perf/local_thr.cpp b/perf/local_thr.cpp index 0dea8c6..b5379d8 100644 --- a/perf/local_thr.cpp +++ b/perf/local_thr.cpp @@ -79,9 +79,9 @@ int main (int argc, char *argv []) return -1; } - rc = zmq_recv (s, &msg, 0); - if (rc != 0) { - printf ("error in zmq_recv: %s\n", zmq_strerror (errno)); + rc = zmq_recvmsg (s, &msg, 0); + if (rc < 0) { + printf ("error in zmq_recvmsg: %s\n", zmq_strerror (errno)); return -1; } if (zmq_msg_size (&msg) != message_size) { @@ -92,9 +92,9 @@ int main (int argc, char *argv []) watch = zmq_stopwatch_start (); for (i = 0; i != message_count - 1; i++) { - rc = zmq_recv (s, &msg, 0); - if (rc != 0) { - printf ("error in zmq_recv: %s\n", zmq_strerror (errno)); + rc = zmq_recvmsg (s, &msg, 0); + if (rc < 0) { + printf ("error in zmq_recvmsg: %s\n", zmq_strerror (errno)); return -1; } if (zmq_msg_size (&msg) != message_size) { diff --git a/perf/remote_lat.cpp b/perf/remote_lat.cpp index f353ed6..0d438e9 100644 --- a/perf/remote_lat.cpp +++ b/perf/remote_lat.cpp @@ -75,14 +75,14 @@ int main (int argc, char *argv []) watch = zmq_stopwatch_start (); for (i = 0; i != roundtrip_count; i++) { - rc = zmq_send (s, &msg, 0); - if (rc != 0) { - printf ("error in zmq_send: %s\n", zmq_strerror (errno)); + rc = zmq_sendmsg (s, &msg, 0); + if (rc < 0) { + printf ("error in zmq_sendmsg: %s\n", zmq_strerror (errno)); return -1; } - rc = zmq_recv (s, &msg, 0); - if (rc != 0) { - printf ("error in zmq_recv: %s\n", zmq_strerror (errno)); + rc = zmq_recvmsg (s, &msg, 0); + if (rc < 0) { + printf ("error in zmq_recvmsg: %s\n", zmq_strerror (errno)); return -1; } if (zmq_msg_size (&msg) != message_size) { diff --git a/perf/remote_thr.cpp b/perf/remote_thr.cpp index 78b8f72..ba36b98 100644 --- a/perf/remote_thr.cpp +++ b/perf/remote_thr.cpp @@ -76,9 +76,9 @@ int main (int argc, char *argv []) memset (zmq_msg_data (&msg), 0, message_size); #endif - rc = zmq_send (s, &msg, 0); - if (rc != 0) { - printf ("error in zmq_send: %s\n", zmq_strerror (errno)); + rc = zmq_sendmsg (s, &msg, 0); + if (rc < 0) { + printf ("error in zmq_sendmsg: %s\n", zmq_strerror (errno)); return -1; } rc = zmq_msg_close (&msg); -- cgit v1.2.3