From 978e33ba253a997b41b331b449b474a5cee7bccc Mon Sep 17 00:00:00 2001 From: Martin Lucina Date: Mon, 23 Jan 2012 08:54:31 +0100 Subject: Imported Upstream version 2.1.10 --- ChangeLog | 152 +++++++++++++++++++++++++++++ NEWS | 24 +++++ aclocal.m4 | 4 +- config/ltmain.sh | 4 +- configure | 20 ++-- doc/zmq.7 | 6 +- doc/zmq.html | 158 ++++++++++++++---------------- doc/zmq_bind.3 | 6 +- doc/zmq_bind.html | 124 ++++++++++++------------ doc/zmq_close.3 | 6 +- doc/zmq_close.html | 122 ++++++++++++----------- doc/zmq_connect.3 | 6 +- doc/zmq_connect.html | 124 ++++++++++++------------ doc/zmq_cpp.7 | 6 +- doc/zmq_cpp.html | 236 +++++++++++++++++++++------------------------ doc/zmq_device.3 | 6 +- doc/zmq_device.html | 132 +++++++++++++------------ doc/zmq_epgm.7 | 6 +- doc/zmq_epgm.html | 132 ++++++++++++------------- doc/zmq_errno.3 | 6 +- doc/zmq_errno.html | 122 ++++++++++++----------- doc/zmq_getsockopt.3 | 6 +- doc/zmq_getsockopt.html | 196 ++++++++++++++++--------------------- doc/zmq_init.3 | 6 +- doc/zmq_init.html | 122 ++++++++++++----------- doc/zmq_inproc.7 | 6 +- doc/zmq_inproc.html | 130 +++++++++++++------------ doc/zmq_ipc.7 | 6 +- doc/zmq_ipc.html | 130 +++++++++++++------------ doc/zmq_msg_close.3 | 6 +- doc/zmq_msg_close.html | 122 ++++++++++++----------- doc/zmq_msg_copy.3 | 6 +- doc/zmq_msg_copy.html | 122 ++++++++++++----------- doc/zmq_msg_data.3 | 6 +- doc/zmq_msg_data.html | 122 ++++++++++++----------- doc/zmq_msg_init.3 | 6 +- doc/zmq_msg_init.html | 124 ++++++++++++------------ doc/zmq_msg_init_data.3 | 6 +- doc/zmq_msg_init_data.html | 124 ++++++++++++------------ doc/zmq_msg_init_size.3 | 6 +- doc/zmq_msg_init_size.html | 122 ++++++++++++----------- doc/zmq_msg_move.3 | 6 +- doc/zmq_msg_move.html | 122 ++++++++++++----------- doc/zmq_msg_size.3 | 6 +- doc/zmq_msg_size.html | 122 ++++++++++++----------- doc/zmq_pgm.7 | 6 +- doc/zmq_pgm.html | 132 ++++++++++++------------- doc/zmq_poll.3 | 6 +- doc/zmq_poll.html | 124 ++++++++++++------------ doc/zmq_recv.3 | 6 +- doc/zmq_recv.html | 128 ++++++++++++------------ doc/zmq_send.3 | 6 +- doc/zmq_send.html | 128 ++++++++++++------------ doc/zmq_setsockopt.3 | 6 +- doc/zmq_setsockopt.html | 188 ++++++++++++++++-------------------- doc/zmq_socket.3 | 6 +- doc/zmq_socket.html | 156 +++++++++++++----------------- doc/zmq_strerror.3 | 6 +- doc/zmq_strerror.html | 124 ++++++++++++------------ doc/zmq_tcp.7 | 6 +- doc/zmq_tcp.html | 130 +++++++++++++------------ doc/zmq_term.3 | 6 +- doc/zmq_term.html | 122 ++++++++++++----------- doc/zmq_version.3 | 6 +- doc/zmq_version.html | 124 ++++++++++++------------ include/zmq.h | 2 +- src/err.hpp | 3 + src/ip.cpp | 50 ++++++++-- src/ip.hpp | 2 + src/kqueue.cpp | 4 +- src/options.cpp | 10 +- src/req.cpp | 8 +- src/signaler.cpp | 6 +- src/socket_base.cpp | 13 +++ src/tcp_connecter.cpp | 15 +-- src/tcp_listener.cpp | 2 +- src/tcp_socket.cpp | 10 +- zeromq.spec | 2 +- 78 files changed, 2429 insertions(+), 2146 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2349d55..ee15982 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,157 @@ # Generated by Makefile. Do not edit. +commit ab64a395a01293453da606f08e0983ae8bbeb210 +Author: Pieter Hintjens +Date: Mon Oct 3 07:24:15 2011 -0500 + + Updated news for 2.1.10 release + + NEWS | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit ddc75f9e54f1fc95a057e935c51c0c22e53df6e7 +Author: Pieter Hintjens +Date: Wed Sep 28 08:37:41 2011 -0500 + + Applied workaround for issue 261 + + NEWS | 7 ++++--- + src/kqueue.cpp | 4 +++- + 2 files changed, 7 insertions(+), 4 deletions(-) + +commit 80b0041ea1685ed49c222d237b4c9c49bd495b64 +Author: Pieter Hintjens +Date: Fri Sep 16 10:33:24 2011 -0500 + + Added diagnostics for issue 254 + + src/tcp_socket.cpp | 10 ++++++++-- + 1 files changed, 8 insertions(+), 2 deletions(-) + +commit 4fc2b0fee7cd98ef4d1b69ce079539773bb5b76b +Author: Pieter Hintjens +Date: Fri Sep 16 10:33:10 2011 -0500 + + Whitespace fixes + + src/tcp_connecter.cpp | 9 +++++---- + 1 files changed, 5 insertions(+), 4 deletions(-) + +commit e7f29bfccb915d129bc55b9ff1b48b1a7c2e6661 +Author: Pieter Hintjens +Date: Tue Sep 13 10:15:31 2011 -0500 + + Fixed issue 252 + + NEWS | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +commit fffd7701a5bece99767b6e10e2cafbe7670c5f2f +Author: Pieter Hintjens +Date: Tue Sep 13 10:13:52 2011 -0500 + + Fixed issue 252 + + src/req.cpp | 8 ++++++-- + 1 files changed, 6 insertions(+), 2 deletions(-) + +commit 3e1aa20233c8bc4d29fecf9e74f6ee6857cdca44 +Author: Pieter Hintjens +Date: Tue Sep 6 08:02:27 2011 -0500 + + Fixed issue 250 + + NEWS | 2 ++ + src/ip.cpp | 1 + + 2 files changed, 3 insertions(+), 0 deletions(-) + +commit 930c3ef246a5f2a58a614778a9512d61d222de16 +Author: Pieter Hintjens +Date: Sun Sep 4 10:58:07 2011 +0200 + + Fixed windows build + + src/err.hpp | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +commit afb68fd07be76bd037761d7b54416f7d29255866 +Author: Pieter Hintjens +Date: Fri Sep 2 16:09:50 2011 +0200 + + Updated NEWS for issue 218 + + Signed-off-by: Pieter Hintjens + + NEWS | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +commit 3d91c037657c74c79dfa49f1781eb633bf31de98 +Author: Pieter Hintjens +Date: Fri Sep 2 16:08:46 2011 +0200 + + Fixed issue 218 + + Signed-off-by: Pieter Hintjens + + src/ip.cpp | 49 +++++++++++++++++++++++++++++++++++++++---------- + src/ip.hpp | 2 ++ + src/signaler.cpp | 6 +++--- + src/tcp_connecter.cpp | 6 +++--- + src/tcp_listener.cpp | 2 +- + 5 files changed, 48 insertions(+), 17 deletions(-) + +commit 9fcbf166da89f73b010950b264f4573b25804e5e +Author: Pieter Hintjens +Date: Fri Sep 2 11:53:25 2011 +0200 + + Updated NEWS for issue 140 fix + + NEWS | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +commit 6c07e8d94453fbabe818a639c8d6021aa95f14c4 +Author: Pieter Hintjens +Date: Fri Sep 2 11:51:11 2011 +0200 + + Fixed issue 140 + + src/options.cpp | 10 +++++++++- + 1 files changed, 9 insertions(+), 1 deletions(-) + +commit 66d69d7d6393d6d097c9a89e20c061e61167a091 +Author: Pieter Hintjens +Date: Tue Aug 30 14:09:30 2011 +0200 + + Updated for issue 207 + + NEWS | 11 +++++++++++ + 1 files changed, 11 insertions(+), 0 deletions(-) + +commit a41271a0c1840729f4a439b0bd240ca78af04f02 +Merge: c514fb9 81602d4 +Author: Pieter Hintjens +Date: Tue Aug 30 13:52:49 2011 +0200 + + Merge branch 'issue-207' + +commit 81602d41aae0cbc284e3d13d7bd7b30357dd8083 +Author: Pieter Hintjens +Date: Tue Aug 30 13:52:42 2011 +0200 + + Fixed issue 207 + + src/socket_base.cpp | 13 +++++++++++++ + 1 files changed, 13 insertions(+), 0 deletions(-) + +commit c514fb93902fc8f9423d888b5d70bde87b357cd8 +Author: Pieter Hintjens +Date: Tue Aug 30 13:11:12 2011 +0200 + + Updated for 2.1.9 + + include/zmq.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + commit 392c3771c22d0dfe793cc9c4ee5c27d18d38d428 Author: Pieter Hintjens Date: Mon Aug 29 20:25:11 2011 +0200 diff --git a/NEWS b/NEWS index 9f7a789..fa237fc 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,27 @@ +0MQ version 2.1.10 (Stable), released on 2011/10/03 +=================================================== + +Bug fixes +--------- + +* Fixed issue 140, SWAP failed with assertion failure in pipe.cpp:187 + if the current directory was not writeable. Behavior now is to return + -1 at zmq_setsockopt in this situation. + +* Fixed issue 207, assertion failure in zmq_connecter.cpp:48, when an + invalid zmq_connect() string was used, or the hostname could not be + resolved. The zmq_connect() call now returns -1 in both those cases. + +* Fixed issue 218, sockets not opened with SOCK_CLOEXEC, causing fork/exec + to sit on sockets unnecessarily. + +* Fixed issue 250, build errors on Windows. + +* Fixed issue 252, assertion failure in req.cpp:87 and req.cpp:88. + +* Fixed issue 261, assertion failure in kqueue.cpp:76 on OS/X. + + 0MQ version 2.1.9 (Stable), released on 2011/08/29 ================================================== diff --git a/aclocal.m4 b/aclocal.m4 index f9e8889..bd741d2 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -156,7 +156,7 @@ $$1_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT])[]dnl +_PKG_TEXT])dnl ]) elif test $pkg_failed = untried; then AC_MSG_RESULT([no]) @@ -167,7 +167,7 @@ path to pkg-config. _PKG_TEXT -To get pkg-config, see .])[]dnl +To get pkg-config, see .])dnl ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS diff --git a/config/ltmain.sh b/config/ltmain.sh index fa4b1e1..7ed280b 100755 --- a/config/ltmain.sh +++ b/config/ltmain.sh @@ -65,7 +65,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu3 +# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1 # automake: $automake_version # autoconf: $autoconf_version # @@ -73,7 +73,7 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION="2.2.6b Debian-2.2.6b-2ubuntu3" +VERSION="2.2.6b Debian-2.2.6b-2ubuntu1" TIMESTAMP="" package_revision=1.3017 diff --git a/configure b/configure index edd17fa..3f7448a 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for zeromq 2.1.9. +# Generated by GNU Autoconf 2.67 for zeromq 2.1.10. # # Report bugs to . # @@ -701,8 +701,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='zeromq' PACKAGE_TARNAME='zeromq' -PACKAGE_VERSION='2.1.9' -PACKAGE_STRING='zeromq 2.1.9' +PACKAGE_VERSION='2.1.10' +PACKAGE_STRING='zeromq 2.1.10' PACKAGE_BUGREPORT='zeromq-dev@lists.zeromq.org' PACKAGE_URL='' @@ -1467,7 +1467,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures zeromq 2.1.9 to adapt to many kinds of systems. +\`configure' configures zeromq 2.1.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1537,7 +1537,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of zeromq 2.1.9:";; + short | recursive ) echo "Configuration of zeromq 2.1.10:";; esac cat <<\_ACEOF @@ -1659,7 +1659,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -zeromq configure 2.1.9 +zeromq configure 2.1.10 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2414,7 +2414,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by zeromq $as_me 2.1.9, which was +It was created by zeromq $as_me 2.1.10, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -3233,7 +3233,7 @@ fi # Define the identity of the package. PACKAGE='zeromq' - VERSION='2.1.9' + VERSION='2.1.10' cat >>confdefs.h <<_ACEOF @@ -19413,7 +19413,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by zeromq $as_me 2.1.9, which was +This file was extended by zeromq $as_me 2.1.10, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19479,7 +19479,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -zeromq config.status 2.1.9 +zeromq config.status 2.1.10 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff --git a/doc/zmq.7 b/doc/zmq.7 index 07ec236..b774c13 100644 --- a/doc/zmq.7 +++ b/doc/zmq.7 @@ -2,12 +2,12 @@ .\" Title: zmq .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 08/29/2011 +.\" Date: 07/01/2011 .\" Manual: 0MQ Manual -.\" Source: 0MQ 2.1.9 +.\" Source: 0MQ 2.1.8 .\" Language: English .\" -.TH "ZMQ" "7" "08/29/2011" "0MQ 2\&.1\&.9" "0MQ Manual" +.TH "ZMQ" "7" "07/01/2011" "0MQ 2\&.1\&.8" "0MQ Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/zmq.html b/doc/zmq.html index bce168f..e44f8a1 100644 --- a/doc/zmq.html +++ b/doc/zmq.html @@ -2,28 +2,15 @@ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - - + + zmq(7) - +
-

SYNOPSIS

#include <zmq.h>

cc [flags] files -lzmq [libraries]

-
-

DESCRIPTION

The ØMQ lightweight messaging kernel is a library which extends the standard @@ -579,8 +596,7 @@ and more.

This documentation presents an overview of ØMQ concepts, describes how ØMQ abstracts standard sockets and provides a reference manual for the functions provided by the ØMQ library.

-
-

Context

+

Context

Before using any ØMQ library functions the caller must initialise a ØMQ context using zmq_init(). The following functions are provided to handle initialisation and termination of a context:

@@ -602,7 +618,6 @@ Terminate ØMQ context

-

Thread safety

A ØMQ context is thread safe and may be shared among as many application threads as necessary, without any additional locking required on the part of @@ -613,17 +628,12 @@ In practice this means applications can create a socket in one thread with zmq_socket() and then pass it to a newly created thread as part of thread initialization, for example via a structure passed as an argument to pthread_create().

-
-

Multiple contexts

Multiple contexts may coexist within a single application. Thus, an application can use ØMQ directly and at the same time make use of any number of additional libraries or components which themselves make use of ØMQ as long as the above guidelines regarding thread safety are adhered to.

-
-
-
-

Messages

+

Messages

A ØMQ message is a discrete unit of data passed between applications or components of the same application. ØMQ messages have no internal structure and from the point of view of ØMQ itself they are considered to be opaque binary @@ -667,9 +677,7 @@ Message manipulation

-
-
-

Sockets

+

Sockets

ØMQ sockets present an abstraction of a asynchronous message queue, with the exact queueing semantics depending on the socket type in use. See zmq_socket(3) for the socket types provided.

@@ -723,9 +731,7 @@ Sending and receiving messages a set containing both ØMQ sockets and standard sockets. This mechanism mirrors the standard poll() system call, and is described in detail in zmq_poll(3).

-
-
-

Transports

+

Transports

A ØMQ socket can use multiple different underlying transport mechanisms. Each transport mechanism is suited to a particular purpose and has its own advantages and drawbacks.

@@ -764,18 +770,13 @@ Local in-process (inter-thread) communication transport

-
-
-

Devices

+

Devices

ØMQ provides devices, which are building blocks that act as intermediate nodes in complex messaging topologies. Devices can act as brokers that other nodes connect to, proxies that connect through to other nodes, or any mix of these two models.

You can start a device in an application thread, see zmq_device(3).

- - -

ERROR HANDLING

The ØMQ library functions handle errors using the standard conventions found on @@ -789,8 +790,6 @@ to assist in these cases; for details refer to zmq_errn

The zmq_strerror() function is provided to translate ØMQ-specific error codes into error message strings; for details refer to zmq_strerror(3).

-
-

MISCELLANEOUS

The following miscellaneous functions are provided:

@@ -805,8 +804,6 @@ Report ØMQ library version
-
-

LANGUAGE BINDINGS

The ØMQ library provides interfaces suitable for calling from programs in any @@ -814,33 +811,23 @@ language; this documentation documents those interfaces as they would be used by C programmers. The intent is that programmers using ØMQ from other languages shall refer to this documentation alongside any documentation provided by the vendor of their language binding.

-
-

C++ language binding

+

C++ language binding

The ØMQ distribution includes a C++ language binding, which is documented separately in zmq_cpp(7).

-
-
-

Other language bindings

+

Other language bindings

Other language bindings (Python, Ruby, Java and more) are provided by members of the ØMQ community and pointers can be found on the ØMQ website.

-
-
-

AUTHORS

This ØMQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and Martin Lucina <mato@kotelna.sk>.

-
-

RESOURCES

Main web site: http://www.zeromq.org/

Report bugs to the ØMQ development mailing list: <zeromq-dev@lists.zeromq.org>

-
-

COPYING

Free use of this software is granted under the terms of the GNU Lesser General @@ -848,12 +835,11 @@ Public License (LGPL). For details see the files COPYING and COPYIN included with the ØMQ distribution.

-
diff --git a/doc/zmq_bind.3 b/doc/zmq_bind.3 index 997f7a0..addb501 100644 --- a/doc/zmq_bind.3 +++ b/doc/zmq_bind.3 @@ -2,12 +2,12 @@ .\" Title: zmq_bind .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 08/29/2011 +.\" Date: 09/08/2011 .\" Manual: 0MQ Manual -.\" Source: 0MQ 2.1.9 +.\" Source: 0MQ 2.1.10 .\" Language: English .\" -.TH "ZMQ_BIND" "3" "08/29/2011" "0MQ 2\&.1\&.9" "0MQ Manual" +.TH "ZMQ_BIND" "3" "09/08/2011" "0MQ 2\&.1\&.10" "0MQ Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/zmq_bind.html b/doc/zmq_bind.html index ef04708..e3b1da2 100644 --- a/doc/zmq_bind.html +++ b/doc/zmq_bind.html @@ -2,28 +2,15 @@ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - - + + zmq_bind(3) - +
-

SYNOPSIS

int zmq_bind (void *socket, const char *endpoint);

-
-

DESCRIPTION

The zmq_bind() function shall create an endpoint for accepting connections @@ -616,15 +633,11 @@ incoming connections from multiple endpoints bound to the socket using zmq_bind(). Refer to zmq_socket(3) for a description of the exact semantics involved when connecting or binding a socket to multiple endpoints.

-
-

RETURN VALUE

The zmq_bind() function shall return zero if successful. Otherwise it shall return -1 and set errno to one of the values defined below.

-
-

ERRORS

@@ -702,8 +715,6 @@ No I/O thread is available to accomplish the task.
-
-

EXAMPLE

@@ -720,28 +731,23 @@ rc = zmq_bind (socket, "tcp://eth0:5555"); assert (rc == 0);
-
-

SEE ALSO

zmq_connect(3) zmq_socket(3) zmq(7)

-
-

AUTHORS

This ØMQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and Martin Lucina <mato@kotelna.sk>.

-
diff --git a/doc/zmq_close.3 b/doc/zmq_close.3 index 82a3cc8..33c7368 100644 --- a/doc/zmq_close.3 +++ b/doc/zmq_close.3 @@ -2,12 +2,12 @@ .\" Title: zmq_close .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 08/29/2011 +.\" Date: 09/08/2011 .\" Manual: 0MQ Manual -.\" Source: 0MQ 2.1.9 +.\" Source: 0MQ 2.1.10 .\" Language: English .\" -.TH "ZMQ_CLOSE" "3" "08/29/2011" "0MQ 2\&.1\&.9" "0MQ Manual" +.TH "ZMQ_CLOSE" "3" "09/08/2011" "0MQ 2\&.1\&.10" "0MQ Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/zmq_close.html b/doc/zmq_close.html index bca12dc..f30c3a3 100644 --- a/doc/zmq_close.html +++ b/doc/zmq_close.html @@ -2,28 +2,15 @@ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - - + + zmq_close(3) - +
-

SYNOPSIS

int zmq_close (void *socket);

-
-

DESCRIPTION

The zmq_close() function shall destroy the socket referenced by the socket @@ -586,15 +603,11 @@ For details refer to zmq_setsockopt(3) and

-
-

RETURN VALUE

The zmq_close() function shall return zero if successful. Otherwise it shall return -1 and set errno to one of the values defined below.

-
-

ERRORS

@@ -608,8 +621,6 @@ The provided socket was invalid.
-
-

SEE ALSO

zmq_socket(3) @@ -617,20 +628,17 @@ The provided socket was invalid. zmq_setsockopt(3) zmq(7)

-
-

AUTHORS

This ØMQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and Martin Lucina <mato@kotelna.sk>.

-
diff --git a/doc/zmq_connect.3 b/doc/zmq_connect.3 index 4f50086..e16874e 100644 --- a/doc/zmq_connect.3 +++ b/doc/zmq_connect.3 @@ -2,12 +2,12 @@ .\" Title: zmq_connect .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 08/29/2011 +.\" Date: 09/08/2011 .\" Manual: 0MQ Manual -.\" Source: 0MQ 2.1.9 +.\" Source: 0MQ 2.1.10 .\" Language: English .\" -.TH "ZMQ_CONNECT" "3" "08/29/2011" "0MQ 2\&.1\&.9" "0MQ Manual" +.TH "ZMQ_CONNECT" "3" "09/08/2011" "0MQ 2\&.1\&.10" "0MQ Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/zmq_connect.html b/doc/zmq_connect.html index 52c0ad3..b6353b6 100644 --- a/doc/zmq_connect.html +++ b/doc/zmq_connect.html @@ -2,28 +2,15 @@ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - - + + zmq_connect(3) - +
-

SYNOPSIS

int zmq_connect (void *socket, const char *endpoint);

-
-

DESCRIPTION

The zmq_connect() function shall connect the socket referenced by the @@ -626,15 +643,11 @@ physical connection was or can actually be established.

-
-

RETURN VALUE

The zmq_connect() function shall return zero if successful. Otherwise it shall return -1 and set errno to one of the values defined below.

-
-

ERRORS

@@ -688,8 +701,6 @@ No I/O thread is available to accomplish the task.
-
-

EXAMPLE

@@ -706,28 +717,23 @@ rc = zmq_connect (socket, "tcp://server001:5555"); assert (rc == 0);
-
-

SEE ALSO

zmq_bind(3) zmq_socket(3) zmq(7)

-
-

AUTHORS

This ØMQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and Martin Lucina <mato@kotelna.sk>.

-
diff --git a/doc/zmq_cpp.7 b/doc/zmq_cpp.7 index 72c2f97..f96dd35 100644 --- a/doc/zmq_cpp.7 +++ b/doc/zmq_cpp.7 @@ -2,12 +2,12 @@ .\" Title: zmq_cpp .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 08/29/2011 +.\" Date: 07/01/2011 .\" Manual: 0MQ Manual -.\" Source: 0MQ 2.1.9 +.\" Source: 0MQ 2.1.8 .\" Language: English .\" -.TH "ZMQ_CPP" "7" "08/29/2011" "0MQ 2\&.1\&.9" "0MQ Manual" +.TH "ZMQ_CPP" "7" "07/01/2011" "0MQ 2\&.1\&.8" "0MQ Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/zmq_cpp.html b/doc/zmq_cpp.html index 6b31c9f..c59c01d 100644 --- a/doc/zmq_cpp.html +++ b/doc/zmq_cpp.html @@ -2,28 +2,15 @@ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - - + + zmq_cpp(7) - +
-

SYNOPSIS

#include <zmq.hpp>

c++ [flags] files -lzmq [libraries]

-
-

DESCRIPTION

This manual page describes how the ØMQ C++ language binding maps to the @@ -575,151 +592,126 @@ underlying ØMQ C library functions.

All ØMQ constants defined by zmq.h are also available to the C++ language binding.

The following classes are provided in the zmq namespace:

-
-

Context

+

Context

The context_t class encapsulates functionality dealing with the initialisation and termination of a ØMQ context.

-

Constructor

-
context_t::context_t(int io_threads)
-
+
context_t::context_t(int io_threads)
+

Maps to the zmq_init() function, as described in zmq_init(3).

-
-

Destructor

-
context_t::~context_t(void)
-
+
context_t::~context_t(void)
+

Maps to the zmq_term() function, as described in zmq_term(3).

-
-

Methods

None.

-
-
-
-

Socket

+

Socket

The socket_t class encapsulates a ØMQ socket.

-

Constructor

-
socket_t::socket_t(context_t &context, int type)
-
+
socket_t::socket_t(context_t &context, int type)
+

Maps to the zmq_socket() function, as described in zmq_socket(3).

-
-

Destructor

-
socket_t::~socket_t(void)
-
+
socket_t::~socket_t(void)
+

Calls the zmq_close() function, as described in zmq_close(3).

-
-

Methods

-
void socket_t::getsockopt(int option_name, void *option_value, size_t
-*option_len)
-
+
void socket_t::getsockopt(int option_name, void *option_value, size_t +*option_len)
+

Maps to the zmq_getsockopt() function, as described in zmq_getsockopt(3).

-
void socket_t::setsockopt(int option_name, const void *option_value, size_t
-option_len)
-
+
void socket_t::setsockopt(int option_name, const void *option_value, size_t +option_len)
+

Maps to the zmq_setsockopt() function, as described in zmq_setsockopt(3).

-
void socket_t::bind(const char *endpoint)
-
+
void socket_t::bind(const char *endpoint)
+

Maps to the zmq_bind() function, as described in zmq_bind(3).

-
void socket_t::connect(const char *endpoint)
-
+
void socket_t::connect(const char *endpoint)
+

Maps to the zmq_connect() function, as described in zmq_connect(3).

-
bool socket_t::send(message_t &msg, int flags = 0)
-
+
bool socket_t::send(message_t &msg, int flags = 0)
+

Maps to the zmq_send() function, as described in zmq_send(3). Returns true if message is successfully sent, false if it is not.

-
bool socket_t::recv(message_t *msg, int flags = 0)
-
+
bool socket_t::recv(message_t *msg, int flags = 0)
+

Maps to the zmq_recv() function, as described in zmq_recv(3). Returns true if message is successfully received, false if it is not.

-
-
-
-

Message

+

Message

The zmq::message_t class encapsulates the zmq_msg_t structure and functions to construct, destruct and manipulate ØMQ messages.

-

Constructor

-
message_t::message_t(void)
+
message_t::message_t(void)
 message_t::message_t(size_t size)
-message_t::message_t(void *data, size_t size, free_fn *ffn)
-
+message_t::message_t(void *data, size_t size, free_fn *ffn)
+

These map to the zmq_msg_init(), zmq_msg_init_size() and zmq_msg_init_data() functions, described in zmq_msg_init(3), zmq_msg_init_size(3) and zmq_msg_init_data(3) respectively.

-
-

Destructor

-
message_t::~message_t(void)
-
+
message_t::~message_t(void)
+

Calls the zmq_msg_close() function, as described in zmq_msg_close(3).

-
-

Methods

-
void *message_t::data (void)
-
+
void *message_t::data (void)
+

Maps to the zmq_msg_data() function, as described in zmq_msg_data(3).

-
size_t message_t::size (void)
-
+
size_t message_t::size (void)
+

Maps to the zmq_msg_size() function, as described in zmq_msg_size(3).

-
void message_t::copy (message_t *src)
-
+
void message_t::copy (message_t *src)
+

Maps to the zmq_msg_copy() function, as described in zmq_msg_copy(3).

-
void message_t::move (message_t *src)
-
+
void message_t::move (message_t *src)
+

Maps to the zmq_msg_move() function, as described in zmq_msg_move(3).

-
message_t::rebuild(void)
+
message_t::rebuild(void)
 message_t::rebuild(size_t size)
-message_t::rebuild(void *data, size_t size, free_fn *ffn)
-
+message_t::rebuild(void *data, size_t size, free_fn *ffn)
+

Equivalent to calling the zmq_msg_close() function followed by the corresponding zmq_msg_init() function.

-
-
-
-

Input/output multiplexing

+

Input/output multiplexing

-
int poll (zmq_pollitem_t *items, int nitems, long timeout = -1)
-
+
int poll (zmq_pollitem_t *items, int nitems, long timeout = -1)
+

The poll() function is a namespaced equivalent of the zmq_poll() function, as described in zmq_poll(3).

@@ -733,9 +725,6 @@ should cast an instance of the socket_t class to (void *).
-
-
-

ERROR HANDLING

All errors reported by the underlying ØMQ C library functions are automatically @@ -743,8 +732,6 @@ converted to exceptions by the C++ language binding. The zmq::error_t is derived from the std::exception class and uses the zmq_strerror() function to convert the error code to human-readable string.

-
-

EXAMPLE

@@ -757,26 +744,21 @@ memset (msg.data (), 0, 100); s.send (msg);
-
-

SEE ALSO

zmq(7)

-
-

AUTHORS

This ØMQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and Martin Lucina <mato@kotelna.sk>.

-
diff --git a/doc/zmq_device.3 b/doc/zmq_device.3 index 7888546..42a262a 100644 --- a/doc/zmq_device.3 +++ b/doc/zmq_device.3 @@ -2,12 +2,12 @@ .\" Title: zmq_device .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 08/29/2011 +.\" Date: 07/01/2011 .\" Manual: 0MQ Manual -.\" Source: 0MQ 2.1.9 +.\" Source: 0MQ 2.1.8 .\" Language: English .\" -.TH "ZMQ_DEVICE" "3" "08/29/2011" "0MQ 2\&.1\&.9" "0MQ Manual" +.TH "ZMQ_DEVICE" "3" "07/01/2011" "0MQ 2\&.1\&.8" "0MQ Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/zmq_device.html b/doc/zmq_device.html index f5ea972..06ce951 100644 --- a/doc/zmq_device.html +++ b/doc/zmq_device.html @@ -2,28 +2,15 @@ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - - + + zmq_device(3) - +
-

SYNOPSIS

int zmq_device (int device, const void *frontend, const void *backend);

-
-

DESCRIPTION

The zmq_device() function starts a built-in ØMQ device. The device argument @@ -629,8 +646,6 @@ bind both frontend and backend sockets. The two conventional device models are:<

zmq_device() runs in the current thread and returns only if/when the current context is closed.

-
-

QUEUE DEVICE

ZMQ_QUEUE creates a shared queue that collects requests from a set of clients, @@ -643,8 +658,6 @@ clients and the backend speaks to services. You should use ZMQ_QUEUE wi Other combinations are not documented.

Refer to zmq_socket(3) for a description of these socket types.

-
-

FORWARDER DEVICE

ZMQ_FORWARDER collects messages from a set of publishers and forwards these to @@ -656,8 +669,6 @@ publishers and the backend speaks to subscribers. You should use for the backend. Other combinations are not documented.

Refer to zmq_socket(3) for a description of these socket types.

-
-

STREAMER DEVICE

ZMQ_STREAMER collects tasks from a set of pushers and forwards these to a set @@ -669,15 +680,11 @@ and the backend speaks to pullers. You should use ZMQ_STREAMER with a Other combinations are not documented.

Refer to zmq_socket(3) for a description of these socket types.

-
-

RETURN VALUE

The zmq_device() function always returns -1 and errno set to ETERM (the ØMQ context associated with either of the specified sockets was terminated).

-
-

EXAMPLE

@@ -695,8 +702,6 @@ assert (zmq_bind (backend, "tcp://*:5556") == 0); zmq_device (ZMQ_QUEUE, frontend, backend);
-
-

SEE ALSO

zmq_bind(3) @@ -704,21 +709,15 @@ zmq_device (ZMQ_QUEUE, frontend, backend); zmq_socket(3) zmq(7)

-
-

AUTHORS

This ØMQ manual page was written by Pieter Hintjens <ph@imatix.com>

-
-

RESOURCES

Main web site: http://www.zeromq.org/

Report bugs to the ØMQ development mailing list: <zeromq-dev@lists.zeromq.org>

-
-

COPYING

Free use of this software is granted under the terms of the GNU Lesser General @@ -726,12 +725,11 @@ Public License (LGPL). For details see the files COPYING and COPYIN included with the ØMQ distribution.

-
diff --git a/doc/zmq_epgm.7 b/doc/zmq_epgm.7 index 66250f5..60e8fa4 100644 --- a/doc/zmq_epgm.7 +++ b/doc/zmq_epgm.7 @@ -2,12 +2,12 @@ .\" Title: zmq_pgm .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 08/29/2011 +.\" Date: 09/08/2011 .\" Manual: 0MQ Manual -.\" Source: 0MQ 2.1.9 +.\" Source: 0MQ 2.1.10 .\" Language: English .\" -.TH "ZMQ_PGM" "7" "08/29/2011" "0MQ 2\&.1\&.9" "0MQ Manual" +.TH "ZMQ_PGM" "7" "09/08/2011" "0MQ 2\&.1\&.10" "0MQ Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/zmq_epgm.html b/doc/zmq_epgm.html index 64e3e75..5dfc00d 100644 --- a/doc/zmq_epgm.html +++ b/doc/zmq_epgm.html @@ -2,28 +2,15 @@ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - - + + zmq_pgm(7) - +
-

SYNOPSIS

PGM (Pragmatic General Multicast) is a protocol for reliable multicast transport of data over IP networks.

-
-

DESCRIPTION

ØMQ implements two variants of PGM, the standard protocol where PGM datagrams @@ -593,8 +610,6 @@ not require any special privileges.

-
-

ADDRESSING

A ØMQ address string consists of two parts as follows: @@ -603,8 +618,7 @@ transport protocol to use. For the standard PGM protocol, transport sha set to pgm. For the "Encapsulated PGM" protocol transport shall be set to epgm. The meaning of the endpoint part for both the pgm and epgm transport is defined below.

-
-

Connecting a socket

+

Connecting a socket

When connecting a socket to a peer address using zmq_connect() with the pgm or epgm transport, the endpoint shall be interpreted as an interface followed by a semicolon, followed by a multicast address, followed by a colon @@ -637,9 +651,6 @@ names exist, thus only the primary IPv4 address may be used to specify an

A multicast address is specified by an IPv4 multicast address in its numeric representation.

-
-
-

WIRE FORMAT

Consecutive PGM datagrams are interpreted by ØMQ as a single continuous stream @@ -647,8 +658,7 @@ of data where ØMQ messages are not necessarily aligned with PGM datagram boundaries and a single ØMQ message may span several PGM datagrams. This stream of data consists of ØMQ messages encapsulated in frames as described in zmq_tcp(7).

-
-

PGM datagram payload

+

PGM datagram payload

The following ABNF grammar represents the payload of a single PGM datagram as used by ØMQ:

@@ -696,9 +706,6 @@ Third datagram payload +--------------+----------------------------+-------------+
-
-
-

EXAMPLE

@@ -716,8 +723,6 @@ rc = zmq_connect(socket, "pgm://192.168.1.1;239.192.1.1:5555"); assert (rc == 0);
-
-

SEE ALSO

zmq_connect(3) @@ -727,20 +732,17 @@ assert (rc == 0); zmq_inproc(7) zmq(7)

-
-

AUTHORS

This ØMQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and Martin Lucina <mato@kotelna.sk>.

-
diff --git a/doc/zmq_errno.3 b/doc/zmq_errno.3 index fd3694c..24cff1b 100644 --- a/doc/zmq_errno.3 +++ b/doc/zmq_errno.3 @@ -2,12 +2,12 @@ .\" Title: zmq_errno .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 08/29/2011 +.\" Date: 07/01/2011 .\" Manual: 0MQ Manual -.\" Source: 0MQ 2.1.9 +.\" Source: 0MQ 2.1.8 .\" Language: English .\" -.TH "ZMQ_ERRNO" "3" "08/29/2011" "0MQ 2\&.1\&.9" "0MQ Manual" +.TH "ZMQ_ERRNO" "3" "07/01/2011" "0MQ 2\&.1\&.8" "0MQ Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/zmq_errno.html b/doc/zmq_errno.html index ee4d04b..0a98725 100644 --- a/doc/zmq_errno.html +++ b/doc/zmq_errno.html @@ -2,28 +2,15 @@ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - - + + zmq_errno(3) - +
-

SYNOPSIS

int zmq_errno (void);

-
-

DESCRIPTION

The zmq_errno() function shall retrieve the value of the errno variable for @@ -587,39 +604,30 @@ variable directly.

-
-

RETURN VALUE

The zmq_errno() function shall return the value of the errno variable for the calling thread.

-
-

ERRORS

No errors are defined.

-
-

SEE ALSO

zmq(7)

-
-

AUTHORS

This ØMQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and Martin Lucina <mato@kotelna.sk>.

-
diff --git a/doc/zmq_getsockopt.3 b/doc/zmq_getsockopt.3 index c11b5f0..2b699ea 100644 --- a/doc/zmq_getsockopt.3 +++ b/doc/zmq_getsockopt.3 @@ -2,12 +2,12 @@ .\" Title: zmq_getsockopt .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 08/29/2011 +.\" Date: 09/08/2011 .\" Manual: 0MQ Manual -.\" Source: 0MQ 2.1.9 +.\" Source: 0MQ 2.1.10 .\" Language: English .\" -.TH "ZMQ_GETSOCKOPT" "3" "08/29/2011" "0MQ 2\&.1\&.9" "0MQ Manual" +.TH "ZMQ_GETSOCKOPT" "3" "09/08/2011" "0MQ 2\&.1\&.10" "0MQ Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/zmq_getsockopt.html b/doc/zmq_getsockopt.html index e77e2e1..18c64b1 100644 --- a/doc/zmq_getsockopt.html +++ b/doc/zmq_getsockopt.html @@ -2,28 +2,15 @@ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - - + + zmq_getsockopt(3) - +
-

SYNOPSIS

int zmq_getsockopt (void *socket, int option_name, void *option_value, size_t *option_len);

-
-

DESCRIPTION

The zmq_getsockopt() function shall retrieve the value for the option @@ -577,8 +594,7 @@ to by option_value; upon successful completion zmq_getsockopt()option_len argument to indicate the actual size of the option value stored in the buffer.

The following options can be retrieved with the zmq_getsockopt() function:

-
-

ZMQ_TYPE: Retrieve socket type

+

ZMQ_TYPE: Retrieve socket type

The ZMQ_TYPE option shall retrieve the socket type for the specified socket. The socket type is specified at socket creation time and cannot be modified afterwards.

@@ -628,9 +644,7 @@ all
-
-
-

ZMQ_RCVMORE: More message parts to follow

+

ZMQ_RCVMORE: More message parts to follow

The ZMQ_RCVMORE option shall return a boolean value indicating if the multi-part message currently being read from the specified socket has more message parts to follow. If there are no message parts to follow or if the @@ -684,9 +698,7 @@ all

-
-
-

ZMQ_HWM: Retrieve high water mark

+

ZMQ_HWM: Retrieve high water mark

The ZMQ_HWM option shall retrieve the high water mark for the specified socket. The high water mark is a hard limit on the maximum number of outstanding messages ØMQ shall queue in memory for any single peer that the @@ -743,9 +755,7 @@ all

-
-
-

ZMQ_SWAP: Retrieve disk offload size

+

ZMQ_SWAP: Retrieve disk offload size

The ZMQ_SWAP option shall retrieve the disk offload (swap) size for the specified socket. A socket which has ZMQ_SWAP set to a non-zero value may exceed its high water mark; in this case outstanding messages shall be @@ -797,9 +807,7 @@ all

-
-
-

ZMQ_AFFINITY: Retrieve I/O thread affinity

+

ZMQ_AFFINITY: Retrieve I/O thread affinity

The ZMQ_AFFINITY option shall retrieve the I/O thread affinity for newly created connections on the specified socket.

Affinity determines which threads from the ØMQ I/O thread pool associated with @@ -857,9 +865,7 @@ N/A

-
-
-

ZMQ_IDENTITY: Retrieve socket identity

+

ZMQ_IDENTITY: Retrieve socket identity

The ZMQ_IDENTITY option shall retrieve the identity of the specified socket. Socket identity determines if existing ØMQ infrastructure (message queues, forwarding devices) shall be identified with a specific application @@ -917,9 +923,7 @@ all

-
-
-

ZMQ_RATE: Retrieve multicast data rate

+

ZMQ_RATE: Retrieve multicast data rate

The ZMQ_RATE option shall retrieve the maximum send or receive data rate for multicast transports using the specified socket.

@@ -968,9 +972,7 @@ all, when using multicast transports
-
-
-

ZMQ_RECOVERY_IVL: Get multicast recovery interval

+

ZMQ_RECOVERY_IVL: Get multicast recovery interval

The ZMQ_RECOVERY_IVL option shall retrieve the recovery interval for multicast transports using the specified socket. The recovery interval determines the maximum time in seconds that a receiver can be absent from a @@ -1021,9 +1023,7 @@ all, when using multicast transports

-
-
-

ZMQ_RECOVERY_IVL_MSEC: Get multicast recovery interval in milliseconds

+

ZMQ_RECOVERY_IVL_MSEC: Get multicast recovery interval in milliseconds

The ZMQ_RECOVERY_IVL’_MSEC option shall retrieve the recovery interval, in milliseconds, for multicast transports using the specified 'socket. The recovery interval determines the maximum time in seconds that a receiver @@ -1079,9 +1079,7 @@ all, when using multicast transports

-
-
-

ZMQ_MCAST_LOOP: Control multicast loop-back

+

ZMQ_MCAST_LOOP: Control multicast loop-back

The ZMQ_MCAST_LOOP option controls whether data sent via multicast transports can also be received by the sending host via loop-back. A value of zero indicates that the loop-back functionality is disabled, while the default @@ -1135,9 +1133,7 @@ all, when using multicast transports

-
-
-

ZMQ_SNDBUF: Retrieve kernel transmit buffer size

+

ZMQ_SNDBUF: Retrieve kernel transmit buffer size

The ZMQ_SNDBUF option shall retrieve the underlying kernel transmit buffer size for the specified socket. A value of zero means that the OS default is in effect. For details refer to your operating system documentation for the @@ -1188,9 +1184,7 @@ all

-
-
-

ZMQ_RCVBUF: Retrieve kernel receive buffer size

+

ZMQ_RCVBUF: Retrieve kernel receive buffer size

The ZMQ_RCVBUF option shall retrieve the underlying kernel receive buffer size for the specified socket. A value of zero means that the OS default is in effect. For details refer to your operating system documentation for the @@ -1241,9 +1235,7 @@ all

-
-
-

ZMQ_LINGER: Retrieve linger period for socket shutdown

+

ZMQ_LINGER: Retrieve linger period for socket shutdown

The ZMQ_LINGER option shall retrieve the linger period for the specified socket. The linger period determines how long pending messages which have yet to be sent to a peer shall linger in memory after a socket is closed with @@ -1321,9 +1313,7 @@ all

-
-
-

ZMQ_RECONNECT_IVL: Retrieve reconnection interval

+

ZMQ_RECONNECT_IVL: Retrieve reconnection interval

The ZMQ_RECONNECT_IVL option shall retrieve the initial reconnection interval for the specified socket. The reconnection interval is the period ØMQ shall wait between attempts to reconnect disconnected peers when using @@ -1383,9 +1373,7 @@ all, only for connection-oriented transports

-
-
-

ZMQ_RECONNECT_IVL_MAX: Retrieve maximum reconnection interval

+

ZMQ_RECONNECT_IVL_MAX: Retrieve maximum reconnection interval

The ZMQ_RECONNECT_IVL_MAX option shall retrieve the maximum reconnection interval for the specified socket. This is the maximum period ØMQ shall wait between attempts to reconnect. On each reconnect attempt, the previous interval @@ -1446,9 +1434,7 @@ all, only for connection-oriented transport

-
-
-

ZMQ_BACKLOG: Retrieve maximum length of the queue of outstanding connections

+

ZMQ_BACKLOG: Retrieve maximum length of the queue of outstanding connections

The ZMQ_BACKLOG option shall retrieve the maximum length of the queue of outstanding peer connections for the specified socket; this only applies to connection-oriented transports. For details refer to your operating system @@ -1499,9 +1485,7 @@ all, only for connection-oriented transports

-
-
-

ZMQ_FD: Retrieve file descriptor associated with the socket

+

ZMQ_FD: Retrieve file descriptor associated with the socket

The ZMQ_FD option shall retrieve the file descriptor associated with the specified socket. The returned file descriptor can be used to integrate the socket into an existing event loop; the ØMQ library shall signal any pending @@ -1574,9 +1558,7 @@ all

-
-
-

ZMQ_EVENTS: Retrieve socket event state

+

ZMQ_EVENTS: Retrieve socket event state

The ZMQ_EVENTS option shall retrieve the event state for the specified socket. The returned value is a bit mask constructed by OR’ing a combination of the following event flags:

@@ -1651,16 +1633,11 @@ all
-
-
-

RETURN VALUE

The zmq_getsockopt() function shall return zero if successful. Otherwise it shall return -1 and set errno to one of the values defined below.

-
-

ERRORS

@@ -1701,8 +1678,6 @@ The operation was interrupted by delivery of a signal.
-
-

EXAMPLE

@@ -1715,28 +1690,23 @@ rc = zmq_getsockopt (socket, ZMQ_HWM, &hwm, &hwm_size); assert (rc == 0);
-
-

SEE ALSO

zmq_setsockopt(3) zmq_socket(3) zmq(7)

-
-

AUTHORS

This ØMQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and Martin Lucina <mato@kotelna.sk>.

-
diff --git a/doc/zmq_init.3 b/doc/zmq_init.3 index 13a1686..8df9ede 100644 --- a/doc/zmq_init.3 +++ b/doc/zmq_init.3 @@ -2,12 +2,12 @@ .\" Title: zmq_init .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 08/29/2011 +.\" Date: 07/01/2011 .\" Manual: 0MQ Manual -.\" Source: 0MQ 2.1.9 +.\" Source: 0MQ 2.1.8 .\" Language: English .\" -.TH "ZMQ_INIT" "3" "08/29/2011" "0MQ 2\&.1\&.9" "0MQ Manual" +.TH "ZMQ_INIT" "3" "07/01/2011" "0MQ 2\&.1\&.8" "0MQ Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/zmq_init.html b/doc/zmq_init.html index 7629e0a..1798d87 100644 --- a/doc/zmq_init.html +++ b/doc/zmq_init.html @@ -2,28 +2,15 @@ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - - + + zmq_init(3) - +
-

SYNOPSIS

void *zmq_init (int io_threads);

-
-

DESCRIPTION

The zmq_init() function initialises a ØMQ context.

@@ -577,16 +594,12 @@ messaging you may set this to zero, otherwise set it to at least one.

threads as necessary, without any additional locking required on the part of the caller.

-
-

RETURN VALUE

The zmq_init() function shall return an opaque handle to the initialised context if successful. Otherwise it shall return NULL and set errno to one of the values defined below.

-
-

ERRORS

@@ -600,27 +613,22 @@ An invalid number of io_threads was requested.
-
-

SEE ALSO

zmq(7) zmq_term(3)

-
-

AUTHORS

This ØMQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and Martin Lucina <mato@kotelna.sk>.

-
diff --git a/doc/zmq_inproc.7 b/doc/zmq_inproc.7 index a0d6a5d..b1c8e0d 100644 --- a/doc/zmq_inproc.7 +++ b/doc/zmq_inproc.7 @@ -2,12 +2,12 @@ .\" Title: zmq_inproc .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 08/29/2011 +.\" Date: 07/01/2011 .\" Manual: 0MQ Manual -.\" Source: 0MQ 2.1.9 +.\" Source: 0MQ 2.1.8 .\" Language: English .\" -.TH "ZMQ_INPROC" "7" "08/29/2011" "0MQ 2\&.1\&.9" "0MQ Manual" +.TH "ZMQ_INPROC" "7" "07/01/2011" "0MQ 2\&.1\&.8" "0MQ Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/zmq_inproc.html b/doc/zmq_inproc.html index a46d127..f3176f9 100644 --- a/doc/zmq_inproc.html +++ b/doc/zmq_inproc.html @@ -2,28 +2,15 @@ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - - + + zmq_inproc(7) - +
-

SYNOPSIS

The in-process transport passes messages via memory directly between threads @@ -577,8 +596,6 @@ only you can initialise the context with zero I/O threads. See

-
-

ADDRESSING

A ØMQ address string consists of two parts as follows: @@ -586,31 +603,23 @@ only you can initialise the context with zero I/O threads. See transport protocol to use, and for the in-process transport shall be set to inproc. The meaning of the endpoint part for the in-process transport is defined below.

-
-

Assigning a local address to a socket

+

Assigning a local address to a socket

When assigning a local address to a socket using zmq_bind() with the inproc transport, the endpoint shall be interpreted as an arbitrary string identifying the name to create. The name must be unique within the ØMQ context associated with the socket and may be up to 256 characters in length. No other restrictions are placed on the format of the name.

-
-
-

Connecting a socket

+

Connecting a socket

When connecting a socket to a peer address using zmq_connect() with the inproc transport, the endpoint shall be interpreted as an arbitrary string identifying the name to connect to. The name must have been previously created by assigning it to at least one socket within the same ØMQ context as the socket being connected.

-
-
-

WIRE FORMAT

Not applicable.

-
-

EXAMPLES

@@ -634,8 +643,6 @@ rc = zmq_connect(socket, "inproc://my-endpoint"); assert (rc == 0);
-
-

SEE ALSO

zmq_bind(3) @@ -645,20 +652,17 @@ assert (rc == 0); zmq_pgm(7) zmq(7)

-
-

AUTHORS

This ØMQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and Martin Lucina <mato@kotelna.sk>.

-
diff --git a/doc/zmq_ipc.7 b/doc/zmq_ipc.7 index 0e19c95..2202c1e 100644 --- a/doc/zmq_ipc.7 +++ b/doc/zmq_ipc.7 @@ -2,12 +2,12 @@ .\" Title: zmq_ipc .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 08/29/2011 +.\" Date: 10/03/2011 .\" Manual: 0MQ Manual -.\" Source: 0MQ 2.1.9 +.\" Source: 0MQ 2.1.10 .\" Language: English .\" -.TH "ZMQ_IPC" "7" "08/29/2011" "0MQ 2\&.1\&.9" "0MQ Manual" +.TH "ZMQ_IPC" "7" "10/03/2011" "0MQ 2\&.1\&.10" "0MQ Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/zmq_ipc.html b/doc/zmq_ipc.html index 3a4a88c..8b0601d 100644 --- a/doc/zmq_ipc.html +++ b/doc/zmq_ipc.html @@ -2,28 +2,15 @@ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - - + + zmq_ipc(7) - +
-

SYNOPSIS

The inter-process transport passes messages between local processes using a @@ -575,8 +594,6 @@ systems that provide UNIX domain sockets.

-
-

ADDRESSING

A ØMQ address string consists of two parts as follows: @@ -584,32 +601,24 @@ systems that provide UNIX domain sockets. transport protocol to use, and for the inter-process transport shall be set to ipc. The meaning of the endpoint part for the inter-process transport is defined below.

-
-

Assigning a local address to a socket

+

Assigning a local address to a socket

When assigning a local address to a socket using zmq_bind() with the ipc transport, the endpoint shall be interpreted as an arbitrary string identifying the pathname to create. The pathname must be unique within the operating system namespace used by the ipc implementation, and must fulfill any restrictions placed by the operating system on the format and length of a pathname.

-
-
-

Connecting a socket

+

Connecting a socket

When connecting a socket to a peer address using zmq_connect() with the ipc transport, the endpoint shall be interpreted as an arbitrary string identifying the pathname to connect to. The pathname must have been previously created within the operating system namespace by assigning it to a socket with zmq_bind().

-
-
-

WIRE FORMAT

Not applicable.

-
-

EXAMPLES

@@ -627,8 +636,6 @@ rc = zmq_connect(socket, "ipc:///tmp/feeds/0"); assert (rc == 0);
-
-

SEE ALSO

zmq_bind(3) @@ -638,20 +645,17 @@ assert (rc == 0); zmq_pgm(7) zmq(7)

-
-

AUTHORS

This ØMQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and Martin Lucina <mato@kotelna.sk>.

-
diff --git a/doc/zmq_msg_close.3 b/doc/zmq_msg_close.3 index 99efcab..a62a470 100644 --- a/doc/zmq_msg_close.3 +++ b/doc/zmq_msg_close.3 @@ -2,12 +2,12 @@ .\" Title: zmq_msg_close .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 08/29/2011 +.\" Date: 07/01/2011 .\" Manual: 0MQ Manual -.\" Source: 0MQ 2.1.9 +.\" Source: 0MQ 2.1.8 .\" Language: English .\" -.TH "ZMQ_MSG_CLOSE" "3" "08/29/2011" "0MQ 2\&.1\&.9" "0MQ Manual" +.TH "ZMQ_MSG_CLOSE" "3" "07/01/2011" "0MQ 2\&.1\&.8" "0MQ Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/zmq_msg_close.html b/doc/zmq_msg_close.html index 8fd8d1b..621d39c 100644 --- a/doc/zmq_msg_close.html +++ b/doc/zmq_msg_close.html @@ -2,28 +2,15 @@ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - - + + zmq_msg_close(3) - +
-

SYNOPSIS

int zmq_msg_close (zmq_msg_t *msg);

-
-

DESCRIPTION

The zmq_msg_close() function shall inform the ØMQ infrastructure that any @@ -586,15 +603,11 @@ no longer required, otherwise memory leaks may occur.

-
-

RETURN VALUE

The zmq_msg_close() function shall return zero if successful. Otherwise it shall return -1 and set errno to one of the values defined below.

-
-

ERRORS

@@ -608,8 +621,6 @@ Invalid message.
-
-

SEE ALSO

zmq_msg_init(3) @@ -619,20 +630,17 @@ Invalid message. zmq_msg_size(3) zmq(7)

-
-

AUTHORS

This ØMQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and Martin Lucina <mato@kotelna.sk>.

-
diff --git a/doc/zmq_msg_copy.3 b/doc/zmq_msg_copy.3 index 22e669a..dbdc540 100644 --- a/doc/zmq_msg_copy.3 +++ b/doc/zmq_msg_copy.3 @@ -2,12 +2,12 @@ .\" Title: zmq_msg_copy .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 08/29/2011 +.\" Date: 07/01/2011 .\" Manual: 0MQ Manual -.\" Source: 0MQ 2.1.9 +.\" Source: 0MQ 2.1.8 .\" Language: English .\" -.TH "ZMQ_MSG_COPY" "3" "08/29/2011" "0MQ 2\&.1\&.9" "0MQ Manual" +.TH "ZMQ_MSG_COPY" "3" "07/01/2011" "0MQ 2\&.1\&.8" "0MQ Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/zmq_msg_copy.html b/doc/zmq_msg_copy.html index 6098a48..0130499 100644 --- a/doc/zmq_msg_copy.html +++ b/doc/zmq_msg_copy.html @@ -2,28 +2,15 @@ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - - + + zmq_msg_copy(3) - +
-

SYNOPSIS

int zmq_msg_copy (zmq_msg_t *dest, zmq_msg_t *src);

-
-

DESCRIPTION

The zmq_msg_copy() function shall copy the message object referenced by src @@ -595,15 +612,11 @@ copy the message content using memcpy().

-
-

RETURN VALUE

The zmq_msg_copy() function shall return zero if successful. Otherwise it shall return -1 and set errno to one of the values defined below.

-
-

ERRORS

@@ -617,8 +630,6 @@ Invalid message.
-
-

SEE ALSO

zmq_msg_move(3) @@ -628,20 +639,17 @@ Invalid message. zmq_msg_close(3) zmq(7)

-
-

AUTHORS

This ØMQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and Martin Lucina <mato@kotelna.sk>.

-
diff --git a/doc/zmq_msg_data.3 b/doc/zmq_msg_data.3 index b623cb6..8a18ce1 100644 --- a/doc/zmq_msg_data.3 +++ b/doc/zmq_msg_data.3 @@ -2,12 +2,12 @@ .\" Title: zmq_msg_data .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 08/29/2011 +.\" Date: 07/01/2011 .\" Manual: 0MQ Manual -.\" Source: 0MQ 2.1.9 +.\" Source: 0MQ 2.1.8 .\" Language: English .\" -.TH "ZMQ_MSG_DATA" "3" "08/29/2011" "0MQ 2\&.1\&.9" "0MQ Manual" +.TH "ZMQ_MSG_DATA" "3" "07/01/2011" "0MQ 2\&.1\&.8" "0MQ Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/zmq_msg_data.html b/doc/zmq_msg_data.html index 3e06bd6..76d547a 100644 --- a/doc/zmq_msg_data.html +++ b/doc/zmq_msg_data.html @@ -2,28 +2,15 @@ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - - + + zmq_msg_data(3) - +
-

SYNOPSIS

void *zmq_msg_data (zmq_msg_t *msg);

-
-

DESCRIPTION

The zmq_msg_data() function shall return a pointer to the message content of @@ -581,21 +598,15 @@ the message object referenced by msg.

-
-

RETURN VALUE

Upon successful completion, zmq_msg_data() shall return a pointer to the message content.

-
-

ERRORS

No errors are defined.

-
-

SEE ALSO

zmq_msg_size(3) @@ -605,20 +616,17 @@ message content.

zmq_msg_close(3) zmq(7)

- -

AUTHORS

This ØMQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and Martin Lucina <mato@kotelna.sk>.

-
diff --git a/doc/zmq_msg_init.3 b/doc/zmq_msg_init.3 index 94e7f4a..f2029b7 100644 --- a/doc/zmq_msg_init.3 +++ b/doc/zmq_msg_init.3 @@ -2,12 +2,12 @@ .\" Title: zmq_msg_init .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 08/29/2011 +.\" Date: 07/01/2011 .\" Manual: 0MQ Manual -.\" Source: 0MQ 2.1.9 +.\" Source: 0MQ 2.1.8 .\" Language: English .\" -.TH "ZMQ_MSG_INIT" "3" "08/29/2011" "0MQ 2\&.1\&.9" "0MQ Manual" +.TH "ZMQ_MSG_INIT" "3" "07/01/2011" "0MQ 2\&.1\&.8" "0MQ Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/zmq_msg_init.html b/doc/zmq_msg_init.html index 5ecfe77..8d836ec 100644 --- a/doc/zmq_msg_init.html +++ b/doc/zmq_msg_init.html @@ -2,28 +2,15 @@ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - - + + zmq_msg_init(3) - +
-

SYNOPSIS

int zmq_msg_init (zmq_msg_t *msg);

-
-

DESCRIPTION

The zmq_msg_init() function shall initialise the message object referenced by @@ -592,21 +609,15 @@ before receiving a message with zmq_recv().

-
-

RETURN VALUE

The zmq_msg_init() function shall return zero if successful. Otherwise it shall return -1 and set errno to one of the values defined below.

-
-

ERRORS

No errors are defined.

-
-

EXAMPLE

@@ -619,8 +630,6 @@ rc = zmq_recv (socket, &msg, 0); assert (rc == 0);
- -

SEE ALSO

zmq_msg_init_size(3) @@ -630,20 +639,17 @@ assert (rc == 0); zmq_msg_size(3) zmq(7)

-
-

AUTHORS

This ØMQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and Martin Lucina <mato@kotelna.sk>.

-
diff --git a/doc/zmq_msg_init_data.3 b/doc/zmq_msg_init_data.3 index 2dcad31..42d84e2 100644 --- a/doc/zmq_msg_init_data.3 +++ b/doc/zmq_msg_init_data.3 @@ -2,12 +2,12 @@ .\" Title: zmq_msg_init_data .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 08/29/2011 +.\" Date: 07/01/2011 .\" Manual: 0MQ Manual -.\" Source: 0MQ 2.1.9 +.\" Source: 0MQ 2.1.8 .\" Language: English .\" -.TH "ZMQ_MSG_INIT_DATA" "3" "08/29/2011" "0MQ 2\&.1\&.9" "0MQ Manual" +.TH "ZMQ_MSG_INIT_DATA" "3" "07/01/2011" "0MQ 2\&.1\&.8" "0MQ Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/zmq_msg_init_data.html b/doc/zmq_msg_init_data.html index aa6d1c5..2ee1b7e 100644 --- a/doc/zmq_msg_init_data.html +++ b/doc/zmq_msg_init_data.html @@ -2,28 +2,15 @@ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - - + + zmq_msg_init_data(3) - +
-

SYNOPSIS

typedef void (zmq_free_fn) (void *data, void *hint);

int zmq_msg_init_data (zmq_msg_t *msg, void *data, size_t size, zmq_free_fn *ffn, void *hint);

-
-

DESCRIPTION

The zmq_msg_init_data() function shall initialise the message object @@ -606,21 +623,15 @@ will be called from an arbitrary thread.

-
-

RETURN VALUE

The zmq_msg_init_data() function shall return zero if successful. Otherwise it shall return -1 and set errno to one of the values defined below.

-
-

ERRORS

No errors are defined.

-
-

EXAMPLE

@@ -641,8 +652,6 @@ rc = zmq_msg_init_data (&msg, data, 6, my_free, NULL); assert (rc == 0);
-
-

SEE ALSO

zmq_msg_init_size(3) @@ -652,20 +661,17 @@ assert (rc == 0); zmq_msg_size(3) zmq(7)

-
-

AUTHORS

This ØMQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and Martin Lucina <mato@kotelna.sk>.

-
diff --git a/doc/zmq_msg_init_size.3 b/doc/zmq_msg_init_size.3 index 31c37c4..12be11d 100644 --- a/doc/zmq_msg_init_size.3 +++ b/doc/zmq_msg_init_size.3 @@ -2,12 +2,12 @@ .\" Title: zmq_msg_init_size .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 08/29/2011 +.\" Date: 07/01/2011 .\" Manual: 0MQ Manual -.\" Source: 0MQ 2.1.9 +.\" Source: 0MQ 2.1.8 .\" Language: English .\" -.TH "ZMQ_MSG_INIT_SIZE" "3" "08/29/2011" "0MQ 2\&.1\&.9" "0MQ Manual" +.TH "ZMQ_MSG_INIT_SIZE" "3" "07/01/2011" "0MQ 2\&.1\&.8" "0MQ Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/zmq_msg_init_size.html b/doc/zmq_msg_init_size.html index 34c62cc..9d5218d 100644 --- a/doc/zmq_msg_init_size.html +++ b/doc/zmq_msg_init_size.html @@ -2,28 +2,15 @@ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - - + + zmq_msg_init_size(3) - +
-

SYNOPSIS

int zmq_msg_init_size (zmq_msg_t *msg, size_t size);

-
-

DESCRIPTION

The zmq_msg_init_size() function shall allocate any resources required to @@ -595,15 +612,11 @@ by msg to represent the newly allocated message.

-
-

RETURN VALUE

The zmq_msg_init_size() function shall return zero if successful. Otherwise it shall return -1 and set errno to one of the values defined below.

-
-

ERRORS

@@ -617,8 +630,6 @@ Insufficient storage space is available.
-
-

SEE ALSO

zmq_msg_init_data(3) @@ -628,20 +639,17 @@ Insufficient storage space is available. zmq_msg_size(3) zmq(7)

-
-

AUTHORS

This ØMQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and Martin Lucina <mato@kotelna.sk>.

-
diff --git a/doc/zmq_msg_move.3 b/doc/zmq_msg_move.3 index 2f4573b..0b67df9 100644 --- a/doc/zmq_msg_move.3 +++ b/doc/zmq_msg_move.3 @@ -2,12 +2,12 @@ .\" Title: zmq_msg_move .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 08/29/2011 +.\" Date: 07/01/2011 .\" Manual: 0MQ Manual -.\" Source: 0MQ 2.1.9 +.\" Source: 0MQ 2.1.8 .\" Language: English .\" -.TH "ZMQ_MSG_MOVE" "3" "08/29/2011" "0MQ 2\&.1\&.9" "0MQ Manual" +.TH "ZMQ_MSG_MOVE" "3" "07/01/2011" "0MQ 2\&.1\&.8" "0MQ Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/zmq_msg_move.html b/doc/zmq_msg_move.html index 63baceb..cbf6c79 100644 --- a/doc/zmq_msg_move.html +++ b/doc/zmq_msg_move.html @@ -2,28 +2,15 @@ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - - + + zmq_msg_move(3) - +
-

SYNOPSIS

int zmq_msg_move (zmq_msg_t *dest, zmq_msg_t *src);

-
-

DESCRIPTION

The zmq_msg_move() function shall move the content of the message object @@ -584,15 +601,11 @@ The original content of dest, if any, shall be released.

-
-

RETURN VALUE

The zmq_msg_move() function shall return zero if successful. Otherwise it shall return -1 and set errno to one of the values defined below.

-
-

ERRORS

@@ -606,8 +619,6 @@ Invalid message.
-
-

SEE ALSO

zmq_msg_copy(3) @@ -617,20 +628,17 @@ Invalid message. zmq_msg_close(3) zmq(7)

-
-

AUTHORS

This ØMQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and Martin Lucina <mato@kotelna.sk>.

-
diff --git a/doc/zmq_msg_size.3 b/doc/zmq_msg_size.3 index e7557c1..501b615 100644 --- a/doc/zmq_msg_size.3 +++ b/doc/zmq_msg_size.3 @@ -2,12 +2,12 @@ .\" Title: zmq_msg_size .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 08/29/2011 +.\" Date: 09/08/2011 .\" Manual: 0MQ Manual -.\" Source: 0MQ 2.1.9 +.\" Source: 0MQ 2.1.10 .\" Language: English .\" -.TH "ZMQ_MSG_SIZE" "3" "08/29/2011" "0MQ 2\&.1\&.9" "0MQ Manual" +.TH "ZMQ_MSG_SIZE" "3" "09/08/2011" "0MQ 2\&.1\&.10" "0MQ Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/zmq_msg_size.html b/doc/zmq_msg_size.html index b498438..b59c528 100644 --- a/doc/zmq_msg_size.html +++ b/doc/zmq_msg_size.html @@ -2,28 +2,15 @@ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - - + + zmq_msg_size(3) - +
-

SYNOPSIS

size_t zmq_msg_size (zmq_msg_t *msg);

-
-

DESCRIPTION

The zmq_msg_size() function shall return the size in bytes of the content of @@ -581,21 +598,15 @@ the message object referenced by msg.

-
-

RETURN VALUE

Upon successful completion, zmq_msg_size() shall return the size of the message content in bytes.

-
-

ERRORS

No errors are defined.

-
-

SEE ALSO

zmq_msg_data(3) @@ -605,20 +616,17 @@ message content in bytes.

zmq_msg_close(3) zmq(7)

- -

AUTHORS

This ØMQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and Martin Lucina <mato@kotelna.sk>.

-
diff --git a/doc/zmq_pgm.7 b/doc/zmq_pgm.7 index 66250f5..60e8fa4 100644 --- a/doc/zmq_pgm.7 +++ b/doc/zmq_pgm.7 @@ -2,12 +2,12 @@ .\" Title: zmq_pgm .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 08/29/2011 +.\" Date: 09/08/2011 .\" Manual: 0MQ Manual -.\" Source: 0MQ 2.1.9 +.\" Source: 0MQ 2.1.10 .\" Language: English .\" -.TH "ZMQ_PGM" "7" "08/29/2011" "0MQ 2\&.1\&.9" "0MQ Manual" +.TH "ZMQ_PGM" "7" "09/08/2011" "0MQ 2\&.1\&.10" "0MQ Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/zmq_pgm.html b/doc/zmq_pgm.html index 64e3e75..5dfc00d 100644 --- a/doc/zmq_pgm.html +++ b/doc/zmq_pgm.html @@ -2,28 +2,15 @@ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - - + + zmq_pgm(7) - +
-

SYNOPSIS

PGM (Pragmatic General Multicast) is a protocol for reliable multicast transport of data over IP networks.

-
-

DESCRIPTION

ØMQ implements two variants of PGM, the standard protocol where PGM datagrams @@ -593,8 +610,6 @@ not require any special privileges.

-
-

ADDRESSING

A ØMQ address string consists of two parts as follows: @@ -603,8 +618,7 @@ transport protocol to use. For the standard PGM protocol, transport sha set to pgm. For the "Encapsulated PGM" protocol transport shall be set to epgm. The meaning of the endpoint part for both the pgm and epgm transport is defined below.

-
-

Connecting a socket

+

Connecting a socket

When connecting a socket to a peer address using zmq_connect() with the pgm or epgm transport, the endpoint shall be interpreted as an interface followed by a semicolon, followed by a multicast address, followed by a colon @@ -637,9 +651,6 @@ names exist, thus only the primary IPv4 address may be used to specify an

A multicast address is specified by an IPv4 multicast address in its numeric representation.

-
-
-

WIRE FORMAT

Consecutive PGM datagrams are interpreted by ØMQ as a single continuous stream @@ -647,8 +658,7 @@ of data where ØMQ messages are not necessarily aligned with PGM datagram boundaries and a single ØMQ message may span several PGM datagrams. This stream of data consists of ØMQ messages encapsulated in frames as described in zmq_tcp(7).

-
-

PGM datagram payload

+

PGM datagram payload

The following ABNF grammar represents the payload of a single PGM datagram as used by ØMQ:

@@ -696,9 +706,6 @@ Third datagram payload +--------------+----------------------------+-------------+
-
-
-

EXAMPLE

@@ -716,8 +723,6 @@ rc = zmq_connect(socket, "pgm://192.168.1.1;239.192.1.1:5555"); assert (rc == 0);
-
-

SEE ALSO

zmq_connect(3) @@ -727,20 +732,17 @@ assert (rc == 0); zmq_inproc(7) zmq(7)

-
-

AUTHORS

This ØMQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and Martin Lucina <mato@kotelna.sk>.

-
diff --git a/doc/zmq_poll.3 b/doc/zmq_poll.3 index 38d76be..351caa3 100644 --- a/doc/zmq_poll.3 +++ b/doc/zmq_poll.3 @@ -2,12 +2,12 @@ .\" Title: zmq_poll .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 08/29/2011 +.\" Date: 09/08/2011 .\" Manual: 0MQ Manual -.\" Source: 0MQ 2.1.9 +.\" Source: 0MQ 2.1.10 .\" Language: English .\" -.TH "ZMQ_POLL" "3" "08/29/2011" "0MQ 2\&.1\&.9" "0MQ Manual" +.TH "ZMQ_POLL" "3" "09/08/2011" "0MQ 2\&.1\&.10" "0MQ Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/zmq_poll.html b/doc/zmq_poll.html index eb1c214..c2645dd 100644 --- a/doc/zmq_poll.html +++ b/doc/zmq_poll.html @@ -2,28 +2,15 @@ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - - + + zmq_poll(3) - +
-

SYNOPSIS

int zmq_poll (zmq_pollitem_t *items, int nitems, long timeout);

-
-

DESCRIPTION

The zmq_poll() function provides a mechanism for applications to multiplex @@ -656,8 +673,6 @@ of those interfaces in ways not defined in this documentation.

-
-

RETURN VALUE

Upon successful completion, the zmq_poll() function shall return the number @@ -665,8 +680,6 @@ of zmq_pollitem_t structures with events signaled in revent events have been signaled. Upon failure, zmq_poll() shall return -1 and set errno to one of the values defined below.

-
-

ERRORS

@@ -698,8 +711,6 @@ available.
-
-

EXAMPLE

@@ -719,8 +730,6 @@ assert (rc >= 0); /* Returned events will be stored in items[].revents */
-
-

SEE ALSO

zmq_socket(3) @@ -729,20 +738,17 @@ assert (rc >= 0); zmq(7)

Your operating system documentation for the poll() system call.

-
-

AUTHORS

This ØMQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and Martin Lucina <mato@kotelna.sk>.

-
diff --git a/doc/zmq_recv.3 b/doc/zmq_recv.3 index 6ea3446..925d1a5 100644 --- a/doc/zmq_recv.3 +++ b/doc/zmq_recv.3 @@ -2,12 +2,12 @@ .\" Title: zmq_recv .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 08/29/2011 +.\" Date: 09/08/2011 .\" Manual: 0MQ Manual -.\" Source: 0MQ 2.1.9 +.\" Source: 0MQ 2.1.10 .\" Language: English .\" -.TH "ZMQ_RECV" "3" "08/29/2011" "0MQ 2\&.1\&.9" "0MQ Manual" +.TH "ZMQ_RECV" "3" "09/08/2011" "0MQ 2\&.1\&.10" "0MQ Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/zmq_recv.html b/doc/zmq_recv.html index 6fa3751..b27b619 100644 --- a/doc/zmq_recv.html +++ b/doc/zmq_recv.html @@ -2,28 +2,15 @@ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - - + + zmq_recv(3) - +
-

SYNOPSIS

int zmq_recv (void *socket, zmq_msg_t *msg, int flags);

-
-

DESCRIPTION

The zmq_recv() function shall receive a message from the socket referenced by @@ -587,8 +604,7 @@ shall fail with errno set to EAGAIN.

-
-

Multi-part messages

+

Multi-part messages

A ØMQ message is composed of 1 or more message parts; each message part is an independent zmq_msg_t in its own right. ØMQ ensures atomic delivery of messages; peers shall receive either all message parts of a message or none @@ -601,16 +617,11 @@ follow, or if the message is not composed of multiple parts, ZMQ_RCVMOREZMQ_RCVMORE shall report a value of 1, indicating that more message parts are to follow.

-
-
-

RETURN VALUE

The zmq_recv() function shall return zero if successful. Otherwise it shall return -1 and set errno to one of the values defined below.

-
-

ERRORS

@@ -676,8 +687,6 @@ The message passed to the function was invalid.
-
-

EXAMPLE

@@ -713,8 +722,6 @@ do { } while (more);
-
-

SEE ALSO

zmq_send(3) @@ -722,20 +729,17 @@ do { zmq_socket(7) zmq(7)

-
-

AUTHORS

This ØMQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and Martin Lucina <mato@kotelna.sk>.

-
diff --git a/doc/zmq_send.3 b/doc/zmq_send.3 index 3c8ce2e..e240a73 100644 --- a/doc/zmq_send.3 +++ b/doc/zmq_send.3 @@ -2,12 +2,12 @@ .\" Title: zmq_send .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 08/29/2011 +.\" Date: 09/08/2011 .\" Manual: 0MQ Manual -.\" Source: 0MQ 2.1.9 +.\" Source: 0MQ 2.1.10 .\" Language: English .\" -.TH "ZMQ_SEND" "3" "08/29/2011" "0MQ 2\&.1\&.9" "0MQ Manual" +.TH "ZMQ_SEND" "3" "09/08/2011" "0MQ 2\&.1\&.10" "0MQ Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/zmq_send.html b/doc/zmq_send.html index 559eb38..9ba1f96 100644 --- a/doc/zmq_send.html +++ b/doc/zmq_send.html @@ -2,28 +2,15 @@ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - - + + zmq_send(3) - +
-

SYNOPSIS

int zmq_send (void *socket, zmq_msg_t *msg, int flags);

-
-

DESCRIPTION

The zmq_send() function shall queue the message referenced by the msg @@ -607,8 +624,7 @@ message has been transmitted to the network, only that it has been queued on the socket and ØMQ has assumed responsibility for the message.

-
-

Multi-part messages

+

Multi-part messages

A ØMQ message is composed of 1 or more message parts; each message part is an independent zmq_msg_t in its own right. ØMQ ensures atomic delivery of messages; peers shall receive either all message parts of a message or none @@ -621,16 +637,11 @@ are to follow. When the application wishes to send the final message part it does so by calling zmq_send() without the ZMQ_SNDMORE flag; this indicates that no more message parts are to follow.

-
-
-

RETURN VALUE

The zmq_send() function shall return zero if successful. Otherwise it shall return -1 and set errno to one of the values defined below.

-
-

ERRORS

@@ -696,8 +707,6 @@ Invalid message.
-
-

EXAMPLE

@@ -723,28 +732,23 @@ rc = zmq_send (socket, &part2, ZMQ_SNDMORE); rc = zmq_send (socket, &part3, 0);
-
-

SEE ALSO

zmq_recv(3) zmq_socket(7) zmq(7)

-
-

AUTHORS

This ØMQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and Martin Lucina <mato@kotelna.sk>.

-
diff --git a/doc/zmq_setsockopt.3 b/doc/zmq_setsockopt.3 index c700d41..5e57261 100644 --- a/doc/zmq_setsockopt.3 +++ b/doc/zmq_setsockopt.3 @@ -2,12 +2,12 @@ .\" Title: zmq_setsockopt .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 08/29/2011 +.\" Date: 09/08/2011 .\" Manual: 0MQ Manual -.\" Source: 0MQ 2.1.9 +.\" Source: 0MQ 2.1.10 .\" Language: English .\" -.TH "ZMQ_SETSOCKOPT" "3" "08/29/2011" "0MQ 2\&.1\&.9" "0MQ Manual" +.TH "ZMQ_SETSOCKOPT" "3" "09/08/2011" "0MQ 2\&.1\&.10" "0MQ Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/zmq_setsockopt.html b/doc/zmq_setsockopt.html index 6686dc3..d3b17ca 100644 --- a/doc/zmq_setsockopt.html +++ b/doc/zmq_setsockopt.html @@ -2,28 +2,15 @@ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - - + + zmq_setsockopt(3) - +
-

SYNOPSIS

int zmq_setsockopt (void *socket, int option_name, const void *option_value, size_t option_len);

Caution: All options, with the exception of ZMQ_SUBSCRIBE, ZMQ_UNSUBSCRIBE and ZMQ_LINGER, only take effect for subsequent socket bind/connects.

-
-

DESCRIPTION

The zmq_setsockopt() function shall set the option specified by the @@ -576,8 +593,7 @@ ZMQ_LINGER, only take effect for subsequent socket bind/connects.

for the ØMQ socket pointed to by the socket argument. The option_len argument is the size of the option value in bytes.

The following socket options can be set with the zmq_setsockopt() function:

-
-

ZMQ_HWM: Set high water mark

+

ZMQ_HWM: Set high water mark

The ZMQ_HWM option shall set the high water mark for the specified socket. The high water mark is a hard limit on the maximum number of outstanding messages ØMQ shall queue in memory for any single peer that the specified @@ -634,9 +650,7 @@ all

-
-
-

ZMQ_SWAP: Set disk offload size

+

ZMQ_SWAP: Set disk offload size

The ZMQ_SWAP option shall set the disk offload (swap) size for the specified socket. A socket which has ZMQ_SWAP set to a non-zero value may exceed its high water mark; in this case outstanding messages shall be offloaded to @@ -688,9 +702,7 @@ all

-
-
-

ZMQ_AFFINITY: Set I/O thread affinity

+

ZMQ_AFFINITY: Set I/O thread affinity

The ZMQ_AFFINITY option shall set the I/O thread affinity for newly created connections on the specified socket.

Affinity determines which threads from the ØMQ I/O thread pool associated with @@ -748,9 +760,7 @@ N/A

-
-
-

ZMQ_IDENTITY: Set socket identity

+

ZMQ_IDENTITY: Set socket identity

The ZMQ_IDENTITY option shall set the identity of the specified socket. Socket identity determines if existing ØMQ infrastructure (message queues, forwarding devices) shall be identified with a specific application and @@ -808,9 +818,7 @@ all

-
-
-

ZMQ_SUBSCRIBE: Establish message filter

+

ZMQ_SUBSCRIBE: Establish message filter

The ZMQ_SUBSCRIBE option shall establish a new message filter on a ZMQ_SUB socket. Newly created ZMQ_SUB sockets shall filter out all incoming messages, therefore you should call this option to establish an initial message filter.

@@ -865,9 +873,7 @@ ZMQ_SUB
-
-
-

ZMQ_UNSUBSCRIBE: Remove message filter

+

ZMQ_UNSUBSCRIBE: Remove message filter

The ZMQ_UNSUBSCRIBE option shall remove an existing message filter on a ZMQ_SUB socket. The filter specified must match an existing filter previously established with the ZMQ_SUBSCRIBE option. If the socket has several @@ -919,9 +925,7 @@ ZMQ_SUB

-
-
-

ZMQ_RATE: Set multicast data rate

+

ZMQ_RATE: Set multicast data rate

The ZMQ_RATE option shall set the maximum send or receive data rate for multicast transports such as zmq_pgm(7) using the specified socket.

@@ -970,9 +974,7 @@ all, when using multicast transports
-
-
-

ZMQ_RECOVERY_IVL: Set multicast recovery interval

+

ZMQ_RECOVERY_IVL: Set multicast recovery interval

The ZMQ_RECOVERY_IVL option shall set the recovery interval for multicast transports using the specified socket. The recovery interval determines the maximum time in seconds that a receiver can be absent from a multicast group @@ -1033,9 +1035,7 @@ all, when using multicast transports

-
-
-

ZMQ_RECOVERY_IVL_MSEC: Set multicast recovery interval in milliseconds

+

ZMQ_RECOVERY_IVL_MSEC: Set multicast recovery interval in milliseconds

The ZMQ_RECOVERY_IVL_MSEC option shall set the recovery interval, specified in milliseconds (ms) for multicast transports using the specified socket. The recovery interval determines the maximum time in milliseconds that a @@ -1101,9 +1101,7 @@ all, when using multicast transports

-
-
-

ZMQ_MCAST_LOOP: Control multicast loop-back

+

ZMQ_MCAST_LOOP: Control multicast loop-back

The ZMQ_MCAST_LOOP option shall control whether data sent via multicast transports using the specified socket can also be received by the sending host via loop-back. A value of zero disables the loop-back functionality, while @@ -1157,9 +1155,7 @@ all, when using multicast transports

-
-
-

ZMQ_SNDBUF: Set kernel transmit buffer size

+

ZMQ_SNDBUF: Set kernel transmit buffer size

The ZMQ_SNDBUF option shall set the underlying kernel transmit buffer size for the socket to the specified size in bytes. A value of zero means leave the OS default unchanged. For details please refer to your operating system @@ -1210,9 +1206,7 @@ all

-
-
-

ZMQ_RCVBUF: Set kernel receive buffer size

+

ZMQ_RCVBUF: Set kernel receive buffer size

The ZMQ_RCVBUF option shall set the underlying kernel receive buffer size for the socket to the specified size in bytes. A value of zero means leave the OS default unchanged. For details refer to your operating system documentation @@ -1263,9 +1257,7 @@ all

-
-
-

ZMQ_LINGER: Set linger period for socket shutdown

+

ZMQ_LINGER: Set linger period for socket shutdown

The ZMQ_LINGER option shall set the linger period for the specified socket. The linger period determines how long pending messages which have yet to be sent to a peer shall linger in memory after a socket is closed with @@ -1343,9 +1335,7 @@ all

-
-
-

ZMQ_RECONNECT_IVL: Set reconnection interval

+

ZMQ_RECONNECT_IVL: Set reconnection interval

The ZMQ_RECONNECT_IVL option shall set the initial reconnection interval for the specified socket. The reconnection interval is the period ØMQ shall wait between attempts to reconnect disconnected peers when using @@ -1405,9 +1395,7 @@ all, only for connection-oriented transports

-
-
-

ZMQ_RECONNECT_IVL_MAX: Set maximum reconnection interval

+

ZMQ_RECONNECT_IVL_MAX: Set maximum reconnection interval

The ZMQ_RECONNECT_IVL_MAX option shall set the maximum reconnection interval for the specified socket. This is the maximum period ØMQ shall wait between attempts to reconnect. On each reconnect attempt, the previous interval shall be @@ -1468,9 +1456,7 @@ all, only for connection-oriented transports

-
-
-

ZMQ_BACKLOG: Set maximum length of the queue of outstanding connections

+

ZMQ_BACKLOG: Set maximum length of the queue of outstanding connections

The ZMQ_BACKLOG option shall set the maximum length of the queue of outstanding peer connections for the specified socket; this only applies to connection-oriented transports. For details refer to your operating system @@ -1522,16 +1508,11 @@ all, only for connection-oriented transports.

- - -

RETURN VALUE

The zmq_setsockopt() function shall return zero if successful. Otherwise it shall return -1 and set errno to one of the values defined below.

-
-

ERRORS

@@ -1570,8 +1551,6 @@ The operation was interrupted by delivery of a signal.
-
-

EXAMPLE

@@ -1601,28 +1580,23 @@ rc = zmq_bind (socket, "tcp://lo:5556"); assert (rc);
- -

SEE ALSO

zmq_getsockopt(3) zmq_socket(3) zmq(7)

-
-

AUTHORS

This ØMQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and Martin Lucina <mato@kotelna.sk>.

-
diff --git a/doc/zmq_socket.3 b/doc/zmq_socket.3 index a7254e4..4fa0e54 100644 --- a/doc/zmq_socket.3 +++ b/doc/zmq_socket.3 @@ -2,12 +2,12 @@ .\" Title: zmq_socket .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 08/29/2011 +.\" Date: 09/08/2011 .\" Manual: 0MQ Manual -.\" Source: 0MQ 2.1.9 +.\" Source: 0MQ 2.1.10 .\" Language: English .\" -.TH "ZMQ_SOCKET" "3" "08/29/2011" "0MQ 2\&.1\&.9" "0MQ Manual" +.TH "ZMQ_SOCKET" "3" "09/08/2011" "0MQ 2\&.1\&.10" "0MQ Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/zmq_socket.html b/doc/zmq_socket.html index 9a8266d..b77ab08 100644 --- a/doc/zmq_socket.html +++ b/doc/zmq_socket.html @@ -2,28 +2,15 @@ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - - + + zmq_socket(3) - +
-

SYNOPSIS

void *zmq_socket (void *context, int type);

-
-

DESCRIPTION

The zmq_socket() function shall create a ØMQ socket within the specified @@ -600,12 +617,10 @@ from multiple threads except after migrating a socket from one thread to another with a "full fence" memory barrier.

Socket types

The following sections present the socket types defined by ØMQ, grouped by the general messaging pattern which is built from related socket types.

-
-

Request-reply pattern

+

Request-reply pattern

The request-reply pattern is used for sending requests from a client to one or more instances of a service, and receiving subsequent replies to each request sent.

-

ZMQ_REQ

A socket of type ZMQ_REQ is used by a client to send requests to and receive replies from a service. This socket type allows only an alternating @@ -685,8 +700,6 @@ Block

-
-

ZMQ_REP

A socket of type ZMQ_REP is used by a service to receive requests from and send replies to a client. This socket type allows only an alternating @@ -765,8 +778,6 @@ Drop

-
-

ZMQ_DEALER

A socket of type ZMQ_DEALER is an advanced pattern used for extending request/reply sockets. Each message sent is load-balanced among all connected @@ -849,8 +860,6 @@ Block

-
-

ZMQ_ROUTER

A socket of type ZMQ_ROUTER is an advanced pattern used for extending request/reply sockets. When receiving messages a ZMQ_ROUTER socket shall @@ -941,13 +950,9 @@ Drop

-
-
-
-

Publish-subscribe pattern

+

Publish-subscribe pattern

The publish-subscribe pattern is used for one-to-many distribution of data from a single publisher to multiple subscribers in a fan out fashion.

-

ZMQ_PUB

A socket of type ZMQ_PUB is used by a publisher to distribute data. Messages sent are distributed in a fan out fashion to all connected peers. @@ -1024,8 +1029,6 @@ Drop

-
-

ZMQ_SUB

A socket of type ZMQ_SUB is used by a subscriber to subscribe to data distributed by a publisher. Initially a ZMQ_SUB socket is not subscribed to @@ -1100,15 +1103,11 @@ Drop

-
-
-
-

Pipeline pattern

+

Pipeline pattern

The pipeline pattern is used for distributing data to nodes arranged in a pipeline. Data always flows down the pipeline, and each stage of the pipeline is connected to at least one node. When a pipeline stage is connected to multiple nodes data is load-balanced among all connected nodes.

-

ZMQ_PUSH

A socket of type ZMQ_PUSH is used by a pipeline node to send messages to downstream pipeline nodes. Messages are load-balanced to all connected @@ -1188,8 +1187,6 @@ Block

-
-

ZMQ_PULL

A socket of type ZMQ_PULL is used by a pipeline node to receive messages from upstream pipeline nodes. Messages are fair-queued from among all @@ -1264,14 +1261,10 @@ N/A

-
-
-
-

Exclusive pair pattern

+

Exclusive pair pattern

The exclusive pair pattern is used to connect a peer to precisely one other peer. This pattern is used for inter-thread communication across the inproc transport.

-

ZMQ_PAIR

A socket of type ZMQ_PAIR can only be connected to a single peer at any one time. No message routing or filtering is performed on messages sent over a @@ -1360,18 +1353,12 @@ Block

-
-
-
-

RETURN VALUE

The zmq_socket() function shall return an opaque handle to the newly created socket if successful. Otherwise, it shall return NULL and set errno to one of the values defined below.

-
-

ERRORS

@@ -1409,8 +1396,6 @@ The context specified was terminated.
-
-

SEE ALSO

zmq_init(3) @@ -1422,20 +1407,17 @@ The context specified was terminated. zmq_inproc(7) zmq(7)

-
-

AUTHORS

This ØMQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and Martin Lucina <mato@kotelna.sk>.

-
diff --git a/doc/zmq_strerror.3 b/doc/zmq_strerror.3 index 4544538..3932733 100644 --- a/doc/zmq_strerror.3 +++ b/doc/zmq_strerror.3 @@ -2,12 +2,12 @@ .\" Title: zmq_strerror .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 08/29/2011 +.\" Date: 07/01/2011 .\" Manual: 0MQ Manual -.\" Source: 0MQ 2.1.9 +.\" Source: 0MQ 2.1.8 .\" Language: English .\" -.TH "ZMQ_STRERROR" "3" "08/29/2011" "0MQ 2\&.1\&.9" "0MQ Manual" +.TH "ZMQ_STRERROR" "3" "07/01/2011" "0MQ 2\&.1\&.8" "0MQ Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/zmq_strerror.html b/doc/zmq_strerror.html index 944c7cc..7e01d4e 100644 --- a/doc/zmq_strerror.html +++ b/doc/zmq_strerror.html @@ -2,28 +2,15 @@ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - - + + zmq_strerror(3) - +
-

SYNOPSIS

const char *zmq_strerror (int errnum);

-
-

DESCRIPTION

The zmq_strerror() function shall return a pointer to an error message string @@ -575,21 +592,15 @@ defines additional error numbers over and above those defined by the operating system, applications should use zmq_strerror() in preference to the standard strerror() function.

-
-

RETURN VALUE

The zmq_strerror() function shall return a pointer to an error message string.

-
-

ERRORS

No errors are defined.

-
-

EXAMPLE

@@ -602,26 +613,21 @@ if (!ctx) { }
-
-

SEE ALSO

zmq(7)

-
-

AUTHORS

This ØMQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and Martin Lucina <mato@kotelna.sk>.

-
diff --git a/doc/zmq_tcp.7 b/doc/zmq_tcp.7 index 673f362..db51c53 100644 --- a/doc/zmq_tcp.7 +++ b/doc/zmq_tcp.7 @@ -2,12 +2,12 @@ .\" Title: zmq_tcp .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 08/29/2011 +.\" Date: 09/08/2011 .\" Manual: 0MQ Manual -.\" Source: 0MQ 2.1.9 +.\" Source: 0MQ 2.1.10 .\" Language: English .\" -.TH "ZMQ_TCP" "7" "08/29/2011" "0MQ 2\&.1\&.9" "0MQ Manual" +.TH "ZMQ_TCP" "7" "09/08/2011" "0MQ 2\&.1\&.10" "0MQ Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/zmq_tcp.html b/doc/zmq_tcp.html index 5256a84..cf5b7ed 100644 --- a/doc/zmq_tcp.html +++ b/doc/zmq_tcp.html @@ -2,28 +2,15 @@ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - - + + zmq_tcp(7) - +
-

SYNOPSIS

TCP is an ubiquitous, reliable, unicast transport. When connecting distributed applications over a network with ØMQ, using the TCP transport will likely be your first choice.

-
-

ADDRESSING

A ØMQ address string consists of two parts as follows: transport://endpoint. The transport part specifies the underlying transport protocol to use, and for the TCP transport shall be set to tcp. The meaning of the endpoint part for the TCP transport is defined below.

-
-

Assigning a local address to a socket

+

Assigning a local address to a socket

When assigning a local address to a socket using zmq_bind() with the tcp transport, the endpoint shall be interpreted as an interface followed by a colon and the TCP port number to use.

@@ -610,9 +626,7 @@ names exist, thus only the primary IPv4 address may be used to specify an interface.
-
-
-

Connecting a socket

+

Connecting a socket

When connecting a socket to a peer address using zmq_connect() with the tcp transport, the endpoint shall be interpreted as a peer address followed by a colon and the TCP port number to use.

@@ -630,9 +644,6 @@ The IPv4 address of the peer, in its numeric representation.
-
- -

WIRE FORMAT

ØMQ messages are transmitted over TCP in frames consisting of an encoded @@ -692,8 +703,6 @@ exceeding 254 octets:

+-+-+-+-+-+-+-+ ...
- -

EXAMPLES

@@ -720,8 +729,6 @@ rc = zmq_connect(socket, "tcp://server1:5555"); assert (rc == 0);
- -

SEE ALSO

zmq_bind(3) @@ -731,20 +738,17 @@ assert (rc == 0); zmq_inproc(7) zmq(7)

-
-

AUTHORS

This ØMQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and Martin Lucina <mato@kotelna.sk>.

-
diff --git a/doc/zmq_term.3 b/doc/zmq_term.3 index 8a741b0..c285f53 100644 --- a/doc/zmq_term.3 +++ b/doc/zmq_term.3 @@ -2,12 +2,12 @@ .\" Title: zmq_term .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 08/29/2011 +.\" Date: 09/08/2011 .\" Manual: 0MQ Manual -.\" Source: 0MQ 2.1.9 +.\" Source: 0MQ 2.1.10 .\" Language: English .\" -.TH "ZMQ_TERM" "3" "08/29/2011" "0MQ 2\&.1\&.9" "0MQ Manual" +.TH "ZMQ_TERM" "3" "09/08/2011" "0MQ 2\&.1\&.10" "0MQ Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/zmq_term.html b/doc/zmq_term.html index 3a948fe..6f6ecf1 100644 --- a/doc/zmq_term.html +++ b/doc/zmq_term.html @@ -2,28 +2,15 @@ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - - + + zmq_term(3) - +
-

SYNOPSIS

int zmq_term (void *context);

-
-

DESCRIPTION

The zmq_term() function shall terminate the ØMQ context context.

@@ -605,15 +622,11 @@ For each socket within context, all messages sent by the application

For further details regarding socket linger behaviour refer to the ZMQ_LINGER option in zmq_setsockopt(3).

-
-

RETURN VALUE

The zmq_term() function shall return zero if successful. Otherwise it shall return -1 and set errno to one of the values defined below.

-
-

ERRORS

@@ -635,8 +648,6 @@ Termination was interrupted by a signal. It can be restarted if needed.
-
-

SEE ALSO

zmq(7) @@ -644,20 +655,17 @@ Termination was interrupted by a signal. It can be restarted if needed. zmq_close(3) zmq_setsockopt(3)

-
-

AUTHORS

This ØMQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and Martin Lucina <mato@kotelna.sk>.

-
diff --git a/doc/zmq_version.3 b/doc/zmq_version.3 index c64f7d3..ba54ad6 100644 --- a/doc/zmq_version.3 +++ b/doc/zmq_version.3 @@ -2,12 +2,12 @@ .\" Title: zmq_version .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 08/29/2011 +.\" Date: 07/01/2011 .\" Manual: 0MQ Manual -.\" Source: 0MQ 2.1.9 +.\" Source: 0MQ 2.1.8 .\" Language: English .\" -.TH "ZMQ_VERSION" "3" "08/29/2011" "0MQ 2\&.1\&.9" "0MQ Manual" +.TH "ZMQ_VERSION" "3" "07/01/2011" "0MQ 2\&.1\&.8" "0MQ Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/zmq_version.html b/doc/zmq_version.html index 9a91e09..a1c0047 100644 --- a/doc/zmq_version.html +++ b/doc/zmq_version.html @@ -2,28 +2,15 @@ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - - + + zmq_version(3) - +
-

SYNOPSIS

void zmq_version (int *major, int *minor, int *patch);

-
-

DESCRIPTION

The zmq_version() function shall fill in the integer variables pointed to by @@ -576,20 +593,14 @@ components of the ØMQ library version.

dynamically linking to the ØMQ library that wish to determine the actual version of the ØMQ library they are using.

-
-

RETURN VALUE

There is no return value.

-
-

ERRORS

No errors are defined.

-
-

EXAMPLE

@@ -600,26 +611,21 @@ zmq_version (&major, &minor, &patch); printf ("Current 0MQ version is %d.%d.%d\n", major, minor, patch);
- -

SEE ALSO

zmq(7)

-
-

AUTHORS

This ØMQ manual page was written by Martin Sustrik <sustrik@250bpm.com> and Martin Lucina <mato@kotelna.sk>.

-
diff --git a/include/zmq.h b/include/zmq.h index a897888..0184569 100644 --- a/include/zmq.h +++ b/include/zmq.h @@ -55,7 +55,7 @@ extern "C" { /* Version macros for compile-time API version detection */ #define ZMQ_VERSION_MAJOR 2 #define ZMQ_VERSION_MINOR 1 -#define ZMQ_VERSION_PATCH 9 +#define ZMQ_VERSION_PATCH 10 #define ZMQ_MAKE_VERSION(major, minor, patch) \ ((major) * 10000 + (minor) * 100 + (patch)) diff --git a/src/err.hpp b/src/err.hpp index b540a5d..9558a10 100644 --- a/src/err.hpp +++ b/src/err.hpp @@ -21,6 +21,9 @@ #ifndef __ZMQ_ERR_HPP_INCLUDED__ #define __ZMQ_ERR_HPP_INCLUDED__ +// 0MQ-specific error codes are defined in zmq.h +#include "../include/zmq.h" + #include #include #include diff --git a/src/ip.cpp b/src/ip.cpp index 3ea1f29..206f0e9 100644 --- a/src/ip.cpp +++ b/src/ip.cpp @@ -18,23 +18,33 @@ along with this program. If not, see . */ +#include "ip.hpp" +#include "err.hpp" +#include "platform.hpp" +#include "stdint.hpp" #include #include #include #include -#include "../include/zmq.h" +#if defined ZMQ_HAVE_WINDOWS +#include "windows.hpp" +#else +#include +#include +#include +#include +#include +#include +#endif -#include "ip.hpp" -#include "platform.hpp" -#include "err.hpp" -#include "stdint.hpp" +#if defined ZMQ_HAVE_OPENVMS +#include +#endif #if defined ZMQ_HAVE_SOLARIS - #include #include -#include // On Solaris platform, network interface name can be queried by ioctl. static int resolve_nic_name (in_addr* addr_, char const *interface_) @@ -93,9 +103,6 @@ static int resolve_nic_name (in_addr* addr_, char const *interface_) } #elif defined ZMQ_HAVE_AIX || ZMQ_HAVE_HPUX || ZMQ_HAVE_ANDROID - -#include -#include #include #include @@ -177,6 +184,29 @@ static int resolve_nic_name (in_addr* addr_, char const *interface_) #endif +int zmq::open_socket (int domain_, int type_, int protocol_) +{ + // Setting this option result in sane behaviour when exec() functions + // are used. Old sockets are closed and don't block TCP ports etc. +#if defined SOCK_CLOEXEC + type_ |= SOCK_CLOEXEC; +#endif + + int s = socket (domain_, type_, protocol_); + if (s == -1) + return -1; + + // If there's no SOCK_CLOEXEC, let's try the second best option. Note that + // race condition can cause socket not to be closed (if fork happens + // between socket creation and this point). +#if !defined SOCK_CLOEXEC && defined FD_CLOEXEC + int rc = fcntl (s, F_SETFD, FD_CLOEXEC); + errno_assert (rc != -1); +#endif + + return s; +} + int zmq::resolve_ip_interface (sockaddr_storage* addr_, socklen_t *addr_len_, char const *interface_) { diff --git a/src/ip.hpp b/src/ip.hpp index ec2db43..1d44325 100644 --- a/src/ip.hpp +++ b/src/ip.hpp @@ -49,6 +49,8 @@ namespace zmq { + // Same as socket(2), but allows for transparent tweaking the options. + int open_socket (int domain_, int type_, int protocol_); // Resolves network interface name in : format. Symbol "*" // (asterisk) resolves to INADDR_ANY (all network interfaces). diff --git a/src/kqueue.cpp b/src/kqueue.cpp index e28ecd7..f173f84 100644 --- a/src/kqueue.cpp +++ b/src/kqueue.cpp @@ -73,7 +73,9 @@ void zmq::kqueue_t::kevent_delete (fd_t fd_, short filter_) EV_SET (&ev, fd_, filter_, EV_DELETE, 0, 0, 0); int rc = kevent (kqueue_fd, &ev, 1, NULL, 0, NULL); - errno_assert (rc != -1); + + if (rc == -1 && errno != ENOENT) + errno_assert (false); } zmq::kqueue_t::handle_t zmq::kqueue_t::add_fd (fd_t fd_, diff --git a/src/options.cpp b/src/options.cpp index 92887ab..952907b 100644 --- a/src/options.cpp +++ b/src/options.cpp @@ -19,9 +19,11 @@ */ #include +#ifndef ZMQ_HAVE_WINDOWS +#include +#endif #include "../include/zmq.h" - #include "options.hpp" #include "err.hpp" @@ -64,6 +66,12 @@ int zmq::options_t::setsockopt (int option_, const void *optval_, errno = EINVAL; return -1; } + // Check that SWAP directory (.) is writable + struct stat stat_buf; + if (stat (".", &stat_buf) || ((stat_buf.st_mode & S_IWRITE) == 0)) { + errno = EACCES; + return -1; + } swap = *((int64_t*) optval_); return 0; diff --git a/src/req.cpp b/src/req.cpp index 503f221..6a6b6a8 100644 --- a/src/req.cpp +++ b/src/req.cpp @@ -84,8 +84,12 @@ int zmq::req_t::xrecv (zmq_msg_t *msg_, int flags_) int rc = xreq_t::xrecv (msg_, flags_); if (rc != 0) return rc; - zmq_assert (msg_->flags & ZMQ_MSG_MORE); - zmq_assert (zmq_msg_size (msg_) == 0); + + // TODO: this should also close the connection with the peer + if (!(msg_->flags & ZMQ_MSG_MORE) || zmq_msg_size (msg_) != 0) { + errno = EAGAIN; + return -1; + } message_begins = false; } diff --git a/src/signaler.cpp b/src/signaler.cpp index fa2f123..7b66ea7 100644 --- a/src/signaler.cpp +++ b/src/signaler.cpp @@ -215,7 +215,7 @@ int zmq::signaler_t::make_fdpair (fd_t *r_, fd_t *w_) // Create listening socket. SOCKET listener; - listener = socket (AF_INET, SOCK_STREAM, 0); + listener = open_socket (AF_INET, SOCK_STREAM, 0); wsa_assert (listener != INVALID_SOCKET); // Set SO_REUSEADDR and TCP_NODELAY on listening socket. @@ -283,7 +283,7 @@ int zmq::signaler_t::make_fdpair (fd_t *r_, fd_t *w_) lcladdr.sin_addr.s_addr = htonl (INADDR_LOOPBACK); lcladdr.sin_port = 0; - int listener = socket (AF_INET, SOCK_STREAM, 0); + int listener = open_socket (AF_INET, SOCK_STREAM, 0); errno_assert (listener != -1); int on = 1; @@ -304,7 +304,7 @@ int zmq::signaler_t::make_fdpair (fd_t *r_, fd_t *w_) rc = listen (listener, 1); errno_assert (rc != -1); - *w_ = socket (AF_INET, SOCK_STREAM, 0); + *w_ = open_socket (AF_INET, SOCK_STREAM, 0); errno_assert (*w_ != -1); rc = setsockopt (*w_, IPPROTO_TCP, TCP_NODELAY, &on, sizeof (on)); diff --git a/src/socket_base.cpp b/src/socket_base.cpp index 2167b0b..335a858 100644 --- a/src/socket_base.cpp +++ b/src/socket_base.cpp @@ -364,10 +364,23 @@ int zmq::socket_base_t::connect (const char *addr_) if (rc != 0) return -1; + // Checks that protocol is valid and supported on this system rc = check_protocol (protocol); if (rc != 0) return -1; + // Parsed address for validation + sockaddr_storage addr; + socklen_t addr_len; + + if (protocol == "tcp") + rc = resolve_ip_hostname (&addr, &addr_len, address.c_str ()); + else + if (protocol == "ipc") + rc = resolve_local_path (&addr, &addr_len, address.c_str ()); + if (rc != 0) + return -1; + if (protocol == "inproc" || protocol == "sys") { // TODO: inproc connect is specific with respect to creating pipes diff --git a/src/tcp_connecter.cpp b/src/tcp_connecter.cpp index d6f73ca..6bc1b2d 100644 --- a/src/tcp_connecter.cpp +++ b/src/tcp_connecter.cpp @@ -50,7 +50,7 @@ int zmq::tcp_connecter_t::set_address (const char *protocol_, const char *addr_) return resolve_ip_hostname (&addr, &addr_len, addr_); errno = EPROTONOSUPPORT; - return -1; + return -1; } int zmq::tcp_connecter_t::open () @@ -58,7 +58,7 @@ int zmq::tcp_connecter_t::open () zmq_assert (s == retired_fd); // Create the socket. - s = socket (addr.ss_family, SOCK_STREAM, IPPROTO_TCP); + s = open_socket (addr.ss_family, SOCK_STREAM, IPPROTO_TCP); if (s == INVALID_SOCKET) { wsa_error_to_errno (); return -1; @@ -88,7 +88,7 @@ int zmq::tcp_connecter_t::open () errno = EAGAIN; return -1; } - + wsa_error_to_errno (); return -1; } @@ -162,7 +162,8 @@ int zmq::tcp_connecter_t::set_address (const char *protocol_, const char *addr_) { if (strcmp (protocol_, "tcp") == 0) return resolve_ip_hostname (&addr, &addr_len, addr_); - else if (strcmp (protocol_, "ipc") == 0) + else + if (strcmp (protocol_, "ipc") == 0) return resolve_local_path (&addr, &addr_len, addr_); errno = EPROTONOSUPPORT; @@ -177,7 +178,7 @@ int zmq::tcp_connecter_t::open () if (AF_UNIX != sa->sa_family) { // Create the socket. - s = socket (sa->sa_family, SOCK_STREAM, IPPROTO_TCP); + s = open_socket (sa->sa_family, SOCK_STREAM, IPPROTO_TCP); if (s == -1) return -1; @@ -233,13 +234,13 @@ int zmq::tcp_connecter_t::open () // Create the socket. zmq_assert (AF_UNIX == sa->sa_family); - s = socket (AF_UNIX, SOCK_STREAM, 0); + s = open_socket (AF_UNIX, SOCK_STREAM, 0); if (s == -1) return -1; // Set the non-blocking flag. int flag = fcntl (s, F_GETFL, 0); - if (flag == -1) + if (flag == -1) flag = 0; int rc = fcntl (s, F_SETFL, flag | O_NONBLOCK); errno_assert (rc != -1); diff --git a/src/tcp_listener.cpp b/src/tcp_listener.cpp index 8de564f..4bfaa85 100644 --- a/src/tcp_listener.cpp +++ b/src/tcp_listener.cpp @@ -176,7 +176,7 @@ int zmq::tcp_listener_t::set_address (const char *protocol_, const char *addr_, return -1; // Create a listening socket. - s = socket (addr.ss_family, SOCK_STREAM, IPPROTO_TCP); + s = open_socket (addr.ss_family, SOCK_STREAM, IPPROTO_TCP); if (s == -1) return -1; diff --git a/src/tcp_socket.cpp b/src/tcp_socket.cpp index e7a69e4..07159d8 100644 --- a/src/tcp_socket.cpp +++ b/src/tcp_socket.cpp @@ -79,7 +79,7 @@ int zmq::tcp_socket_t::write (const void *data, int size) // we'll get an error (this may happen during the speculative write). if (nbytes == SOCKET_ERROR && WSAGetLastError () == WSAEWOULDBLOCK) return 0; - + // Signalise peer failure. if (nbytes == -1 && ( WSAGetLastError () == WSAENETDOWN || @@ -119,7 +119,7 @@ int zmq::tcp_socket_t::read (void *data, int size) // Orderly shutdown by the other peer. if (nbytes == 0) - return -1; + return -1; return (size_t) nbytes; } @@ -200,6 +200,9 @@ int zmq::tcp_socket_t::write (const void *data, int size) if (nbytes == -1 && (errno == ECONNRESET || errno == EPIPE)) return -1; + if (nbytes == 1) + fprintf (stderr, "E: unhandled error on send: %d/%s\n", + errno, strerror (errno)); errno_assert (nbytes != -1); return (size_t) nbytes; } @@ -220,6 +223,9 @@ int zmq::tcp_socket_t::read (void *data, int size) errno == ETIMEDOUT || errno == EHOSTUNREACH)) return -1; + if (nbytes == 1) + fprintf (stderr, "E: unhandled error on recv: %d/%s\n", + errno, strerror (errno)); errno_assert (nbytes != -1); // Orderly shutdown by the other peer. diff --git a/zeromq.spec b/zeromq.spec index e99deaf..4b2621a 100644 --- a/zeromq.spec +++ b/zeromq.spec @@ -1,5 +1,5 @@ Name: zeromq -Version: 2.1.9 +Version: 2.1.10 Release: 1%{?dist} Summary: The ZeroMQ messaging library Group: Applications/Internet -- cgit v1.2.3