From b0d95774000b930125f24450f9e080b9e8b63a0c Mon Sep 17 00:00:00 2001 From: Pieter Hintjens Date: Wed, 4 Apr 2012 11:50:50 +0100 Subject: [PATCH 1/4] Updated NEWS for version 2.2.0 --- NEWS | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 746306da..755e5956 100644 --- a/NEWS +++ b/NEWS @@ -1,11 +1,14 @@ -0MQ version 2.1.12 (Stable), released on 2012/xx/xx -=================================================== +0MQ version 2.2.0 (Stable), released on 2012/04/04 +================================================== + +Changes +------- + +* Fixed issue 349, add send/recv timeout socket options. Bug fixes --------- -* Fixed issue 349, add send/recv socket options - * Fixed issue 301, fix builds on HP-UX 11iv3 when using either gcc or aCC. * Fixed issue 305, memory leakage when using dynamic subscriptions. From 33af4869733de3f646daf2bafc242f813fb927f4 Mon Sep 17 00:00:00 2001 From: Pieter Hintjens Date: Wed, 4 Apr 2012 11:53:02 +0100 Subject: [PATCH 2/4] Updated ABI version to 1.1.0 --- configure.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 3973a0ec..d3f506d0 100644 --- a/configure.in +++ b/configure.in @@ -27,9 +27,10 @@ AC_SUBST(PACKAGE_VERSION) # # ZeroMQ versions prior to 2.1.0 use 0.0.0 ("unstable") # ZeroMQ version 2.1.0: 1:0:0 +# ZeroMQ version 2.2.0: 1:1:0 # # libzmq -version-info current:revision:age -LTVER="1:0:0" +LTVER="1:1:0" AC_SUBST(LTVER) # Take a copy of original flags From 87cce25bd9b31a192297bc4213f45107f5a1b796 Mon Sep 17 00:00:00 2001 From: Pieter Hintjens Date: Wed, 4 Apr 2012 11:53:58 +0100 Subject: [PATCH 3/4] Updated product version to 2.2.0 --- include/zmq.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/zmq.h b/include/zmq.h index 373a8ea8..3352b260 100644 --- a/include/zmq.h +++ b/include/zmq.h @@ -54,8 +54,8 @@ extern "C" { /* Version macros for compile-time API version detection */ #define ZMQ_VERSION_MAJOR 2 -#define ZMQ_VERSION_MINOR 1 -#define ZMQ_VERSION_PATCH 12 +#define ZMQ_VERSION_MINOR 2 +#define ZMQ_VERSION_PATCH 0 #define ZMQ_MAKE_VERSION(major, minor, patch) \ ((major) * 10000 + (minor) * 100 + (patch)) From 0b2f5cbac93b674e6282cc85222b64cf6a17950a Mon Sep 17 00:00:00 2001 From: Pieter Hintjens Date: Wed, 4 Apr 2012 12:06:28 +0100 Subject: [PATCH 4/4] Fixed man pages for release 2.2.0 * Fixed new entries for getsockopt/setsockopt SNDTIMEO and RCVTIMEO * Removed individual authorship from man page footers --- doc/zmq.txt | 3 +- doc/zmq_bind.txt | 3 +- doc/zmq_close.txt | 3 +- doc/zmq_connect.txt | 3 +- doc/zmq_cpp.txt | 3 +- doc/zmq_device.txt | 16 +--------- doc/zmq_errno.txt | 3 +- doc/zmq_getsockopt.txt | 67 +++++++++++++++++++-------------------- doc/zmq_init.txt | 3 +- doc/zmq_inproc.txt | 3 +- doc/zmq_ipc.txt | 3 +- doc/zmq_msg_close.txt | 3 +- doc/zmq_msg_copy.txt | 3 +- doc/zmq_msg_data.txt | 3 +- doc/zmq_msg_init.txt | 3 +- doc/zmq_msg_init_data.txt | 3 +- doc/zmq_msg_init_size.txt | 3 +- doc/zmq_msg_move.txt | 3 +- doc/zmq_msg_size.txt | 3 +- doc/zmq_pgm.txt | 4 +-- doc/zmq_poll.txt | 3 +- doc/zmq_recv.txt | 3 +- doc/zmq_send.txt | 3 +- doc/zmq_setsockopt.txt | 67 +++++++++++++++++++-------------------- doc/zmq_socket.txt | 3 +- doc/zmq_strerror.txt | 3 +- doc/zmq_tcp.txt | 3 +- doc/zmq_term.txt | 3 +- doc/zmq_version.txt | 4 +-- 29 files changed, 95 insertions(+), 135 deletions(-) diff --git a/doc/zmq.txt b/doc/zmq.txt index 16a5d303..1a00c565 100644 --- a/doc/zmq.txt +++ b/doc/zmq.txt @@ -200,8 +200,7 @@ of the 0MQ community and pointers can be found on the 0MQ website. AUTHORS ------- -This 0MQ manual page was written by Martin Sustrik and -Martin Lucina . +This manual page was written by the 0MQ community. RESOURCES diff --git a/doc/zmq_bind.txt b/doc/zmq_bind.txt index 1d7c2ff4..078e6191 100644 --- a/doc/zmq_bind.txt +++ b/doc/zmq_bind.txt @@ -89,5 +89,4 @@ linkzmq:zmq[7] AUTHORS ------- -This 0MQ manual page was written by Martin Sustrik and -Martin Lucina . +This manual page was written by the 0MQ community. diff --git a/doc/zmq_close.txt b/doc/zmq_close.txt index 47f9bb2e..7d727da3 100644 --- a/doc/zmq_close.txt +++ b/doc/zmq_close.txt @@ -48,5 +48,4 @@ linkzmq:zmq[7] AUTHORS ------- -This 0MQ manual page was written by Martin Sustrik and -Martin Lucina . +This manual page was written by the 0MQ community. diff --git a/doc/zmq_connect.txt b/doc/zmq_connect.txt index 6ec56b01..f260dd59 100644 --- a/doc/zmq_connect.txt +++ b/doc/zmq_connect.txt @@ -87,5 +87,4 @@ linkzmq:zmq[7] AUTHORS ------- -This 0MQ manual page was written by Martin Sustrik and -Martin Lucina . +This manual page was written by the 0MQ community. diff --git a/doc/zmq_cpp.txt b/doc/zmq_cpp.txt index cd5cdc9d..b963afab 100644 --- a/doc/zmq_cpp.txt +++ b/doc/zmq_cpp.txt @@ -208,5 +208,4 @@ linkzmq:zmq[7] AUTHORS ------- -This 0MQ manual page was written by Martin Sustrik and -Martin Lucina . +This manual page was written by the 0MQ community. diff --git a/doc/zmq_device.txt b/doc/zmq_device.txt index 93e616da..216052cd 100644 --- a/doc/zmq_device.txt +++ b/doc/zmq_device.txt @@ -121,18 +121,4 @@ linkzmq:zmq[7] AUTHORS ------- -This 0MQ manual page was written by Pieter Hintjens - - -RESOURCES ---------- -Main web site: - -Report bugs to the 0MQ development mailing list: - - -COPYING -------- -Free use of this software is granted under the terms of the GNU Lesser General -Public License (LGPL). For details see the files `COPYING` and `COPYING.LESSER` -included with the 0MQ distribution. +This manual page was written by the 0MQ community. diff --git a/doc/zmq_errno.txt b/doc/zmq_errno.txt index f9cf6cb0..a2d6334f 100644 --- a/doc/zmq_errno.txt +++ b/doc/zmq_errno.txt @@ -46,5 +46,4 @@ linkzmq:zmq[7] AUTHORS ------- -This 0MQ manual page was written by Martin Sustrik and -Martin Lucina . +This manual page was written by the 0MQ community. diff --git a/doc/zmq_getsockopt.txt b/doc/zmq_getsockopt.txt index c094fd68..b39c7840 100644 --- a/doc/zmq_getsockopt.txt +++ b/doc/zmq_getsockopt.txt @@ -79,6 +79,38 @@ Default value:: 0 Applicable socket types:: all +ZMQ_RCVTIMEO: Maximum time before a socket operation returns with EAGAIN +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Retrieve the timeout for recv operation on the socket. If the value is `0`, +_zmq_recv(3)_ will return immediately, with a EAGAIN error if there is no +message to receive. If the value is `-1`, it will block until a message is +available. For all other values, it will wait for a message for that amount +of time before returning with an EAGAIN error. + +[horizontal] +Option value type:: int +Option value unit:: milliseconds +Default value:: -1 (infinite) +Applicable socket types:: all + + +ZMQ_SNDTIMEO: Maximum time before a socket operation returns with EAGAIN +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Retrieve the timeout for send operation on the socket. If the value is `0`, +_zmq_send(3)_ will return immediately, with a EAGAIN error if the message +cannot be sent. If the value is `-1`, it will block until the message is sent. +For all other values, it will try to send the message for that amount of time +before returning with an EAGAIN error. + +[horizontal] +Option value type:: int +Option value unit:: milliseconds +Default value:: -1 (infinite) +Applicable socket types:: all + + ZMQ_SWAP: Retrieve disk offload size ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The 'ZMQ_SWAP' option shall retrieve the disk offload (swap) size for the @@ -394,38 +426,6 @@ assert (rc == 0); ---- -ZMQ_RCVTIMEO: Maximum time before a socket operation returns with EAGAIN -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Retrieve the timeout for recv operation on the socket. If the value is `0`, -_zmq_recv(3)_ will return immediately, with a EAGAIN error if there is no -message to receive. If the value is `-1`, it will block until a message is -available. For all other values, it will wait for a message for that amount -of time before returning with an EAGAIN error. - -[horizontal] -Option value type:: int -Option value unit:: milliseconds -Default value:: -1 (infinite) -Applicable socket types:: all - - -ZMQ_SNDTIMEO: Maximum time before a socket operation returns with EAGAIN -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Retrieve the timeout for send operation on the socket. If the value is `0`, -_zmq_send(3)_ will return immediately, with a EAGAIN error if the message -cannot be sent. If the value is `-1`, it will block until the message is sent. -For all other values, it will try to send the message for that amount of time -before returning with an EAGAIN error. - -[horizontal] -Option value type:: int -Option value unit:: milliseconds -Default value:: -1 (infinite) -Applicable socket types:: all - - SEE ALSO -------- linkzmq:zmq_setsockopt[3] @@ -435,5 +435,4 @@ linkzmq:zmq[7] AUTHORS ------- -This 0MQ manual page was written by Martin Sustrik and -Martin Lucina . +This manual page was written by the 0MQ community. diff --git a/doc/zmq_init.txt b/doc/zmq_init.txt index eadf65d0..606b71d0 100644 --- a/doc/zmq_init.txt +++ b/doc/zmq_init.txt @@ -47,5 +47,4 @@ linkzmq:zmq_term[3] AUTHORS ------- -This 0MQ manual page was written by Martin Sustrik and -Martin Lucina . +This manual page was written by the 0MQ community. diff --git a/doc/zmq_inproc.txt b/doc/zmq_inproc.txt index e68e14b0..128e9d5f 100644 --- a/doc/zmq_inproc.txt +++ b/doc/zmq_inproc.txt @@ -85,5 +85,4 @@ linkzmq:zmq[7] AUTHORS ------- -This 0MQ manual page was written by Martin Sustrik and -Martin Lucina . +This manual page was written by the 0MQ community. diff --git a/doc/zmq_ipc.txt b/doc/zmq_ipc.txt index 974ad244..1d4df2cd 100644 --- a/doc/zmq_ipc.txt +++ b/doc/zmq_ipc.txt @@ -76,5 +76,4 @@ linkzmq:zmq[7] AUTHORS ------- -This 0MQ manual page was written by Martin Sustrik and -Martin Lucina . +This manual page was written by the 0MQ community. diff --git a/doc/zmq_msg_close.txt b/doc/zmq_msg_close.txt index 025302b7..1150e1c3 100644 --- a/doc/zmq_msg_close.txt +++ b/doc/zmq_msg_close.txt @@ -51,5 +51,4 @@ linkzmq:zmq[7] AUTHORS ------- -This 0MQ manual page was written by Martin Sustrik and -Martin Lucina . +This manual page was written by the 0MQ community. diff --git a/doc/zmq_msg_copy.txt b/doc/zmq_msg_copy.txt index d6ce1b9c..155a6f81 100644 --- a/doc/zmq_msg_copy.txt +++ b/doc/zmq_msg_copy.txt @@ -53,5 +53,4 @@ linkzmq:zmq[7] AUTHORS ------- -This 0MQ manual page was written by Martin Sustrik and -Martin Lucina . +This manual page was written by the 0MQ community. diff --git a/doc/zmq_msg_data.txt b/doc/zmq_msg_data.txt index 36a3ce34..b82fbca8 100644 --- a/doc/zmq_msg_data.txt +++ b/doc/zmq_msg_data.txt @@ -44,5 +44,4 @@ linkzmq:zmq[7] AUTHORS ------- -This 0MQ manual page was written by Martin Sustrik and -Martin Lucina . +This manual page was written by the 0MQ community. diff --git a/doc/zmq_msg_init.txt b/doc/zmq_msg_init.txt index 1c2577d3..4bdfbe61 100644 --- a/doc/zmq_msg_init.txt +++ b/doc/zmq_msg_init.txt @@ -61,5 +61,4 @@ linkzmq:zmq[7] AUTHORS ------- -This 0MQ manual page was written by Martin Sustrik and -Martin Lucina . +This manual page was written by the 0MQ community. diff --git a/doc/zmq_msg_init_data.txt b/doc/zmq_msg_init_data.txt index 2842c101..f8b4aeb2 100644 --- a/doc/zmq_msg_init_data.txt +++ b/doc/zmq_msg_init_data.txt @@ -79,5 +79,4 @@ linkzmq:zmq[7] AUTHORS ------- -This 0MQ manual page was written by Martin Sustrik and -Martin Lucina . +This manual page was written by the 0MQ community. diff --git a/doc/zmq_msg_init_size.txt b/doc/zmq_msg_init_size.txt index 9be62635..44ef4955 100644 --- a/doc/zmq_msg_init_size.txt +++ b/doc/zmq_msg_init_size.txt @@ -54,5 +54,4 @@ linkzmq:zmq[7] AUTHORS ------- -This 0MQ manual page was written by Martin Sustrik and -Martin Lucina . +This manual page was written by the 0MQ community. diff --git a/doc/zmq_msg_move.txt b/doc/zmq_msg_move.txt index 6ab6eab1..c8b8b71f 100644 --- a/doc/zmq_msg_move.txt +++ b/doc/zmq_msg_move.txt @@ -48,5 +48,4 @@ linkzmq:zmq[7] AUTHORS ------- -This 0MQ manual page was written by Martin Sustrik and -Martin Lucina . +This manual page was written by the 0MQ community. diff --git a/doc/zmq_msg_size.txt b/doc/zmq_msg_size.txt index 354ca284..26ec840a 100644 --- a/doc/zmq_msg_size.txt +++ b/doc/zmq_msg_size.txt @@ -44,5 +44,4 @@ linkzmq:zmq[7] AUTHORS ------- -This 0MQ manual page was written by Martin Sustrik and -Martin Lucina . +This manual page was written by the 0MQ community. diff --git a/doc/zmq_pgm.txt b/doc/zmq_pgm.txt index 68ec5048..9ce14520 100644 --- a/doc/zmq_pgm.txt +++ b/doc/zmq_pgm.txt @@ -156,7 +156,7 @@ linkzmq:zmq_ipc[7] linkzmq:zmq_inproc[7] linkzmq:zmq[7] + AUTHORS ------- -This 0MQ manual page was written by Martin Sustrik and -Martin Lucina . +This manual page was written by the 0MQ community. diff --git a/doc/zmq_poll.txt b/doc/zmq_poll.txt index ee7539b1..9c0fc49b 100644 --- a/doc/zmq_poll.txt +++ b/doc/zmq_poll.txt @@ -128,5 +128,4 @@ Your operating system documentation for the _poll()_ system call. AUTHORS ------- -This 0MQ manual page was written by Martin Sustrik and -Martin Lucina . +This manual page was written by the 0MQ community. diff --git a/doc/zmq_recv.txt b/doc/zmq_recv.txt index afbcb9c1..a5ef24c6 100644 --- a/doc/zmq_recv.txt +++ b/doc/zmq_recv.txt @@ -117,5 +117,4 @@ linkzmq:zmq[7] AUTHORS ------- -This 0MQ manual page was written by Martin Sustrik and -Martin Lucina . +This manual page was written by the 0MQ community. diff --git a/doc/zmq_send.txt b/doc/zmq_send.txt index c99c1237..8bd725ae 100644 --- a/doc/zmq_send.txt +++ b/doc/zmq_send.txt @@ -116,5 +116,4 @@ linkzmq:zmq[7] AUTHORS ------- -This 0MQ manual page was written by Martin Sustrik and -Martin Lucina . +This manual page was written by the 0MQ community. diff --git a/doc/zmq_setsockopt.txt b/doc/zmq_setsockopt.txt index ff9efee1..070c9772 100644 --- a/doc/zmq_setsockopt.txt +++ b/doc/zmq_setsockopt.txt @@ -143,6 +143,38 @@ Default value:: N/A Applicable socket types:: ZMQ_SUB +ZMQ_RCVTIMEO: Maximum time before a recv operation returns with EAGAIN +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Sets the timeout for receive operation on the socket. If the value is `0`, +_zmq_recv(3)_ will return immediately, with a EAGAIN error if there is no +message to receive. If the value is `-1`, it will block until a message is +available. For all other values, it will wait for a message for that amount +of time before returning with an EAGAIN error. + +[horizontal] +Option value type:: int +Option value unit:: milliseconds +Default value:: -1 (infinite) +Applicable socket types:: all + + +ZMQ_SNDTIMEO: Maximum time before a send operation returns with EAGAIN +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Sets the timeout for send operation on the socket. If the value is `0`, +_zmq_send(3)_ will return immediately, with a EAGAIN error if the message +cannot be sent. If the value is `-1`, it will block until the message is sent. +For all other values, it will try to send the message for that amount of time +before returning with an EAGAIN error. + +[horizontal] +Option value type:: int +Option value unit:: milliseconds +Default value:: -1 (infinite) +Applicable socket types:: all + + ZMQ_RATE: Set multicast data rate ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The 'ZMQ_RATE' option shall set the maximum send or receive data rate for @@ -369,38 +401,6 @@ assert (rc); ---- -ZMQ_RCVTIMEO: Maximum time before a recv operation returns with EAGAIN -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Sets the timeout for receive operation on the socket. If the value is `0`, -_zmq_recv(3)_ will return immediately, with a EAGAIN error if there is no -message to receive. If the value is `-1`, it will block until a message is -available. For all other values, it will wait for a message for that amount -of time before returning with an EAGAIN error. - -[horizontal] -Option value type:: int -Option value unit:: milliseconds -Default value:: -1 (infinite) -Applicable socket types:: all - - -ZMQ_SNDTIMEO: Maximum time before a send operation returns with EAGAIN -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Sets the timeout for send operation on the socket. If the value is `0`, -_zmq_send(3)_ will return immediately, with a EAGAIN error if the message -cannot be sent. If the value is `-1`, it will block until the message is sent. -For all other values, it will try to send the message for that amount of time -before returning with an EAGAIN error. - -[horizontal] -Option value type:: int -Option value unit:: milliseconds -Default value:: -1 (infinite) -Applicable socket types:: all - - SEE ALSO -------- linkzmq:zmq_getsockopt[3] @@ -410,5 +410,4 @@ linkzmq:zmq[7] AUTHORS ------- -This 0MQ manual page was written by Martin Sustrik and -Martin Lucina . +This manual page was written by the 0MQ community. diff --git a/doc/zmq_socket.txt b/doc/zmq_socket.txt index ebd2151d..420fdadf 100644 --- a/doc/zmq_socket.txt +++ b/doc/zmq_socket.txt @@ -338,5 +338,4 @@ linkzmq:zmq[7] AUTHORS ------- -This 0MQ manual page was written by Martin Sustrik and -Martin Lucina . +This manual page was written by the 0MQ community. diff --git a/doc/zmq_strerror.txt b/doc/zmq_strerror.txt index 2cd98296..95623a57 100644 --- a/doc/zmq_strerror.txt +++ b/doc/zmq_strerror.txt @@ -51,5 +51,4 @@ linkzmq:zmq[7] AUTHORS ------- -This 0MQ manual page was written by Martin Sustrik and -Martin Lucina . +This manual page was written by the 0MQ community. diff --git a/doc/zmq_tcp.txt b/doc/zmq_tcp.txt index 0117ccfc..1d4a41ee 100644 --- a/doc/zmq_tcp.txt +++ b/doc/zmq_tcp.txt @@ -158,5 +158,4 @@ linkzmq:zmq[7] AUTHORS ------- -This 0MQ manual page was written by Martin Sustrik and -Martin Lucina . +This manual page was written by the 0MQ community. diff --git a/doc/zmq_term.txt b/doc/zmq_term.txt index 577de3df..09cb2015 100644 --- a/doc/zmq_term.txt +++ b/doc/zmq_term.txt @@ -61,5 +61,4 @@ linkzmq:zmq_setsockopt[3] AUTHORS ------- -This 0MQ manual page was written by Martin Sustrik and -Martin Lucina . +This manual page was written by the 0MQ community. diff --git a/doc/zmq_version.txt b/doc/zmq_version.txt index eeb0b40b..0a89c013 100644 --- a/doc/zmq_version.txt +++ b/doc/zmq_version.txt @@ -47,7 +47,7 @@ SEE ALSO -------- linkzmq:zmq[7] + AUTHORS ------- -This 0MQ manual page was written by Martin Sustrik and -Martin Lucina . +This manual page was written by the 0MQ community.