Merge pull request #546 from hintjens/master

Throughput perf test was borked, fixed it

Merge pull request #546 from hintjens/master
Throughput perf test was borked, fixed it
d0c58d24 · Ian Barber · f4a07b39 · 9df7c70a · d0c58d24 · d0c58d24
Commit d0c58d24 authored Apr 15, 2013 by Ian Barber
48 changed files
--- a/doc/zmq.txt
+++ b/doc/zmq.txt
@@ -215,8 +215,8 @@ members of the 0MQ community and pointers can be found on the 0MQ website.

 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <sustrik@250bpm.com>,
-Martin Lucina <martin@lucina.net>, and Pieter Hintjens <ph@imatix.com>.
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.


 RESOURCES

--- a/doc/zmq_bind.txt
+++ b/doc/zmq_bind.txt
@@ -98,5 +98,5 @@ linkzmq:zmq[7]

 AUTHORS
 -------
-This 0MQ manual page was written by Pieter Hintjens <ph@imatix.com>,
-Martin Sustrik <sustrik@250bpm.com> and Martin Lucina <mato@kotelna.sk>.
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_close.txt
+++ b/doc/zmq_close.txt
@@ -48,5 +48,5 @@ linkzmq:zmq[7]

 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and
-Martin Lucina <mato@kotelna.sk>.
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_connect.txt
+++ b/doc/zmq_connect.txt
@@ -96,5 +96,5 @@ linkzmq:zmq[7]

 AUTHORS
 -------
-This 0MQ manual page was written by Pieter Hintjens <ph@imatix.com>,
-Martin Sustrik <sustrik@250bpm.com> and Martin Lucina <mato@kotelna.sk>.
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_ctx_destroy.txt
+++ b/doc/zmq_ctx_destroy.txt
@@ -63,4 +63,5 @@ linkzmq:zmq_setsockopt[3]

 AUTHORS
 -------
-This 0MQ manual page was written by Pieter Hintjens <ph@imatix.com>
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_ctx_get.txt
+++ b/doc/zmq_ctx_get.txt
@@ -68,4 +68,5 @@ linkzmq:zmq[7]

 AUTHORS
 -------
-This 0MQ manual page was written by Pieter Hintjens <ph@imatix.com>
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_ctx_new.txt
+++ b/doc/zmq_ctx_new.txt
@@ -46,4 +46,5 @@ linkzmq:zmq_ctx_term[3]

 AUTHORS
 -------
-This 0MQ manual page was written by Pieter Hintjens <ph@imatix.com>
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_ctx_set.txt
+++ b/doc/zmq_ctx_set.txt
@@ -83,4 +83,5 @@ linkzmq:zmq[7]

 AUTHORS
 -------
-This 0MQ manual page was written by Pieter Hintjens <ph@imatix.com>
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_ctx_term.txt
+++ b/doc/zmq_ctx_term.txt
@@ -63,4 +63,5 @@ linkzmq:zmq_setsockopt[3]

 AUTHORS
 -------
-This 0MQ manual page was written by Pieter Hintjens <ph@imatix.com>
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_disconnect.txt
+++ b/doc/zmq_disconnect.txt
@@ -63,5 +63,5 @@ linkzmq:zmq[7]

 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <sustrik@250bpm.com>,
-Martin Lucina <mato@kotelna.sk> and Ian Barber <ian.barber@gmail.com>
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_errno.txt
+++ b/doc/zmq_errno.txt
@@ -46,5 +46,5 @@ linkzmq:zmq[7]

 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and
-Martin Lucina <mato@kotelna.sk>.
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_getsockopt.txt
+++ b/doc/zmq_getsockopt.txt
@@ -527,5 +527,5 @@ linkzmq:zmq[7]

 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and
-Martin Lucina <mato@kotelna.sk>.
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_init.txt
+++ b/doc/zmq_init.txt
@@ -48,5 +48,5 @@ linkzmq:zmq_term[3]

 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and
-Martin Lucina <mato@kotelna.sk>.
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_inproc.txt
+++ b/doc/zmq_inproc.txt
@@ -81,5 +81,5 @@ linkzmq:zmq[7]

 AUTHORS
 -------
-This 0MQ manual page was written by Pieter Hintjens <ph@imatix.com>,
-Martin Sustrik <sustrik@250bpm.com> and Martin Lucina <mato@kotelna.sk>.
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_ipc.txt
+++ b/doc/zmq_ipc.txt
@@ -86,9 +86,5 @@ linkzmq:zmq[7]

 AUTHORS
 -------
-This 0MQ manual page was written by Pieter Hintjens <ph@imatix.com>,
-Martin Sustrik <sustrik@250bpm.com> and Martin Lucina <mato@kotelna.sk>.
-
-
-
-
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_msg_close.txt
+++ b/doc/zmq_msg_close.txt
@@ -51,5 +51,5 @@ linkzmq:zmq[7]

 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and
-Martin Lucina <mato@kotelna.sk>.
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_msg_copy.txt
+++ b/doc/zmq_msg_copy.txt
@@ -53,5 +53,5 @@ linkzmq:zmq[7]

 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and
-Martin Lucina <mato@kotelna.sk>.
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_msg_data.txt
+++ b/doc/zmq_msg_data.txt
@@ -44,5 +44,5 @@ linkzmq:zmq[7]

 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and
-Martin Lucina <mato@kotelna.sk>.
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_msg_get.txt
+++ b/doc/zmq_msg_get.txt
@@ -68,5 +68,5 @@ linkzmq:zmq[7]

 AUTHORS
 -------
-This 0MQ manual page was written by Chuck Remes <cremes@mac.com> and Pieter
-Hintjens <ph@imatix.com>.
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_msg_init.txt
+++ b/doc/zmq_msg_init.txt
@@ -61,5 +61,5 @@ linkzmq:zmq[7]

 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and
-Martin Lucina <mato@kotelna.sk>.
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_msg_init_data.txt
+++ b/doc/zmq_msg_init_data.txt
@@ -81,5 +81,5 @@ linkzmq:zmq[7]

 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and
-Martin Lucina <mato@kotelna.sk>.
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_msg_init_size.txt
+++ b/doc/zmq_msg_init_size.txt
@@ -54,5 +54,5 @@ linkzmq:zmq[7]

 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and
-Martin Lucina <mato@kotelna.sk>.
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_msg_more.txt
+++ b/doc/zmq_msg_more.txt
@@ -61,5 +61,5 @@ linkzmq:zmq[7]

 AUTHORS
 -------
-This 0MQ manual page was written by Chuck Remes <cremes@mac.com> and Pieter
-Hintjens <ph@imatix.com>.
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_msg_move.txt
+++ b/doc/zmq_msg_move.txt
@@ -48,5 +48,5 @@ linkzmq:zmq[7]

 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and
-Martin Lucina <mato@kotelna.sk>.
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_msg_recv.txt
+++ b/doc/zmq_msg_recv.txt
@@ -120,6 +120,5 @@ linkzmq:zmq[7]

 AUTHORS
 -------
-This man page was written by Martin Sustrik <sustrik@250bpm.com>, Martin
-Lucina <martin@lucina.net>, and Pieter Hintjens <ph@imatix.com>.
-
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_msg_send.txt
+++ b/doc/zmq_msg_send.txt
@@ -117,6 +117,5 @@ linkzmq:zmq[7]

 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and
-Martin Lucina <mato@kotelna.sk>, and Pieter Hintjens <ph@imatix.com>.
-
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_msg_set.txt
+++ b/doc/zmq_msg_set.txt
@@ -42,4 +42,5 @@ linkzmq:zmq[7]

 AUTHORS
 -------
-This 0MQ manual page was written by Pieter Hintjens <ph@imatix.com>.
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_msg_size.txt
+++ b/doc/zmq_msg_size.txt
@@ -44,5 +44,5 @@ linkzmq:zmq[7]

 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <sustrik@250bpm.com>,
-Martin Lucina <mato@kotelna.sk>, and Pieter Hintjens <ph@imatix.com>.
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_pgm.txt
+++ b/doc/zmq_pgm.txt
@@ -156,7 +156,8 @@ linkzmq:zmq_ipc[7]
 linkzmq:zmq_inproc[7]
 linkzmq:zmq[7]

+
 AUTHORS
 -------
-This 0MQ manual page was written by Pieter Hintjens <ph@imatix.com>,
-Martin Sustrik <sustrik@250bpm.com> and Martin Lucina <mato@kotelna.sk>.
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_poll.txt
+++ b/doc/zmq_poll.txt
@@ -128,5 +128,5 @@ Your operating system documentation for the _poll()_ system call.

 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and
-Martin Lucina <mato@kotelna.sk>.
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_proxy.txt
+++ b/doc/zmq_proxy.txt
@@ -94,4 +94,5 @@ linkzmq:zmq[7]

 AUTHORS
 -------
-This 0MQ manual page was written by Pieter Hintjens <ph@imatix.com>
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_recv.txt
+++ b/doc/zmq_recv.txt
@@ -86,6 +86,5 @@ linkzmq:zmq[7]

 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and
-Martin Lucina <mato@kotelna.sk>, and Pieter Hintjens <ph@imatix.com>.
-
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_recvmsg.txt
+++ b/doc/zmq_recvmsg.txt
@@ -117,6 +117,5 @@ linkzmq:zmq[7]

 AUTHORS
 -------
-This man page was written by Martin Sustrik <sustrik@250bpm.com>, Martin
-Lucina <martin@lucina.net> and Pieter Hintjens <ph@imatix.com>.
-
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_send.txt
+++ b/doc/zmq_send.txt
@@ -94,5 +94,5 @@ linkzmq:zmq[7]

 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and
-Martin Lucina <mato@kotelna.sk>, and Pieter Hintjens <ph@imatix.com>.
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_sendmsg.txt
+++ b/doc/zmq_sendmsg.txt
@@ -112,6 +112,5 @@ linkzmq:zmq[7]

 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and
-Martin Lucina <mato@kotelna.sk>, and Pieter Hintjens <ph@imatix.com>.
-
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_setsockopt.txt
+++ b/doc/zmq_setsockopt.txt
@@ -555,5 +555,7 @@ linkzmq:zmq[7]

 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and
-Martin Lucina <mato@kotelna.sk>.
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
+
+
--- a/doc/zmq_socket.txt
+++ b/doc/zmq_socket.txt
@@ -367,5 +367,7 @@ linkzmq:zmq[7]

 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <sustrik@250bpm.com>,
-Martin Lucina <mato@kotelna.sk>, and Pieter Hintjens <ph@imatix.com>.
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
+
+
--- a/doc/zmq_socket_monitor.txt
+++ b/doc/zmq_socket_monitor.txt
@@ -255,5 +255,5 @@ linkzmq:zmq[7]

 AUTHORS
 -------
-This 0MQ manual page was written by Lourens Naudé <lourens@methodmissing.com>
-Changes by Guido Goldstein <github@a-nugget.de>
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_strerror.txt
+++ b/doc/zmq_strerror.txt
@@ -51,5 +51,6 @@ linkzmq:zmq[7]

 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and
-Martin Lucina <mato@kotelna.sk>.
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
+
--- a/doc/zmq_tcp.txt
+++ b/doc/zmq_tcp.txt
@@ -99,5 +99,5 @@ linkzmq:zmq[7]

 AUTHORS
 -------
-This 0MQ manual page was written by Pieter Hintjens <ph@imatix.com>,
-Martin Sustrik <sustrik@250bpm.com> and Martin Lucina <mato@kotelna.sk>.
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_term.txt
+++ b/doc/zmq_term.txt
@@ -62,5 +62,5 @@ linkzmq:zmq_setsockopt[3]

 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and
-Martin Lucina <mato@kotelna.sk>.
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_unbind.txt
+++ b/doc/zmq_unbind.txt
@@ -61,5 +61,5 @@ linkzmq:zmq[7]

 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <sustrik@250bpm.com>,
-Martin Lucina <mato@kotelna.sk> and Ian Barber <ian.barber@gmail.com>
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/doc/zmq_version.txt
+++ b/doc/zmq_version.txt
@@ -47,7 +47,8 @@ SEE ALSO
 --------
 linkzmq:zmq[7]

+
 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and
-Martin Lucina <mato@kotelna.sk>.
+This page was written by the 0MQ community. To make a change please
+read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
--- a/perf/inproc_lat.cpp
+++ b/perf/inproc_lat.cpp
 /*
-    Copyright (c) 2007-2012 iMatix Corporation
-    Copyright (c) 2009-2011 250bpm s.r.o.
-    Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file

    This file is part of 0MQ.


--- a/perf/local_lat.cpp
+++ b/perf/local_lat.cpp
 /*
-    Copyright (c) 2007-2012 iMatix Corporation
-    Copyright (c) 2009-2011 250bpm s.r.o.
-    Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file

    This file is part of 0MQ.


--- a/perf/local_thr.cpp
+++ b/perf/local_thr.cpp
 /*
-    Copyright (c) 2007-2012 iMatix Corporation
-    Copyright (c) 2009-2011 250bpm s.r.o.
-    Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file

    This file is part of 0MQ.

@@ -23,143 +21,37 @@
 #include "../include/zmq_utils.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <limits.h>
-
-#include "platform.hpp"
-
-#ifndef ZMQ_HAVE_WINDOWS
-#include <sys/time.h>
-#endif
-
-#define		ZMSG 1
-#define		DATA 0
-
-typedef struct US_TIMER US_TIMER;
-
-struct US_TIMER{
-
-    struct timeval  time_was;
-    struct timeval  time_now;
-};
-/*  Records the current timer state
-*/
-void tm_init( US_TIMER *t){
-#if defined ZMQ_HAVE_WINDOWS
-
-    //  Get the high resolution counter's accuracy.
-    LARGE_INTEGER ticksPerSecond;
-    QueryPerformanceFrequency (&ticksPerSecond);
-
-    //  What time is it?
-    LARGE_INTEGER tick;
-	if ( !QueryPerformanceCounter (&tick) ) { perror( "tm_init()" ); }
-
-	//  Seconds
-	t->time_now.tv_sec = (long)( tick.QuadPart / ticksPerSecond.QuadPart );
-	//  Microseconds
-	t->time_now.tv_usec = (long)( ( tick.QuadPart - t->time_now.tv_sec * ticksPerSecond.QuadPart ) * 1000000 / ticksPerSecond.QuadPart );
-#else
-    if( gettimeofday( &t->time_now, NULL) < 0){ perror( "tm_init()");}
-#endif
-    t->time_was = t->time_now;
-
-}
-
-/*  Returns the time passed in microsecond precision in seconds since last init
-    of timer.
-*/
-float tm_secs( US_TIMER *t){
-
-    register float seconds;
-#if defined ZMQ_HAVE_WINDOWS
-    //  Get the high resolution counter's accuracy.
-    LARGE_INTEGER ticksPerSecond;
-    QueryPerformanceFrequency (&ticksPerSecond);
-
-    //  What time is it?
-    LARGE_INTEGER tick;
-	if ( !QueryPerformanceCounter (&tick) ) { perror( "tm_secs()" ); }
-
-	//  Seconds
-	t->time_now.tv_sec = (long)( tick.QuadPart / ticksPerSecond.QuadPart );
-	//  Microseconds
-	t->time_now.tv_usec = (long)( ( tick.QuadPart - t->time_now.tv_sec * ticksPerSecond.QuadPart ) * 1000000 / ticksPerSecond.QuadPart );
-#else
-    if( gettimeofday( &t->time_now, NULL) < 0){ perror( "tm_secs()");}
-#endif
-    seconds = ( ((float)( t->time_now.tv_sec - t->time_was.tv_sec)) +
-             (((float)( t->time_now.tv_usec - t->time_was.tv_usec)) / 1000000.0));
-
-    t->time_was = t->time_now;
-
-    return( seconds);
-}
-
-const char *bind_to;
-int message_count = 1000;
-int message_size = 1024;
-int threads = 1;
-int workers = 1;
-int sndbuflen = 128*256;
-int rcvbuflen = 128*256;
-int flow = ZMQ_PULL;
-int rec = DATA;
-
-void my_free (void *data, void *hint)
-{
-   // free (data);
-}

 int main (int argc, char *argv [])
 {
-    US_TIMER timer;
+    const char *bind_to;
+    int message_count;
+    size_t message_size;
    void *ctx;
    void *s;
    int rc;
    int i;
-	void *buf = NULL;
+    zmq_msg_t msg;
+    void *watch;
+    unsigned long elapsed;
+    unsigned long throughput;
+    double megabits;

-    if (argc != 9) {
-        printf ("usage: local_thr <bind-to> <message-size> <message-count> <SND buffer> <RCV buffer> <flow (PUSH/PULL)> <rec (ZMSG/DATA)> <zmq-threads>\n");
+    if (argc != 4) {
+        printf ("usage: local_thr <bind-to> <message-size> <message-count>\n");
        return 1;
    }
-
    bind_to = argv [1];
    message_size = atoi (argv [2]);
    message_count = atoi (argv [3]);
-	sndbuflen = atoi (argv [4]);
-	rcvbuflen = atoi (argv [5]);
-    if( !strcmp( argv [6], "PUSH")){
-        flow = ZMQ_PUSH;
-    }
-    if( !strcmp( argv [6], "PULL")){
-        flow = ZMQ_PULL;
-    }
-    if( !strcmp( argv [7], "ZMSG")){
-        rec = ZMSG;
-    }
-    if( !strcmp( argv [7], "DATA")){
-        rec = DATA;
-    }
-    threads = atoi (argv [8]);

-	if( !(buf = malloc( message_size))){ perror("malloc"); return -1;}
-
-    ctx = zmq_ctx_new ();
+    ctx = zmq_init (1);
    if (!ctx) {
-        printf ("error in zmq_ctx_new: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    rc = zmq_ctx_set ( ctx, ZMQ_IO_THREADS, threads);
-    if (rc) {
-        printf ("error in zmq_ctx_set: %s\n", zmq_strerror (errno));
+        printf ("error in zmq_init: %s\n", zmq_strerror (errno));
        return -1;
    }

-    s = zmq_socket (ctx, flow);
+    s = zmq_socket (ctx, ZMQ_PULL);
    if (!s) {
        printf ("error in zmq_socket: %s\n", zmq_strerror (errno));
        return -1;
@@ -168,141 +60,60 @@ int main (int argc, char *argv [])
    //  Add your socket options here.
    //  For example ZMQ_RATE, ZMQ_RECOVERY_IVL and ZMQ_MCAST_LOOP for PGM.

-	size_t rcvbuflenlen = (size_t)sizeof rcvbuflen;
-	size_t sndbuflenlen = (size_t)sizeof sndbuflen;
-
-	rc = zmq_setsockopt (s, ZMQ_RCVBUF, &rcvbuflen, rcvbuflenlen);
-    if (rc != 0) {
-        printf ("error in zmq_setsockopt: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-	rc = zmq_setsockopt (s, ZMQ_SNDBUF, &sndbuflen, sndbuflenlen);
-    if (rc != 0) {
-        printf ("error in zmq_setsockopt: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-	sndbuflen = 1;
-	rc = zmq_setsockopt (s, ZMQ_DELAY_ATTACH_ON_CONNECT, &sndbuflen, sndbuflenlen);
-    if (rc != 0) {
-        printf ("error in zmq_setsockopt: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-	sndbuflen = 2;
-	rc = zmq_setsockopt (s, ZMQ_SNDHWM, &sndbuflen, sndbuflenlen);
-    if (rc != 0) {
-        printf ("error in zmq_setsockopt: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-	sndbuflen = 2;
-	rc = zmq_setsockopt (s, ZMQ_RCVHWM, &sndbuflen, sndbuflenlen);
-    if (rc != 0) {
-        printf ("error in zmq_setsockopt: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-
-	rc = zmq_getsockopt (s, ZMQ_RCVBUF, &rcvbuflen, &rcvbuflenlen);
-    if (rc != 0) {
-        printf ("error in zmq_getsockopt: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-	rc = zmq_getsockopt (s, ZMQ_SNDBUF, &sndbuflen, &sndbuflenlen);
-    if (rc != 0) {
-        printf ("error in zmq_getsockopt: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-	printf("RCVBUF=%d KB SNDBUF=%d KB adjusted\n", rcvbuflen/1024, sndbuflen/1024);
-
-	printf("Threads: %d\n", zmq_ctx_get( ctx, ZMQ_IO_THREADS));
-
    rc = zmq_bind (s, bind_to);
    if (rc != 0) {
        printf ("error in zmq_bind: %s\n", zmq_strerror (errno));
        return -1;
    }

-	if( !(buf = malloc( message_size))){ perror("malloc"); return -1;}
-
-	printf("%sING %s...\n", flow == ZMQ_PUSH ? "PUSH":"PULL", rec ? "ZMQ_MSG":"DATA");
-
-    tm_init( &timer);
-
-    if( flow == ZMQ_PULL){
-
-		if( rec == ZMSG){
-
-        zmq_msg_t msg;
-
    rc = zmq_msg_init (&msg);
    if (rc != 0) {
        printf ("error in zmq_msg_init: %s\n", zmq_strerror (errno));
        return -1;
    }
-        for (i = 0; i != message_count; i++) {
-            rc = zmq_msg_recv (&msg, s, 0);
+
+    rc = zmq_recvmsg (s, &msg, 0);
    if (rc < 0) {
-                printf ("error in zmq_recv: %s\n", zmq_strerror (errno));
+        printf ("error in zmq_recvmsg: %s\n", zmq_strerror (errno));
        return -1;
    }
-        }
-        rc = zmq_msg_close (&msg);
-        if (rc != 0) {
-            printf ("error in zmq_msg_close: %s\n", zmq_strerror (errno));
+    if (zmq_msg_size (&msg) != message_size) {
+        printf ("message of incorrect size received\n");
        return -1;
-        }}
+    }

-		else{
+    watch = zmq_stopwatch_start ();

-        for (i = 0; i != message_count; i++) {
-            rc = zmq_recv( s, buf, message_size, 0);
+    for (i = 0; i != message_count - 1; i++) {
+        rc = zmq_recvmsg (s, &msg, 0);
        if (rc < 0) {
-                printf ("error in zmq_recv: %s\n", zmq_strerror (errno));
+            printf ("error in zmq_recvmsg: %s\n", zmq_strerror (errno));
            return -1;
        }
-        }}
-    }
-    else{
-
-		if( rec == ZMSG){
-
-        zmq_msg_t msg;
-
-        for (i = 0; i != message_count; i++) {
-
-            rc = zmq_msg_init_data (&msg, buf, message_size, NULL, NULL);
-            if (rc != 0) {
-                printf ("error in zmq_msg_init_data: %s\n", zmq_strerror (errno));
+        if (zmq_msg_size (&msg) != message_size) {
+            printf ("message of incorrect size received\n");
            return -1;
        }
-
-            rc = zmq_msg_send( &msg, s, 0);
-            if (rc < 0) {
-                printf ("error in zmq_send: %s\n", zmq_strerror (errno));
-                return -1;
    }
-        }}

+    elapsed = zmq_stopwatch_stop (watch);
+    if (elapsed == 0)
+        elapsed = 1;

-		else{
-        for (i = 0; i != message_count; i++){
-            rc = zmq_send( s, buf, message_size, 0);
-            if (rc < 0) {
-                printf ("error in zmq_send: %s\n", zmq_strerror (errno));
+    rc = zmq_msg_close (&msg);
+    if (rc != 0) {
+        printf ("error in zmq_msg_close: %s\n", zmq_strerror (errno));
        return -1;
    }
-        }}
-    }

-    float secs = tm_secs( &timer);
-    float total = (((float) message_count) * ((float) message_size)) / (1024.0*1024.0*1024.0);
-
-    printf ("Message size: %d KBytes, time: %f secs\n", (int) message_size/1024, secs);
-    printf ("%sed %.3f GB @ %.3f GB/s\n", (flow == ZMQ_PULL) ? "Pull":"Push", total, total/secs);
+    throughput = (unsigned long)
+        ((double) message_count / (double) elapsed * 1000000);
+    megabits = (double) (throughput * message_size * 8) / 1000000;

+    printf ("message size: %d [B]\n", (int) message_size);
+    printf ("message count: %d\n", (int) message_count);
+    printf ("mean throughput: %d [msg/s]\n", (int) throughput);
+    printf ("mean throughput: %.3f [Mb/s]\n", (double) megabits);

    rc = zmq_close (s);
    if (rc != 0) {
@@ -316,7 +127,5 @@ int main (int argc, char *argv [])
        return -1;
    }

-    if( buf) free( buf);
-
    return 0;
 }
--- a/perf/remote_lat.cpp
+++ b/perf/remote_lat.cpp
 /*
-    Copyright (c) 2007-2012 iMatix Corporation
-    Copyright (c) 2009-2011 250bpm s.r.o.
-    Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file

    This file is part of 0MQ.


--- a/perf/remote_thr.cpp
+++ b/perf/remote_thr.cpp