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