From 75af6aed482ab16997c1388fe801f74d11ec12a4 Mon Sep 17 00:00:00 2001 From: Martin Lucina Date: Mon, 23 Jan 2012 08:54:14 +0100 Subject: Imported Upstream version 2.1.9 --- AUTHORS | 3 + ChangeLog | 663 +++++++++++++++++++++++++++++++ MAINTAINERS | 14 +- NEWS | 89 ++++- aclocal.m4 | 4 +- autogen.sh | 8 +- builds/msvc/Makefile.am | 4 +- builds/msvc/Makefile.in | 4 +- builds/msvc/inproc_lat/inproc_lat.vcproj | 174 ++++++++ builds/msvc/inproc_thr/inproc_thr.vcproj | 174 ++++++++ builds/msvc/libzmq/libzmq.vcproj | 4 + config/ltmain.sh | 4 +- configure | 28 +- configure.in | 6 + doc/zmq.7 | 6 +- doc/zmq.html | 158 ++++---- doc/zmq_bind.3 | 11 +- doc/zmq_bind.html | 132 +++--- doc/zmq_bind.txt | 2 + doc/zmq_close.3 | 6 +- doc/zmq_close.html | 122 +++--- doc/zmq_connect.3 | 11 +- doc/zmq_connect.html | 132 +++--- doc/zmq_connect.txt | 2 + doc/zmq_cpp.7 | 6 +- doc/zmq_cpp.html | 236 ++++++----- doc/zmq_device.3 | 6 +- doc/zmq_device.html | 132 +++--- doc/zmq_epgm.7 | 10 +- doc/zmq_epgm.html | 136 ++++--- doc/zmq_epgm.txt | 4 +- doc/zmq_errno.3 | 6 +- doc/zmq_errno.html | 122 +++--- doc/zmq_getsockopt.3 | 8 +- doc/zmq_getsockopt.html | 198 +++++---- doc/zmq_getsockopt.txt | 2 +- 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 | 120 +++--- doc/zmq_msg_copy.3 | 6 +- doc/zmq_msg_copy.html | 120 +++--- 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 | 120 +++--- doc/zmq_msg_size.3 | 8 +- doc/zmq_msg_size.html | 124 +++--- doc/zmq_msg_size.txt | 2 +- doc/zmq_pgm.7 | 10 +- doc/zmq_pgm.html | 136 ++++--- doc/zmq_pgm.txt | 4 +- 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 | 8 +- doc/zmq_setsockopt.html | 190 +++++---- doc/zmq_setsockopt.txt | 2 +- doc/zmq_socket.3 | 10 +- doc/zmq_socket.html | 160 ++++---- doc/zmq_socket.txt | 4 +- doc/zmq_strerror.3 | 6 +- doc/zmq_strerror.html | 124 +++--- doc/zmq_tcp.7 | 8 +- doc/zmq_tcp.html | 132 +++--- doc/zmq_tcp.txt | 2 +- doc/zmq_term.3 | 6 +- doc/zmq_term.html | 122 +++--- doc/zmq_version.3 | 6 +- doc/zmq_version.html | 124 +++--- include/zmq.h | 4 +- perf/local_thr.cpp | 2 +- src/Makefile.am | 2 + src/Makefile.in | 28 +- src/config.hpp | 7 + src/ctx.cpp | 14 +- src/io_thread.cpp | 2 +- src/ip.cpp | 20 +- src/mailbox.cpp | 366 ++--------------- src/mailbox.hpp | 26 +- src/pgm_receiver.cpp | 4 +- src/pgm_sender.cpp | 8 +- src/pgm_socket.cpp | 8 +- src/pgm_socket.hpp | 7 +- src/platform.hpp.in | 3 + src/reaper.cpp | 2 +- src/rep.cpp | 2 +- src/select.cpp | 9 +- src/signaler.cpp | 344 ++++++++++++++++ src/signaler.hpp | 63 +++ src/socket_base.cpp | 79 +++- src/socket_base.hpp | 6 +- src/swap.cpp | 8 +- src/tcp_connecter.cpp | 3 +- src/tcp_socket.cpp | 5 + src/thread.cpp | 16 +- src/windows.hpp | 152 +++++-- src/xrep.cpp | 4 - src/zmq.cpp | 24 +- tests/test_shutdown_stress.cpp | 2 +- zeromq.spec | 2 +- 114 files changed, 4049 insertions(+), 2680 deletions(-) create mode 100644 builds/msvc/inproc_lat/inproc_lat.vcproj create mode 100644 builds/msvc/inproc_thr/inproc_thr.vcproj create mode 100644 src/signaler.cpp create mode 100644 src/signaler.hpp diff --git a/AUTHORS b/AUTHORS index 43768e5..7e785bf 100644 --- a/AUTHORS +++ b/AUTHORS @@ -10,6 +10,7 @@ Bob Beaty Brian Buchanan Brett Cameron Burak Arslan +Carl Clemens Chia-liang Kao Chris Rempel Chris Wong @@ -62,6 +63,8 @@ Thijs Terlouw Toralf Wittner Tore Halvorsen Vitaly Mayatskikh +Ghislain Putois +William Roberts Credits ======= diff --git a/ChangeLog b/ChangeLog index f15734e..2349d55 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,649 @@ # Generated by Makefile. Do not edit. +commit 392c3771c22d0dfe793cc9c4ee5c27d18d38d428 +Author: Pieter Hintjens +Date: Mon Aug 29 20:25:11 2011 +0200 + + Updated NEWS for 2.1.9 + + NEWS | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit bb7f41144b513ebf07698ade91c6d6c4e20bec77 +Author: Pieter Hintjens +Date: Mon Aug 29 12:24:45 2011 +0200 + + Fixed NEWS to reflect RC status of 2.1.8 + + NEWS | 7 +++++-- + 1 files changed, 5 insertions(+), 2 deletions(-) + +commit 4df43be69c3f25a4a5f96d379a59d6c6d6f214fa +Author: Martin Sustrik +Date: Wed Aug 17 18:41:02 2011 +0200 + + Fix the PGM support on win64 + + On win64 the size of file descriptor is not the same as size of int. + The bug in PGM transport caused a runtime error because of this. + The problem is fixed now. + + Signed-off-by: Martin Sustrik + + NEWS | 2 ++ + src/pgm_receiver.cpp | 4 ++-- + src/pgm_sender.cpp | 8 ++++---- + src/pgm_socket.cpp | 8 ++++---- + src/pgm_socket.hpp | 7 ++++--- + 5 files changed, 16 insertions(+), 13 deletions(-) + +commit 024c4c91098913c7488abde75e9ef0d3fee7e195 +Author: Pieter Hintjens +Date: Wed Aug 17 16:40:09 2011 +0200 + + Fixed compile error on win32 + + src/zmq.cpp | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 323138b81ca71e036200d666b95b96c9b6e58696 +Author: Pieter Hintjens +Date: Tue Aug 16 17:45:39 2011 +0200 + + Updated NEWS for Android build + + NEWS | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 7b22dccf2fed4cd057876912991fdd61954d6dbc +Author: Mikko Koppanen +Date: Mon Aug 15 19:09:04 2011 +0200 + + Added Android support + + Signed-off-by: Mikko Koppanen + + configure.in | 6 ++++++ + src/ip.cpp | 2 +- + src/swap.cpp | 2 +- + src/thread.cpp | 2 +- + 4 files changed, 9 insertions(+), 3 deletions(-) + +commit 591e5887e6e32675a7520eac67621416f13bec35 +Author: Martin Sustrik +Date: Sun Aug 14 14:23:16 2011 +0200 + + Fixed issue 238 + + NEWS | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +commit ebfdfdf298525c993b8827fe6c7b6f753c56ca52 +Author: Martin Sustrik +Date: Sun Aug 14 14:23:16 2011 +0200 + + select version zmq_poll reports invalid FDs + + Till now, passing invalid file descriptor to zmq_poll() + caused asseration. Now it returns error. + + Signed-off-by: Martin Sustrik + + src/zmq.cpp | 18 +++++++++++++----- + 1 files changed, 13 insertions(+), 5 deletions(-) + +commit d6fbb80a19056cad02ee32e465b12cb0ba29c419 +Author: Pieter Hintjens +Date: Sat Aug 13 00:27:13 2011 +0200 + + Fixed issue 239 + + NEWS | 3 +++ + src/swap.cpp | 2 -- + 2 files changed, 3 insertions(+), 2 deletions(-) + +commit 317435e2835b41d98a885883631d024422f5c9ff +Author: Pieter Hintjens +Date: Thu Aug 11 16:54:50 2011 +0200 + + usleep is void on Android + + src/zmq.cpp | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +commit 7239640d0282902af047d391b4a41fb5cc914bd1 +Author: wroberts +Date: Wed Aug 10 13:23:37 2011 -0400 + + Added an ndk-build clean command to clean script and fixed usleep error. + + - Fixed incorrect directory removal in clean script + + builds/android/clean.sh | 2 +- + src/zmq.cpp | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) + +commit eeca373616e347e947ff73f1cf8c11f7b53fc1a8 +Author: Pieter Hintjens +Date: Wed Aug 10 18:18:15 2011 +0200 + + Updated NEWS for Android + + NEWS | 11 ++++++++--- + 1 files changed, 8 insertions(+), 3 deletions(-) + +commit 880e5c324031bc390bc88d07f5137ce31d1c8c69 +Author: Pieter Hintjens +Date: Wed Aug 10 17:58:16 2011 +0200 + + Fixed use of ANDROID macro + + src/thread.cpp | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 98b96e7d8fd60605ad1498cd540b07dd7040f168 +Author: Pieter Hintjens +Date: Wed Aug 10 17:51:34 2011 +0200 + + Whitespace and comment changes + + builds/android/build.sh | 35 ++++++++++++++++++++++------------- + builds/android/clean.sh | 15 ++++++++++----- + 2 files changed, 32 insertions(+), 18 deletions(-) + +commit f2b76414f70d462e7863e4d79f61227d7315cf9d +Author: Pieter Hintjens +Date: Wed Aug 10 17:13:40 2011 +0200 + + Added William Roberts to AUTHORS + + AUTHORS | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit 7f2a522a85a2379120ad6d809be56b9f34e3b89b +Author: wroberts +Date: Tue Aug 9 19:24:11 2011 -0400 + + Finished with clean android build + + builds/android/Android.mk | 6 ++---- + builds/android/build.sh | 5 +++++ + builds/android/clean.sh | 14 +++++++++++--- + 3 files changed, 18 insertions(+), 7 deletions(-) + +commit 62a8d76aa32cc9579811f32d06cbc6ae0a00dbb2 +Author: wroberts +Date: Tue Aug 9 18:47:59 2011 -0400 + + Android wip + + builds/android/Android.mk | 42 ++ + builds/android/Application.mk | 1 + + builds/android/build.sh | 38 ++ + builds/android/clean.sh | 13 + + builds/android/include/platform.hpp | 1 + + builds/android/include/platform_android.hpp | 229 +++++++++ + builds/android/uuid/clear.c | 43 ++ + builds/android/uuid/compare.c | 55 +++ + builds/android/uuid/copy.c | 45 ++ + builds/android/uuid/gen_uuid.c | 680 +++++++++++++++++++++++++++ + builds/android/uuid/gen_uuid_nt.c | 92 ++++ + builds/android/uuid/isnull.c | 48 ++ + builds/android/uuid/pack.c | 69 +++ + builds/android/uuid/parse.c | 79 +++ + builds/android/uuid/unpack.c | 63 +++ + builds/android/uuid/unparse.c | 76 +++ + builds/android/uuid/uuid.h | 103 ++++ + builds/android/uuid/uuidP.h | 59 +++ + builds/android/uuid/uuid_time.c | 171 +++++++ + builds/android/uuid/uuidd.h | 54 +++ + 20 files changed, 1961 insertions(+), 0 deletions(-) + +commit ad6bf4aa3e77d8aec72951ac88e0e916c6e63a0d +Author: Pieter Hintjens +Date: Tue Aug 9 20:48:04 2011 +0200 + + Provisional Android support, from Ghislain Putois + + AUTHORS | 1 + + builds/android/Makefile | 10 ++++++++++ + src/ip.cpp | 20 ++++++++++---------- + src/swap.cpp | 6 +++--- + src/thread.cpp | 10 ++++++---- + 5 files changed, 30 insertions(+), 17 deletions(-) + +commit 9b2c16cb42fd559cfac1c86f420392a2e4cb7b2e +Author: Pieter Hintjens +Date: Sat Jul 30 17:26:42 2011 +0200 + + Fixed issue 236 + + NEWS | 11 +++++++++++ + src/socket_base.cpp | 4 ++++ + 2 files changed, 15 insertions(+), 0 deletions(-) + +commit b7d1b669ce9c3f27202b8daf46425766a877de3e +Author: Pieter Hintjens +Date: Thu Jul 28 14:07:25 2011 +0200 + + Debian packaging wasn't distributed + + NEWS | 6 ------ + 1 files changed, 0 insertions(+), 6 deletions(-) + +commit 764c4f5a8fa2f21d0f755811ba8b4c38c24e7ae5 +Author: Pieter Hintjens +Date: Thu Jul 28 13:52:55 2011 +0200 + + Updated version number for next release + + include/zmq.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 3c913026c72dd83e2d6ffbb6d9866a748502ffcf +Author: Pieter Hintjens +Date: Thu Jul 28 13:44:40 2011 +0200 + + Updated NEWS for 2.1.8 release + + NEWS | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 9d9fb596ab0eaa00da36f79b442d40fd42dfe4eb +Merge: 3cb929e 59a84ab +Author: Pieter Hintjens +Date: Fri Jul 22 11:38:32 2011 +0200 + + Merge branch 'master' of github.com:zeromq/zeromq2-1 + +commit 3cb929e46affd5ebf8c456acba594bae5c106cc8 +Author: Martin Sustrik +Date: Thu Jul 21 23:35:26 2011 +0200 + + mailbox::recv correctly passes EINTR to the caller + + This bug caused signal during blocking call to assert. + + Signed-off-by: Martin Sustrik + + NEWS | 3 +++ + src/mailbox.cpp | 2 +- + 2 files changed, 4 insertions(+), 1 deletions(-) + +commit 59a84abbfbb3be79d8f765da95de23ebdac16630 +Merge: 5227717 1b9bc37 +Author: Pieter Hintjens +Date: Wed Jul 20 16:40:12 2011 +0200 + + Merge branch 'master' of github.com:zeromq/zeromq2-1 + +commit 1b9bc37ff76826069de846fe0c3220b78b357e72 +Author: Pieter Hintjens +Date: Wed Jul 20 13:12:18 2011 +0200 + + Fixed build for MSVC + + builds/msvc/libzmq/libzmq.vcproj | 4 ++++ + src/signaler.cpp | 2 +- + 2 files changed, 5 insertions(+), 1 deletions(-) + +commit d897a2b45b422ff87da6007b06c6147e535491dd +Author: Pieter Hintjens +Date: Tue Jul 19 23:08:02 2011 +0200 + + Fixed build for Windows (signaler.cpp) + + src/signaler.cpp | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit 8dd8c71dab33bfd903e05d238b2e8ec507c23c7e +Author: Martin Sustrik +Date: Mon Jul 18 14:29:20 2011 +0200 + + Fixed email addresses in the MAITAINERS file + + Signed-off-by: Martin Sustrik + + MAINTAINERS | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +commit b69aee1b5e5aee9bdcab75aa1b5af88bfc7b0339 +Author: Pieter Hintjens +Date: Mon Jul 18 13:39:51 2011 +0200 + + Avoid SIGPIPE errors on FreeBSD + + MAINTAINERS | 8 ++++---- + src/tcp_socket.cpp | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 846769d809dea727bb6aeb58155aeb9afb357bce +Author: Martin Sustrik +Date: Mon Jul 18 09:41:26 2011 +0200 + + Signaler timeout bug on Windows fixed + + Signed-off-by: Martin Sustrik + + src/signaler.cpp | 12 ++++++++---- + 1 files changed, 8 insertions(+), 4 deletions(-) + +commit b613c297897cfca15024d493e181f4f1973b1abe +Author: Pieter Hintjens +Date: Mon Jul 18 11:53:58 2011 +0200 + + Avoid SIGPIPE errors on FreeBSD + + src/tcp_socket.cpp | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 5227717f9b8ccb8cf89967f470e017884edbd10f +Author: Pieter Hintjens +Date: Fri Jul 15 13:43:20 2011 +0200 + + ROUTER can talk to ZMQ_REP, DEALER to ZMQ_REQ + + doc/zmq_socket.txt | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit e496d49f57d6b3a377c11b6d5a58f175200ddbde +Author: Pieter Hintjens +Date: Fri Jul 15 07:08:00 2011 +0200 + + Updated NEWS for issue 230 + + NEWS | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +commit 5fd65d8f62e4c6e70b23a3e8f0195526b03a2e4f +Merge: a8c9eed 61233d0 +Author: Pieter Hintjens +Date: Fri Jul 15 07:06:42 2011 +0200 + + Merge branch 'issue230' + +commit a8c9eedc031ef68d01b5515ff1108bb7f5ada3ac +Merge: d17cae2 2c89920 +Author: Pieter Hintjens +Date: Thu Jul 14 23:29:15 2011 +0200 + + Merge branch 'master' of github.com:zeromq/zeromq2-1 + +commit d17cae20c5365fe2695b5e9027d8b91916eb9174 +Author: Pieter Hintjens +Date: Thu Jul 14 22:32:45 2011 +0200 + + Backported fix for issue 231 + + NEWS | 4 + + src/Makefile.am | 2 + + src/config.hpp | 7 + + src/ctx.cpp | 2 +- + src/io_thread.cpp | 2 +- + src/mailbox.cpp | 366 ++++------------------------------------ + src/mailbox.hpp | 26 ++- + src/reaper.cpp | 2 +- + src/signaler.cpp | 340 +++++++++++++++++++++++++++++++++++++ + src/signaler.hpp | 63 +++++++ + src/socket_base.cpp | 75 ++++++--- + src/socket_base.hpp | 6 +- + tests/test_shutdown_stress.cpp | 2 +- + 13 files changed, 529 insertions(+), 368 deletions(-) + +commit 2c899206691f528aa21ed52a4eb52ea7d59436cd +Author: Pieter Hintjens +Date: Thu Jul 14 22:32:45 2011 +0200 + + Backported fix for issue 231 + + src/Makefile.am | 2 + + src/config.hpp | 7 + + src/ctx.cpp | 2 +- + src/io_thread.cpp | 2 +- + src/mailbox.cpp | 366 ++++------------------------------------ + src/mailbox.hpp | 26 ++- + src/reaper.cpp | 2 +- + src/signaler.cpp | 340 +++++++++++++++++++++++++++++++++++++ + src/signaler.hpp | 63 +++++++ + src/socket_base.cpp | 75 ++++++--- + src/socket_base.hpp | 6 +- + tests/test_shutdown_stress.cpp | 2 +- + 12 files changed, 525 insertions(+), 368 deletions(-) + +commit 61233d00877dfb0322bb1a1fd3d7916a1e779d9b +Author: Pieter Hintjens +Date: Thu Jul 14 22:09:45 2011 +0200 + + Fixed issue 230 + + src/tcp_socket.cpp | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +commit a5972520e9961eaf6f6948036c99dbfd03812c1e +Author: Pieter Hintjens +Date: Wed Jul 13 18:10:54 2011 +0200 + + Fixed issue 228, backported from 3.0 + + NEWS | 2 ++ + src/rep.cpp | 2 +- + src/xrep.cpp | 4 ---- + 3 files changed, 3 insertions(+), 5 deletions(-) + +commit 647dca9650d54637a0e763216825875d1ac915d1 +Author: Martin Sustrik +Date: Mon Jul 11 16:05:04 2011 +0200 + + zmq_bind(3) and zmq_connect(3) describe EINVAL error + + Signed-off-by: Martin Sustrik + + doc/zmq_bind.txt | 2 ++ + doc/zmq_connect.txt | 2 ++ + 2 files changed, 4 insertions(+), 0 deletions(-) + +commit 89fc94cc7e3bb7f23c27dcc57877ec582f4af790 +Author: Pieter Hintjens +Date: Tue Jul 12 15:47:01 2011 +0200 + + Updated NEWS + + NEWS | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +commit 994dbe48e74ddfa30a66c46430e878e60dfdd61e +Author: Pieter Hintjens +Date: Tue Jul 12 15:45:38 2011 +0200 + + Removed debian packaging, it's now at http://packages.debian.org/source/sid/zeromq + + debian/README.Debian | 4 -- + debian/changelog | 24 ---------- + debian/compat | 1 - + debian/control | 76 -------------------------------- + debian/copyright | 105 -------------------------------------------- + debian/libzmq-dev.install | 5 -- + debian/libzmq-dev.manpages | 2 - + debian/libzmq0.install | 1 - + debian/libzmq0.manpages | 5 -- + debian/rules | 92 -------------------------------------- + debian/source/format | 1 - + debian/source/options | 1 - + debian/zeromq-bin.install | 3 - + debian/zeromq-bin.manpages | 3 - + 14 files changed, 0 insertions(+), 323 deletions(-) + +commit d27374c8346cdde9b0e77fb625249df6d185c6e0 +Author: Martin Sustrik +Date: Mon Jul 4 09:27:50 2011 +0200 + + License text in autogen.sh fixed + + autogen.sh incorrectly referred to the license as GPL. + Changed to LGPL. + + Signed-off-by: Martin Sustrik + + autogen.sh | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +commit c35a14beaba8d60e473f15d9978b075d33423a55 +Author: Martin Sustrik +Date: Thu Jun 30 00:05:03 2011 +0200 + + Testing for errors from pthread_* functions fixed + + pthread_* functions return the error number rather than + setting errno. This was not accounter for till now. + + Signed-off-by: Martin Sustrik + + src/thread.cpp | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +commit 257859d1175d361eb9064dc94d8ad80bed6eec58 +Author: Martin Sustrik +Date: Tue Jun 28 10:22:27 2011 +0200 + + Packaging for MSVC build fixed + + MSVC project files for inproc_lat and inproc_thr were not + packaged during make dist phase. + + Signed-off-by: Martin Sustrik + + builds/msvc/Makefile.am | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +commit a26c5bfe99dcc574e4899cc7472bffbc092511f5 +Author: Carl Clemens +Date: Sun Jun 26 16:19:45 2011 +0200 + + Typo in zmq_msg_size(3) fixed + + Signed-off-by: Carl Clemens + + AUTHORS | 1 + + doc/zmq_msg_size.txt | 2 +- + 2 files changed, 2 insertions(+), 1 deletions(-) + +commit fa6b54fccc281ed5f7d2d7b4f60c8f5f3f019167 +Merge: 21ea666 2008917 +Author: Pieter Hintjens +Date: Sun Jun 19 10:31:58 2011 +0200 + + Merge branch 'master' of github.com:zeromq/zeromq2-1 + +commit 21ea66635f5bc202ca64299d9f70687d224d55fc +Author: Steven McCoy +Date: Fri Jun 17 15:02:48 2011 -0400 + + Refactor Windows versioning and WinSock usage. + + Signed-off-by: Steven McCoy + + include/zmq.h | 2 +- + src/ctx.cpp | 12 +++-- + src/select.cpp | 9 ++-- + src/windows.hpp | 152 +++++++++++++++++++++++++++++++++++++++++++++---------- + 4 files changed, 138 insertions(+), 37 deletions(-) + +commit 20089170eabc1614d4b3e946ae9a363cfa8d3e47 +Author: Martin Sustrik +Date: Tue Jun 14 09:58:18 2011 +0200 + + Fixed issue 223 - ENETUNREACH is a valid error from connect + + This patch fixed the JIRA issue 223 + + Signed-off-by: Martin Sustrik + + NEWS | 4 ++++ + src/tcp_connecter.cpp | 3 ++- + 2 files changed, 6 insertions(+), 1 deletions(-) + +commit 0a533915b4cb2d3910ee3f128e882376e340f87b +Author: Pieter Hintjens +Date: Mon Jun 13 11:45:06 2011 +0200 + + Revert "Fix scope on Windows includes." + + This reverts commit c55e8b47b63ba69b7e240edd8270629f99a00b0d. + + src/ctx.cpp | 8 ++------ + src/select.cpp | 2 +- + src/select.hpp | 2 +- + src/windows.hpp | 5 +++-- + 4 files changed, 7 insertions(+), 10 deletions(-) + +commit c55e8b47b63ba69b7e240edd8270629f99a00b0d +Author: Steven McCoy +Date: Sun Jun 12 19:37:11 2011 +0200 + + Fix scope on Windows includes. + + Fix windows.h included before winsock2.h. + Remove definition of _WINSOCKAPI_. + + Signed-off-by: Steven McCoy + + src/ctx.cpp | 8 ++++++-- + src/select.cpp | 2 +- + src/select.hpp | 2 +- + src/windows.hpp | 5 ++--- + 4 files changed, 10 insertions(+), 7 deletions(-) + +commit 69bce48516554cb1f2ac5e52ebb59632ae967c48 +Author: Pieter Hintjens +Date: Thu Jun 9 19:55:21 2011 +0200 + + Fixed NEWS for broken 2.1.6 release + + NEWS | 42 ++++++++++++++++++++---------------------- + 1 files changed, 20 insertions(+), 22 deletions(-) + +commit 71012227f8615b398f755a82f73a70c61ba4fc55 +Merge: 143b64b 47245e1 +Author: Pieter Hintjens +Date: Thu May 26 11:07:51 2011 -0700 + + Merge branch 'master' of github.com:zeromq/zeromq2-1 + +commit 2f6bc9ce9260a3234a1f1de5c63956b081695f40 +Merge: 6a8b691 47245e1 +Author: Pieter Hintjens +Date: Mon May 23 12:53:30 2011 +0200 + + Merge branch 'master' of github.com:zeromq/zeromq2-1 + +commit 47245e189c81aa083824d732c238d64d5ea32fce +Merge: dae5a6c f94a700 +Author: Pieter Hintjens +Date: Mon May 23 03:47:04 2011 -0700 + + Merge pull request #19 from grk/patch-1 + + Fix overflow of megabits on 32bit machines. + +commit 6a8b691a3117e8d925ee29392c6463568f37108c +Author: Pieter Hintjens +Date: Fri May 20 17:22:42 2011 +0200 + + Prepared for 2.1.8 + + NEWS | 10 ++++++++++ + include/zmq.h | 2 +- + 2 files changed, 11 insertions(+), 1 deletions(-) + +commit f94a700626d2d7fc48fce2f0400c764416483e88 +Author: Grzesiek Kolodziejczyk +Date: Thu May 12 03:46:08 2011 -0700 + + Fix overflow of megabits on 32bit machines. + + perf/local_thr.cpp | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + commit c35f65a82f1dace3a0b9afc5185dc3efc35595b5 Author: Pieter Hintjens Date: Thu May 12 12:07:51 2011 +0200 @@ -9,6 +653,13 @@ Date: Thu May 12 12:07:51 2011 +0200 NEWS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) +commit 143b64bf5ccd59227135cf151a4dc3ed60384360 +Merge: 6bb9e7b dae5a6c +Author: Pieter Hintjens +Date: Tue May 10 08:05:23 2011 +0200 + + Merge branch 'master' of github.com:zeromq/zeromq2-1 + commit dae5a6cb9e589e2471558dc86c55202558e918c2 Author: Martin Sustrik Date: Sun May 8 09:03:49 2011 +0200 @@ -34,6 +685,18 @@ Date: Sat Apr 9 09:46:59 2011 +0200 include/zmq.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) +commit 6bb9e7b55db32090763c7f4a43bda8be24f29fd3 +Author: Pieter Hintjens +Date: Sat May 7 09:03:38 2011 +0200 + + Fixed spelling errors in man pages + + doc/zmq_getsockopt.txt | 2 +- + doc/zmq_pgm.txt | 4 ++-- + doc/zmq_setsockopt.txt | 2 +- + doc/zmq_tcp.txt | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) + commit 52318cf705f9b0a73e88b8296d10291f7ba22a86 Merge: c42d156 141a001 Author: Pieter Hintjens diff --git a/MAINTAINERS b/MAINTAINERS index 539c807..00f5030 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1,6 +1,6 @@ Component: Atomic Operations -Maintainer: Martin Lucina -Contact: mato@kotelna.sk +Maintainer: Martin Sustrik +Contact: sustrik@250bpm.com Component: Lock-free Algorithms Maintainer: Martin Sustrik @@ -38,13 +38,13 @@ Component: Generic Infrastructure (context, mailbox, command, pipe) Maintainer: Martin Sustrik Contact: sustrik@250bpm.com -Component: Reference manual -Maintainer: Martin Lucina -Contact: mato@kotelna.sk +Component: Documentation +Maintainer: Martin Sustrik +Contact: sustrik@250bpm.com Component: Autotools build system -Maintainer: Mikko Koppanen, Martin Lucina -Contact: mato@kotelna.sk +Maintainer: Mikko Koppanen +Contact: mikko.koppanen@gmail.com Component: MSVC build system Maintainer: Martin Sustrik diff --git a/NEWS b/NEWS index 8fc0892..9f7a789 100644 --- a/NEWS +++ b/NEWS @@ -1,46 +1,78 @@ -0MQ version 2.1.7 (Stable), released on 2011/05/12 +0MQ version 2.1.9 (Stable), released on 2011/08/29 ================================================== Bug fixes --------- -* Fixed issue 191, message atomicity issue with PUB sockets (an old issue). +* Fixed issue 240, assertion failure in pgm_socket.cpp:437. -* Fixed issue 199 (affected ROUTER/XREP sockets, an old issue). +* Fixed issue 238, assertion failure in zmq.cpp:655, when zmq_poll is + used on an empty set, on Windows. -* Fixed issue 206, assertion failure in zmq.cpp:223, affected all sockets - (bug was introduced in 2.1.6 as part of message validity checking). +* Fixed issue 239, assertion failure in zmq.cpp:223, when ZMQ_SWAP was + used with explicit identities and multiple SUB sockets. -* Fixed issue 211, REP socket asserted if sent malformed envelope (old issue - due to abuse of assertions for error checking). +* Fixed issue 236, zmq_send() and zmq_recv() did not always return + error conditions such as EFSM properly. This bug was introduced in + version 2.1.8 by the backport of changes for issue 231. -* Fixed issue 212, reconnect failing after resume from sleep on Windows - (due to not handling WSAENETDOWN). +Building +-------- -* Properly handle WSAENETUNREACH on Windows (e.g. if client connects - before server binds). +* 0MQ support for Android added (Bill Roberts, Mikko Koppanen). -Changes -------- -* Runtime checking of socket and context validity, to catch e.g. using a - socket after closing it, or passing an invalid pointer to context/socket - methods. +0MQ version 2.1.8 (RC), released on 2011/07/28 +============================================== -* Test cases moved off port 5555, which conflicts with other services. +Bug fixes +--------- -* Clarified zmq_poll man page that the resolution of the timeout is 1msec. +* Fixed issue 223, assertion failure in tcp_connecter.cpp:300 when + connecting to a server that is on an unreachable network (errno is + equal to ENETUNREACH). + +* Fixed issue 228, assertion failure at rep.cpp:88 when HWM was reached. +* Fixed issue 231, assertion failure at mailbox.cpp:183 when too many + pending socketpair operations were queued (major backport from 3.0). -0MQ version 2.1.6 (Stable), released on 2011/04/26 +* Fixed issue 234, assertion failure at mailbox.cpp:77 when Ctrl-C was + used (only affected git master following backport for 231). + +* Fixed issue 230, SIGPIPE killing servers when client disconnected, hit + OS/X only. + +Note: this release was renamed "release candidate" due to issue 236, +fixed in 2.1.9. + + +0MQ version 2.1.7 (Stable), released on 2011/05/12 ================================================== Bug fixes --------- -* Fixed memory leak with threads on Windows. +* Fixed issue 188, assert when closing socket that had unread multipart + data still on it (affected PULL, SUB, ROUTER, and DEALER sockets). -* Assert during SUB socket termination fixed. +* Fixed issue 191, message atomicity issue with PUB sockets (an old issue). + +* Fixed issue 199 (affected ROUTER/XREP sockets, an old issue). + +* Fixed issue 206, assertion failure in zmq.cpp:223, affected all sockets + (bug was introduced in 2.1.6 as part of message validity checking). + +* Fixed issue 211, REP socket asserted if sent malformed envelope (old issue + due to abuse of assertions for error checking). + +* Fixed issue 212, reconnect failing after resume from sleep on Windows + (due to not handling WSAENETDOWN). + +* Properly handle WSAENETUNREACH on Windows (e.g. if client connects + before server binds). + +* Fixed memory leak with threads on Windows. Changes ------- @@ -56,6 +88,21 @@ Changes * Added "--with-system-pgm" configure option to use already installed OpenPGM. +* Runtime checking of socket and context validity, to catch e.g. using a + socket after closing it, or passing an invalid pointer to context/socket + methods. + +* Test cases moved off port 5555, which conflicts with other services. + +* Clarified zmq_poll man page that the resolution of the timeout is 1msec. + + +0MQ version 2.1.6 (Broken), released on 2011/04/26 +================================================== + +Note that this version contained a malformed patch and is not usable. +It is not available for download, but is available in the git via the +2.1.6 tag. 0MQ version 2.1.5 (Broken), released on 2011/04/20 ================================================== diff --git a/aclocal.m4 b/aclocal.m4 index bd741d2..f9e8889 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/autogen.sh b/autogen.sh index 2cc40b9..d03084b 100755 --- a/autogen.sh +++ b/autogen.sh @@ -5,17 +5,17 @@ # # This file is part of 0MQ. # -# 0MQ is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by +# 0MQ is free software; you can redistribute it and/or modify it under +# the terms of the GNU Lesser General Public License as published by # the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # 0MQ is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# GNU Lesser General Public License for more details. # -# You should have received a copy of the GNU General Public License +# You should have received a copy of the GNU Lesser General Public License # along with this program. If not, see . # Script to generate all required files from fresh git checkout. diff --git a/builds/msvc/Makefile.am b/builds/msvc/Makefile.am index 9ce00aa..0b0af6f 100644 --- a/builds/msvc/Makefile.am +++ b/builds/msvc/Makefile.am @@ -3,6 +3,8 @@ LIBZMQ_DIST = libzmq/libzmq.vcproj platform.hpp msvc.sln PERF_DIST = c_local_thr/c_local_thr.vcproj \ c_remote_thr/c_remote_thr.vcproj \ c_local_lat/c_local_lat.vcproj \ - c_remote_lat/c_remote_lat.vcproj + c_remote_lat/c_remote_lat.vcproj \ + inproc_lat/inproc_lat.vcproj \ + inproc_thr/inproc_thr.vcproj EXTRA_DIST = $(LIBZMQ_DIST) $(PERF_DIST) diff --git a/builds/msvc/Makefile.in b/builds/msvc/Makefile.in index 20d9e1d..6283062 100644 --- a/builds/msvc/Makefile.in +++ b/builds/msvc/Makefile.in @@ -197,7 +197,9 @@ LIBZMQ_DIST = libzmq/libzmq.vcproj platform.hpp msvc.sln PERF_DIST = c_local_thr/c_local_thr.vcproj \ c_remote_thr/c_remote_thr.vcproj \ c_local_lat/c_local_lat.vcproj \ - c_remote_lat/c_remote_lat.vcproj + c_remote_lat/c_remote_lat.vcproj \ + inproc_lat/inproc_lat.vcproj \ + inproc_thr/inproc_thr.vcproj EXTRA_DIST = $(LIBZMQ_DIST) $(PERF_DIST) all: all-am diff --git a/builds/msvc/inproc_lat/inproc_lat.vcproj b/builds/msvc/inproc_lat/inproc_lat.vcproj new file mode 100644 index 0000000..15549ff --- /dev/null +++ b/builds/msvc/inproc_lat/inproc_lat.vcproj @@ -0,0 +1,174 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/builds/msvc/inproc_thr/inproc_thr.vcproj b/builds/msvc/inproc_thr/inproc_thr.vcproj new file mode 100644 index 0000000..96415c9 --- /dev/null +++ b/builds/msvc/inproc_thr/inproc_thr.vcproj @@ -0,0 +1,174 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/builds/msvc/libzmq/libzmq.vcproj b/builds/msvc/libzmq/libzmq.vcproj index c774ac2..370223d 100644 --- a/builds/msvc/libzmq/libzmq.vcproj +++ b/builds/msvc/libzmq/libzmq.vcproj @@ -394,6 +394,10 @@ RelativePath="..\..\..\src\session.cpp" > + + diff --git a/config/ltmain.sh b/config/ltmain.sh index 7ed280b..fa4b1e1 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-2ubuntu1 +# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu3 # automake: $automake_version # autoconf: $autoconf_version # @@ -73,7 +73,7 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION="2.2.6b Debian-2.2.6b-2ubuntu1" +VERSION="2.2.6b Debian-2.2.6b-2ubuntu3" TIMESTAMP="" package_revision=1.3017 diff --git a/configure b/configure index 1344c83..edd17fa 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.7. +# Generated by GNU Autoconf 2.67 for zeromq 2.1.9. # # Report bugs to . # @@ -701,8 +701,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='zeromq' PACKAGE_TARNAME='zeromq' -PACKAGE_VERSION='2.1.7' -PACKAGE_STRING='zeromq 2.1.7' +PACKAGE_VERSION='2.1.9' +PACKAGE_STRING='zeromq 2.1.9' 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.7 to adapt to many kinds of systems. +\`configure' configures zeromq 2.1.9 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.7:";; + short | recursive ) echo "Configuration of zeromq 2.1.9:";; 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.7 +zeromq configure 2.1.9 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.7, which was +It was created by zeromq $as_me 2.1.9, 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.7' + VERSION='2.1.9' cat >>confdefs.h <<_ACEOF @@ -16207,6 +16207,14 @@ else as_fn_error $? "cannot link with -luuid, install uuid-dev." "$LINENO" 5 fi + + case "${host_os}" in + *android*) + +$as_echo "#define ZMQ_HAVE_ANDROID 1" >>confdefs.h + + ;; + esac ;; *solaris*) # Define on Solaris to enable all library features @@ -19405,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.7, which was +This file was extended by zeromq $as_me 2.1.9, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19471,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.7 +zeromq config.status 2.1.9 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff --git a/configure.in b/configure.in index 25d3c93..0f9b358 100644 --- a/configure.in +++ b/configure.in @@ -91,6 +91,12 @@ case "${host_os}" in AC_CHECK_LIB(rt, sem_init) AC_CHECK_LIB(uuid, uuid_generate, , [AC_MSG_ERROR([cannot link with -luuid, install uuid-dev.])]) + + case "${host_os}" in + *android*) + AC_DEFINE(ZMQ_HAVE_ANDROID, 1, [Have Android OS]) + ;; + esac ;; *solaris*) # Define on Solaris to enable all library features diff --git a/doc/zmq.7 b/doc/zmq.7 index 60394d0..07ec236 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: 05/06/2011 +.\" Date: 08/29/2011 .\" Manual: 0MQ Manual -.\" Source: 0MQ 2.1.6 +.\" Source: 0MQ 2.1.9 .\" Language: English .\" -.TH "ZMQ" "7" "05/06/2011" "0MQ 2\&.1\&.6" "0MQ Manual" +.TH "ZMQ" "7" "08/29/2011" "0MQ 2\&.1\&.9" "0MQ Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/zmq.html b/doc/zmq.html index b35c57e..bce168f 100644 --- a/doc/zmq.html +++ b/doc/zmq.html @@ -2,15 +2,28 @@ "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 @@ -596,7 +579,8 @@ 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:

@@ -618,6 +602,7 @@ 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 @@ -628,12 +613,17 @@ 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 @@ -677,7 +667,9 @@ 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.

@@ -731,7 +723,9 @@ 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.

@@ -770,13 +764,18 @@ 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 @@ -790,6 +789,8 @@ 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:

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

LANGUAGE BINDINGS

The ØMQ library provides interfaces suitable for calling from programs in any @@ -811,23 +814,33 @@ 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 @@ -835,11 +848,12 @@ 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 ce589e9..997f7a0 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: 05/07/2011 +.\" Date: 08/29/2011 .\" Manual: 0MQ Manual -.\" Source: 0MQ 2.1.6 +.\" Source: 0MQ 2.1.9 .\" Language: English .\" -.TH "ZMQ_BIND" "3" "05/07/2011" "0MQ 2\&.1\&.6" "0MQ Manual" +.TH "ZMQ_BIND" "3" "08/29/2011" "0MQ 2\&.1\&.9" "0MQ Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -70,6 +70,11 @@ With the exception of \fIZMQ_PAIR\fR sockets, a single socket may be connected t The \fIzmq_bind()\fR function shall return zero if successful\&. Otherwise it shall return \-1 and set \fIerrno\fR to one of the values defined below\&. .SH "ERRORS" .PP +\fBEINVAL\fR +.RS 4 +The endpoint supplied is invalid\&. +.RE +.PP \fBEPROTONOSUPPORT\fR .RS 4 The requested diff --git a/doc/zmq_bind.html b/doc/zmq_bind.html index 034113d..ef04708 100644 --- a/doc/zmq_bind.html +++ b/doc/zmq_bind.html @@ -2,15 +2,28 @@ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - - + + zmq_bind(3)