diff options
| -rw-r--r-- | AUTHORS | 2 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | builds/msvc/libzmq/libzmq.vcproj | 84 | ||||
| -rw-r--r-- | builds/msvc/platform.hpp | 4 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | doc/zmq_cpp.txt | 2 | ||||
| -rw-r--r-- | include/zmq.h | 70 | ||||
| -rw-r--r-- | perf/remote_thr.cpp | 8 | ||||
| -rw-r--r-- | src/Makefile.am | 43 | ||||
| -rw-r--r-- | src/app_thread.cpp | 195 | ||||
| -rw-r--r-- | src/app_thread.hpp | 88 | ||||
| -rw-r--r-- | src/array.hpp (renamed from src/yarray.hpp) | 66 | ||||
| -rw-r--r-- | src/command.hpp | 17 | ||||
| -rw-r--r-- | src/config.hpp | 9 | ||||
| -rw-r--r-- | src/connect_session.cpp | 111 | ||||
| -rw-r--r-- | src/connect_session.hpp | 60 | ||||
| -rw-r--r-- | src/ctx.cpp | 285 | ||||
| -rw-r--r-- | src/ctx.hpp | 109 | ||||
| -rw-r--r-- | src/decoder.cpp (renamed from src/zmq_decoder.cpp) | 37 | ||||
| -rw-r--r-- | src/decoder.hpp | 47 | ||||
| -rw-r--r-- | src/encoder.cpp (renamed from src/zmq_encoder.cpp) | 24 | ||||
| -rw-r--r-- | src/encoder.hpp | 39 | ||||
| -rw-r--r-- | src/forwarder.cpp | 17 | ||||
| -rw-r--r-- | src/fq.cpp | 56 | ||||
| -rw-r--r-- | src/fq.hpp | 26 | ||||
| -rw-r--r-- | src/i_engine.hpp | 17 | ||||
| -rw-r--r-- | src/i_inout.hpp | 21 | ||||
| -rw-r--r-- | src/i_terminate_events.hpp (renamed from src/zmq_encoder.hpp) | 35 | ||||
| -rw-r--r-- | src/io_object.cpp | 22 | ||||
| -rw-r--r-- | src/io_object.hpp | 10 | ||||
| -rw-r--r-- | src/io_thread.cpp | 5 | ||||
| -rw-r--r-- | src/io_thread.hpp | 2 | ||||
| -rw-r--r-- | src/lb.cpp | 36 | ||||
| -rw-r--r-- | src/lb.hpp | 24 | ||||
| -rw-r--r-- | src/named_session.cpp | 88 | ||||
| -rw-r--r-- | src/named_session.hpp (renamed from src/zmq_decoder.hpp) | 41 | ||||
| -rw-r--r-- | src/object.cpp | 118 | ||||
| -rw-r--r-- | src/object.hpp | 48 | ||||
| -rw-r--r-- | src/own.cpp | 203 | ||||
| -rw-r--r-- | src/own.hpp | 135 | ||||
| -rw-r--r-- | src/owned.cpp | 71 | ||||
| -rw-r--r-- | src/owned.hpp | 89 | ||||
| -rw-r--r-- | src/pair.cpp | 87 | ||||
| -rw-r--r-- | src/pair.hpp | 29 | ||||
| -rw-r--r-- | src/pgm_receiver.cpp | 14 | ||||
| -rw-r--r-- | src/pgm_receiver.hpp | 13 | ||||
| -rw-r--r-- | src/pgm_sender.cpp | 12 | ||||
| -rw-r--r-- | src/pgm_sender.hpp | 11 | ||||
| -rw-r--r-- | src/pipe.cpp | 407 | ||||
| -rw-r--r-- | src/pipe.hpp | 147 | ||||
| -rw-r--r-- | src/pub.cpp | 77 | ||||
| -rw-r--r-- | src/pub.hpp | 29 | ||||
| -rw-r--r-- | src/pull.cpp | 50 | ||||
| -rw-r--r-- | src/pull.hpp | 21 | ||||
| -rw-r--r-- | src/push.cpp | 52 | ||||
| -rw-r--r-- | src/push.hpp | 21 | ||||
| -rw-r--r-- | src/queue.cpp | 15 | ||||
| -rw-r--r-- | src/rep.cpp | 238 | ||||
| -rw-r--r-- | src/rep.hpp | 43 | ||||
| -rw-r--r-- | src/req.cpp | 234 | ||||
| -rw-r--r-- | src/req.hpp | 48 | ||||
| -rw-r--r-- | src/semaphore.hpp | 186 | ||||
| -rw-r--r-- | src/session.cpp | 232 | ||||
| -rw-r--r-- | src/session.hpp | 93 | ||||
| -rw-r--r-- | src/socket_base.cpp | 749 | ||||
| -rw-r--r-- | src/socket_base.hpp | 171 | ||||
| -rw-r--r-- | src/streamer.cpp | 17 | ||||
| -rw-r--r-- | src/sub.cpp | 42 | ||||
| -rw-r--r-- | src/sub.hpp | 22 | ||||
| -rw-r--r-- | src/swap.cpp (renamed from src/msg_store.cpp) | 33 | ||||
| -rw-r--r-- | src/swap.hpp (renamed from src/msg_store.hpp) | 28 | ||||
| -rw-r--r-- | src/thread.cpp | 20 | ||||
| -rw-r--r-- | src/thread.hpp | 9 | ||||
| -rw-r--r-- | src/transient_session.cpp | 36 | ||||
| -rw-r--r-- | src/transient_session.hpp (renamed from src/i_endpoint.hpp) | 30 | ||||
| -rw-r--r-- | src/trie.cpp (renamed from src/prefix_tree.cpp) | 36 | ||||
| -rw-r--r-- | src/trie.hpp (renamed from src/prefix_tree.hpp) | 17 | ||||
| -rw-r--r-- | src/xrep.cpp | 84 | ||||
| -rw-r--r-- | src/xrep.hpp | 30 | ||||
| -rw-r--r-- | src/xreq.cpp | 40 | ||||
| -rw-r--r-- | src/xreq.hpp | 19 | ||||
| -rw-r--r-- | src/yarray_item.hpp | 64 | ||||
| -rw-r--r-- | src/zmq.cpp | 373 | ||||
| -rw-r--r-- | src/zmq_connecter.cpp | 50 | ||||
| -rw-r--r-- | src/zmq_connecter.hpp | 25 | ||||
| -rw-r--r-- | src/zmq_engine.cpp | 55 | ||||
| -rw-r--r-- | src/zmq_engine.hpp | 23 | ||||
| -rw-r--r-- | src/zmq_init.cpp | 140 | ||||
| -rw-r--r-- | src/zmq_init.hpp | 33 | ||||
| -rw-r--r-- | src/zmq_listener.cpp | 24 | ||||
| -rw-r--r-- | src/zmq_listener.hpp | 13 | ||||
| -rw-r--r-- | tests/Makefile.am | 19 | ||||
| -rw-r--r-- | tests/test_pair_inproc.cpp | 30 | ||||
| -rw-r--r-- | tests/test_pair_ipc.cpp | 30 | ||||
| -rw-r--r-- | tests/test_pair_tcp.cpp | 30 | ||||
| -rw-r--r-- | tests/test_reqrep_inproc.cpp | 30 | ||||
| -rw-r--r-- | tests/test_reqrep_ipc.cpp | 30 | ||||
| -rw-r--r-- | tests/test_reqrep_tcp.cpp | 30 | ||||
| -rw-r--r-- | tests/testutil.hpp | 129 |
99 files changed, 3691 insertions, 3251 deletions
@@ -15,6 +15,8 @@ Erik Rigtorp <erik@rigtorp.com> Frank Denis <zeromq@pureftpd.org> George Neill <georgen@neillnet.com> Gonzalo Diethelm <gdiethelm@dcv.cl> +Guido Goldstein <zmq@a-nugget.de> +Ivo Danihelka <ivo@danihelka.net> Joe Thornber <joe.thornber@gmail.com> Jon Dyte <jon@totient.co.uk> Kamil Shakirov <kamils80@gmail.com> diff --git a/Makefile.am b/Makefile.am index 18775fd..1236874 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ACLOCAL_AMFLAGS = -I config -SUBDIRS = src doc perf devices -DIST_SUBDIRS = src doc perf devices builds/msvc +SUBDIRS = src doc perf devices tests +DIST_SUBDIRS = src doc perf devices tests builds/msvc EXTRA_DIST = \ $(top_srcdir)/foreign/openpgm/@pgm_basename@.tar.gz \ diff --git a/builds/msvc/libzmq/libzmq.vcproj b/builds/msvc/libzmq/libzmq.vcproj index 95db1df..c7b256a 100644 --- a/builds/msvc/libzmq/libzmq.vcproj +++ b/builds/msvc/libzmq/libzmq.vcproj @@ -170,11 +170,11 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > <File - RelativePath="..\..\..\src\app_thread.cpp" + RelativePath="..\..\..\src\command.cpp" > </File> <File - RelativePath="..\..\..\src\command.cpp" + RelativePath="..\..\..\src\connect_session.cpp" > </File> <File @@ -182,11 +182,15 @@ > </File> <File + RelativePath="..\..\..\src\decoder.cpp" + > + </File> + <File RelativePath="..\..\..\src\devpoll.cpp" > </File> <File - RelativePath="..\..\..\src\push.cpp" + RelativePath="..\..\..\src\encoder.cpp" > </File> <File @@ -226,7 +230,7 @@ > </File> <File - RelativePath="..\..\..\src\msg_store.cpp" + RelativePath="..\..\..\src\named_session.cpp" > </File> <File @@ -238,7 +242,7 @@ > </File> <File - RelativePath="..\..\..\src\owned.cpp" + RelativePath="..\..\..\src\own.cpp" > </File> <File @@ -266,11 +270,15 @@ > </File> <File - RelativePath="..\..\..\src\prefix_tree.cpp" + RelativePath="..\..\..\src\pub.cpp" > </File> <File - RelativePath="..\..\..\src\pub.cpp" + RelativePath="..\..\..\src\pull.cpp" + > + </File> + <File + RelativePath="..\..\..\src\push.cpp" > </File> <File @@ -310,6 +318,10 @@ > </File> <File + RelativePath="..\..\..\src\swap.cpp" + > + </File> + <File RelativePath="..\..\..\src\tcp_connecter.cpp" > </File> @@ -326,7 +338,11 @@ > </File> <File - RelativePath="..\..\..\src\pull.cpp" + RelativePath="..\..\..\src\transient_session.cpp" + > + </File> + <File + RelativePath="..\..\..\src\trie.cpp" > </File> <File @@ -350,14 +366,6 @@ > </File> <File - RelativePath="..\..\..\src\zmq_decoder.cpp" - > - </File> - <File - RelativePath="..\..\..\src\zmq_encoder.cpp" - > - </File> - <File RelativePath="..\..\..\src\zmq_engine.cpp" > </File> @@ -376,10 +384,6 @@ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" > <File - RelativePath="..\..\..\src\app_thread.hpp" - > - </File> - <File RelativePath="..\..\..\src\atomic_counter.hpp" > </File> @@ -396,19 +400,19 @@ > </File> <File - RelativePath="..\..\..\src\ctx.hpp" + RelativePath="..\..\..\src\connect_session.hpp" > </File> <File - RelativePath="..\..\..\src\decoder.hpp" + RelativePath="..\..\..\src\ctx.hpp" > </File> <File - RelativePath="..\..\..\src\devpoll.hpp" + RelativePath="..\..\..\src\decoder.hpp" > </File> <File - RelativePath="..\..\..\src\push.hpp" + RelativePath="..\..\..\src\devpoll.hpp" > </File> <File @@ -476,11 +480,11 @@ > </File> <File - RelativePath="..\..\..\src\msg_store.hpp" + RelativePath="..\..\..\src\mutex.hpp" > </File> <File - RelativePath="..\..\..\src\mutex.hpp" + RelativePath="..\..\..\src\named_session.hpp" > </File> <File @@ -492,7 +496,7 @@ > </File> <File - RelativePath="..\..\..\src\owned.hpp" + RelativePath="..\..\..\src\own.hpp" > </File> <File @@ -524,11 +528,15 @@ > </File> <File - RelativePath="..\..\..\src\prefix_tree.hpp" + RelativePath="..\..\..\src\pub.hpp" > </File> <File - RelativePath="..\..\..\src\pub.hpp" + RelativePath="..\..\..\src\pull.hpp" + > + </File> + <File + RelativePath="..\..\..\src\push.hpp" > </File> <File @@ -572,6 +580,10 @@ > </File> <File + RelativePath="..\..\..\src\swap.hpp" + > + </File> + <File RelativePath="..\..\..\src\tcp_connecter.hpp" > </File> @@ -588,7 +600,11 @@ > </File> <File - RelativePath="..\..\..\src\pull.hpp" + RelativePath="..\..\..\src\transient_session.hpp" + > + </File> + <File + RelativePath="..\..\..\src\trie.hpp" > </File> <File @@ -624,14 +640,6 @@ > </File> <File - RelativePath="..\..\..\src\zmq_decoder.hpp" - > - </File> - <File - RelativePath="..\..\..\src\zmq_encoder.hpp" - > - </File> - <File RelativePath="..\..\..\src\zmq_engine.hpp" > </File> diff --git a/builds/msvc/platform.hpp b/builds/msvc/platform.hpp index 77428a1..4c9cd3a 100644 --- a/builds/msvc/platform.hpp +++ b/builds/msvc/platform.hpp @@ -27,8 +27,8 @@ // 0MQ version information #define PACKAGE_VERSION_MAJOR 2 -#define PACKAGE_VERSION_MINOR 0 -#define PACKAGE_VERSION_PATCH 9 +#define PACKAGE_VERSION_MINOR 1 +#define PACKAGE_VERSION_PATCH 0 #define ZMQ_HAVE_WINDOWS diff --git a/configure.in b/configure.in index c365778..61d22da 100644 --- a/configure.in +++ b/configure.in @@ -6,7 +6,7 @@ AC_PREREQ(2.61) # The version in git should reflect the *next* version planned. # Version must be MAJOR.MINOR.PATCH otherwise things will break. # -AC_INIT([zeromq],[2.0.9],[zeromq-dev@lists.zeromq.org]) +AC_INIT([zeromq],[2.1.0],[zeromq-dev@lists.zeromq.org]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_MACRO_DIR(config) @@ -374,7 +374,7 @@ AC_OUTPUT(Makefile src/Makefile doc/Makefile perf/Makefile src/libzmq.pc \ devices/Makefile devices/zmq_forwarder/Makefile \ devices/zmq_streamer/Makefile devices/zmq_queue/Makefile \ - builds/msvc/Makefile) + builds/msvc/Makefile tests/Makefile) # On Linux patch libtool to delete hardcoded paths (rpath). case "${host_os}" in diff --git a/doc/zmq_cpp.txt b/doc/zmq_cpp.txt index e25f460..668eff5 100644 --- a/doc/zmq_cpp.txt +++ b/doc/zmq_cpp.txt @@ -102,11 +102,13 @@ Maps to the _zmq_connect()_ function, as described in linkzmq:zmq_connect[3]. *bool socket_t::send(message_t '&msg', int 'flags' = 0)* Maps to the _zmq_send()_ function, as described in linkzmq:zmq_send[3]. +Returns true if message is successfully sent, false if it is not. [verse] *bool socket_t::recv(message_t '*msg', int 'flags' = 0)* |