rbczmq 1.7.1 → 1.7.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/.gitmodules +1 -1
- data/CHANGELOG.rdoc +4 -0
- data/Gemfile.lock +1 -1
- data/README.rdoc +5 -4
- data/ext/czmq/.gitignore +5 -0
- data/ext/czmq/.travis.yml +10 -1
- data/ext/czmq/AUTHORS +2 -0
- data/ext/czmq/COPYING.LESSER +3 -0
- data/ext/czmq/Makefile.am +13 -3
- data/ext/czmq/NEWS +132 -0
- data/ext/czmq/README.md +1553 -615
- data/ext/czmq/README.txt +188 -72
- data/ext/czmq/addons/Makefile.am +9 -0
- data/ext/czmq/addons/makecert.c +72 -0
- data/ext/czmq/builds/mingw32/Makefile.mingw32 +11 -3
- data/ext/czmq/builds/msvc/.gitignore +4 -1
- data/ext/czmq/builds/msvc/czmq.vcproj +4 -0
- data/ext/czmq/builds/msvc/czmq.vcxproj +6 -1
- data/ext/czmq/builds/msvc/czmq.vcxproj.filters +4 -1
- data/ext/{zeromq/cmake/Modules/zmq_version.cpp → czmq/builds/msvc/platform.h} +10 -9
- data/ext/czmq/configure.ac +64 -5
- data/ext/czmq/doc/Makefile.am +8 -1
- data/ext/czmq/doc/mkmans +17 -0
- data/ext/czmq/doc/zauth.txt +191 -0
- data/ext/czmq/doc/zbeacon.txt +13 -22
- data/ext/czmq/doc/zcert.txt +122 -0
- data/ext/czmq/doc/zcertstore.txt +107 -0
- data/ext/czmq/doc/zchunk.txt +77 -0
- data/ext/czmq/doc/zclock.txt +8 -0
- data/ext/czmq/doc/zconfig.txt +9 -63
- data/ext/czmq/doc/zctx.txt +26 -7
- data/ext/czmq/doc/zdir.txt +83 -0
- data/ext/czmq/doc/zfile.txt +130 -35
- data/ext/czmq/doc/zframe.txt +6 -39
- data/ext/czmq/doc/zhash.txt +55 -10
- data/ext/czmq/doc/zlist.txt +2 -4
- data/ext/czmq/doc/zloop.txt +7 -1
- data/ext/czmq/doc/zmsg.txt +75 -32
- data/ext/czmq/doc/zpoller.txt +88 -0
- data/ext/czmq/doc/zsocket.txt +50 -1
- data/ext/czmq/doc/zsockopt.txt +185 -251
- data/ext/czmq/doc/zstr.txt +14 -3
- data/ext/czmq/doc/zsys.txt +89 -1
- data/ext/czmq/doc/ztree.txt +21 -11
- data/ext/czmq/examples/security/LICENSE +18 -0
- data/ext/czmq/examples/security/README.txt +9 -0
- data/ext/czmq/examples/security/grasslands.c +29 -0
- data/ext/czmq/examples/security/hello.c +10 -0
- data/ext/czmq/examples/security/ironhouse.c +55 -0
- data/ext/czmq/examples/security/ironhouse2.c +103 -0
- data/ext/czmq/examples/security/stonehouse.c +51 -0
- data/ext/czmq/examples/security/strawhouse.c +44 -0
- data/ext/czmq/examples/security/woodhouse.c +40 -0
- data/ext/czmq/images/README_1.png +0 -0
- data/ext/czmq/images/README_2.png +0 -0
- data/ext/czmq/include/czmq.h +10 -4
- data/ext/czmq/include/czmq_prelude.h +42 -42
- data/ext/czmq/include/zauth.h +97 -0
- data/ext/czmq/include/zbeacon.h +0 -5
- data/ext/czmq/include/zcert.h +118 -0
- data/ext/czmq/include/zcertstore.h +78 -0
- data/ext/czmq/include/zchunk.h +87 -0
- data/ext/czmq/include/zclock.h +4 -0
- data/ext/czmq/include/zconfig.h +21 -12
- data/ext/czmq/include/zctx.h +34 -11
- data/ext/czmq/include/zdir.h +90 -0
- data/ext/czmq/include/zfile.h +104 -25
- data/ext/czmq/include/zframe.h +7 -20
- data/ext/czmq/include/zhash.h +13 -0
- data/ext/czmq/include/zlist.h +0 -4
- data/ext/czmq/include/zloop.h +5 -5
- data/ext/czmq/include/zmsg.h +59 -29
- data/ext/czmq/include/zmutex.h +5 -0
- data/ext/czmq/include/zpoller.h +72 -0
- data/ext/czmq/include/zsocket.h +12 -15
- data/ext/czmq/include/zsockopt.h +124 -121
- data/ext/czmq/include/zstr.h +12 -9
- data/ext/czmq/include/zsys.h +50 -2
- data/ext/czmq/mkdoc +1 -1
- data/ext/czmq/model/sockopts.xml +101 -21
- data/ext/czmq/scripts/sockopts.gsl +95 -41
- data/ext/czmq/src/Makefile.am +13 -0
- data/ext/czmq/src/czmq_selftest.c +16 -10
- data/ext/czmq/src/selftest +2 -2
- data/ext/czmq/src/zauth.c +714 -0
- data/ext/czmq/src/zbeacon.c +27 -35
- data/ext/czmq/src/zcert.c +463 -0
- data/ext/czmq/src/zcertstore.c +265 -0
- data/ext/czmq/src/zchunk.c +207 -0
- data/ext/czmq/src/zclock.c +18 -0
- data/ext/czmq/src/zconfig.c +116 -99
- data/ext/czmq/src/zctx.c +103 -18
- data/ext/czmq/src/zdir.c +409 -0
- data/ext/czmq/src/zfile.c +421 -130
- data/ext/czmq/src/zframe.c +28 -127
- data/ext/czmq/src/zhash.c +255 -139
- data/ext/czmq/src/zlist.c +2 -8
- data/ext/czmq/src/zloop.c +40 -13
- data/ext/czmq/src/zmsg.c +109 -141
- data/ext/czmq/src/zmutex.c +27 -1
- data/ext/czmq/src/zpoller.c +218 -0
- data/ext/czmq/src/zsocket.c +53 -66
- data/ext/czmq/src/zsockopt.c +2337 -682
- data/ext/czmq/src/zstr.c +48 -118
- data/ext/czmq/src/zsys.c +270 -3
- data/ext/czmq/src/zthread.c +2 -2
- data/ext/czmq/src/ztree.c +179 -180
- data/ext/rbczmq/beacon.c +1 -1
- data/ext/rbczmq/context.c +12 -3
- data/ext/rbczmq/context.h +7 -0
- data/ext/rbczmq/extconf.rb +13 -4
- data/ext/rbczmq/pollitem.c +1 -1
- data/ext/rbczmq/socket.c +34 -24
- data/ext/rbczmq/socket.h +3 -2
- data/ext/zeromq/AUTHORS +17 -3
- data/ext/zeromq/CMakeLists.txt +742 -339
- data/ext/zeromq/COPYING.LESSER +2 -0
- data/ext/zeromq/Makefile.am +3 -3
- data/ext/zeromq/NEWS +130 -1
- data/ext/zeromq/{README → README.md} +8 -9
- data/ext/zeromq/builds/cmake/Modules/FindAsciiDoc.cmake +24 -0
- data/ext/zeromq/builds/cmake/Modules/TestZMQVersion.cmake +18 -0
- data/ext/zeromq/builds/cmake/Modules/ZMQSourceRunChecks.cmake +129 -0
- data/ext/zeromq/{cmake → builds/cmake}/NSIS.template32.in +1 -1
- data/ext/zeromq/{cmake → builds/cmake}/NSIS.template64.in +1 -1
- data/ext/zeromq/builds/cmake/platform.hpp.in +88 -0
- data/ext/zeromq/builds/mingw32/Makefile.mingw32 +47 -0
- data/ext/zeromq/{src/i_msg_sink.hpp → builds/mingw32/platform.hpp} +10 -21
- data/ext/zeromq/builds/msvc/Makefile.am +5 -2
- data/ext/zeromq/builds/msvc/c_local_lat/c_local_lat.vcxproj +1 -1
- data/ext/zeromq/builds/msvc/c_local_lat/c_local_lat11.vcxproj +91 -0
- data/ext/zeromq/builds/msvc/c_local_thr/c_local_thr.vcproj +2 -0
- data/ext/zeromq/builds/msvc/c_local_thr/c_local_thr.vcxproj +21 -1
- data/ext/zeromq/builds/msvc/c_local_thr/c_local_thr11.vcxproj +111 -0
- data/ext/zeromq/builds/msvc/c_remote_lat/c_remote_lat.vcxproj +1 -1
- data/ext/zeromq/builds/msvc/c_remote_lat/c_remote_lat11.vcxproj +91 -0
- data/ext/zeromq/builds/msvc/c_remote_thr/c_remote_thr.vcproj +2 -0
- data/ext/zeromq/builds/msvc/c_remote_thr/c_remote_thr.vcxproj +21 -1
- data/ext/zeromq/builds/msvc/c_remote_thr/c_remote_thr11.vcxproj +111 -0
- data/ext/zeromq/builds/msvc/errno.cpp +1 -1
- data/ext/zeromq/builds/msvc/errno.hpp +1 -1
- data/ext/zeromq/builds/msvc/inproc_lat/inproc_lat.vcproj +176 -174
- data/ext/zeromq/builds/msvc/inproc_lat/inproc_lat.vcxproj +21 -1
- data/ext/zeromq/builds/msvc/inproc_lat/inproc_lat11.vcxproj +110 -0
- data/ext/zeromq/builds/msvc/inproc_thr/inproc_thr.vcproj +176 -174
- data/ext/zeromq/builds/msvc/inproc_thr/inproc_thr.vcxproj +21 -1
- data/ext/zeromq/builds/msvc/inproc_thr/inproc_thr11.vcxproj +110 -0
- data/ext/zeromq/builds/msvc/libzmq/libzmq.vcproj +997 -804
- data/ext/zeromq/builds/msvc/libzmq/libzmq.vcxproj +78 -2
- data/ext/zeromq/builds/msvc/libzmq/libzmq.vcxproj.filters +42 -6
- data/ext/zeromq/builds/msvc/libzmq/libzmq11.vcxproj +362 -0
- data/ext/zeromq/builds/msvc/msvc.sln +6 -0
- data/ext/zeromq/builds/msvc/msvc10.sln +36 -2
- data/ext/zeromq/builds/msvc/msvc11.sln +150 -0
- data/ext/zeromq/builds/msvc/properties/Static.props +15 -0
- data/ext/zeromq/builds/msvc/properties/ZeroMQ.props +0 -1
- data/ext/zeromq/builds/msvc/properties/ZeroMQ_Static.props +23 -0
- data/ext/zeromq/builds/redhat/zeromq.spec.in +2 -1
- data/ext/zeromq/{configure.in → configure.ac} +74 -15
- data/ext/zeromq/doc/Makefile.am +6 -4
- data/ext/zeromq/doc/zmq.txt +30 -3
- data/ext/zeromq/doc/zmq_bind.txt +2 -2
- data/ext/zeromq/doc/zmq_close.txt +2 -2
- data/ext/zeromq/doc/zmq_connect.txt +9 -7
- data/ext/zeromq/doc/zmq_ctx_destroy.txt +4 -3
- data/ext/zeromq/doc/zmq_ctx_get.txt +8 -3
- data/ext/zeromq/doc/zmq_ctx_new.txt +3 -2
- data/ext/zeromq/doc/zmq_ctx_set.txt +13 -1
- data/ext/zeromq/doc/zmq_ctx_shutdown.txt +52 -0
- data/ext/zeromq/doc/zmq_ctx_term.txt +67 -0
- data/ext/zeromq/doc/zmq_curve.txt +92 -0
- data/ext/zeromq/doc/zmq_curve_keypair.txt +56 -0
- data/ext/zeromq/doc/zmq_disconnect.txt +2 -2
- data/ext/zeromq/doc/zmq_epgm.txt +5 -4
- data/ext/zeromq/doc/zmq_errno.txt +2 -2
- data/ext/zeromq/doc/zmq_getsockopt.txt +149 -24
- data/ext/zeromq/doc/zmq_init.txt +2 -2
- data/ext/zeromq/doc/zmq_inproc.txt +2 -2
- data/ext/zeromq/doc/zmq_ipc.txt +10 -5
- data/ext/zeromq/doc/zmq_msg_close.txt +4 -3
- data/ext/zeromq/doc/zmq_msg_copy.txt +2 -2
- data/ext/zeromq/doc/zmq_msg_data.txt +2 -2
- data/ext/zeromq/doc/zmq_msg_get.txt +3 -3
- data/ext/zeromq/doc/zmq_msg_init.txt +2 -2
- data/ext/zeromq/doc/zmq_msg_init_data.txt +2 -2
- data/ext/zeromq/doc/zmq_msg_init_size.txt +2 -2
- data/ext/zeromq/doc/zmq_msg_more.txt +6 -4
- data/ext/zeromq/doc/zmq_msg_move.txt +2 -2
- data/ext/zeromq/doc/zmq_msg_recv.txt +3 -4
- data/ext/zeromq/doc/zmq_msg_send.txt +10 -7
- data/ext/zeromq/doc/zmq_msg_set.txt +2 -1
- data/ext/zeromq/doc/zmq_msg_size.txt +2 -2
- data/ext/zeromq/doc/zmq_null.txt +27 -0
- data/ext/zeromq/doc/zmq_pgm.txt +5 -4
- data/ext/zeromq/doc/zmq_plain.txt +37 -0
- data/ext/zeromq/doc/zmq_poll.txt +2 -6
- data/ext/zeromq/doc/zmq_proxy.txt +2 -1
- data/ext/zeromq/doc/zmq_recv.txt +2 -5
- data/ext/zeromq/doc/zmq_recvmsg.txt +3 -5
- data/ext/zeromq/doc/zmq_send.txt +9 -7
- data/ext/zeromq/doc/zmq_send_const.txt +103 -0
- data/ext/zeromq/doc/zmq_sendmsg.txt +8 -8
- data/ext/zeromq/doc/zmq_setsockopt.txt +291 -37
- data/ext/zeromq/doc/zmq_socket.txt +92 -21
- data/ext/zeromq/doc/zmq_socket_monitor.txt +102 -131
- data/ext/zeromq/doc/zmq_strerror.txt +3 -2
- data/ext/zeromq/doc/zmq_tcp.txt +4 -2
- data/ext/zeromq/doc/zmq_term.txt +3 -3
- data/ext/zeromq/doc/zmq_unbind.txt +2 -2
- data/ext/zeromq/doc/zmq_version.txt +3 -2
- data/ext/zeromq/doc/zmq_z85_decode.txt +50 -0
- data/ext/zeromq/doc/zmq_z85_encode.txt +57 -0
- data/ext/zeromq/foreign/openpgm/libpgm-5.2.122~dfsg.tar.gz +0 -0
- data/ext/zeromq/include/zmq.h +179 -136
- data/ext/zeromq/include/zmq_utils.h +44 -3
- data/ext/zeromq/perf/inproc_lat.cpp +2 -4
- data/ext/zeromq/perf/inproc_thr.cpp +1 -1
- data/ext/zeromq/perf/local_lat.cpp +1 -3
- data/ext/zeromq/perf/local_thr.cpp +1 -3
- data/ext/zeromq/perf/remote_lat.cpp +1 -3
- data/ext/zeromq/perf/remote_thr.cpp +1 -8
- data/ext/zeromq/src/Makefile.am +26 -7
- data/ext/zeromq/src/address.cpp +7 -8
- data/ext/zeromq/src/address.hpp +1 -2
- data/ext/zeromq/src/array.hpp +1 -3
- data/ext/zeromq/src/atomic_counter.hpp +11 -3
- data/ext/zeromq/src/atomic_ptr.hpp +9 -3
- data/ext/zeromq/src/blob.hpp +2 -2
- data/ext/zeromq/src/clock.cpp +3 -4
- data/ext/zeromq/src/clock.hpp +1 -2
- data/ext/zeromq/src/command.hpp +2 -3
- data/ext/zeromq/src/config.hpp +1 -3
- data/ext/zeromq/src/ctx.cpp +154 -15
- data/ext/zeromq/src/ctx.hpp +34 -3
- data/ext/zeromq/src/curve_client.cpp +410 -0
- data/ext/zeromq/src/curve_client.hpp +109 -0
- data/ext/zeromq/src/curve_server.cpp +629 -0
- data/ext/zeromq/src/curve_server.hpp +120 -0
- data/ext/zeromq/src/dbuffer.hpp +134 -0
- data/ext/zeromq/src/dealer.cpp +52 -60
- data/ext/zeromq/src/dealer.hpp +12 -26
- data/ext/zeromq/src/decoder.hpp +27 -102
- data/ext/zeromq/src/devpoll.cpp +1 -3
- data/ext/zeromq/src/devpoll.hpp +1 -3
- data/ext/zeromq/src/dist.cpp +17 -15
- data/ext/zeromq/src/dist.hpp +5 -6
- data/ext/zeromq/src/encoder.hpp +32 -52
- data/ext/zeromq/src/epoll.cpp +1 -3
- data/ext/zeromq/src/epoll.hpp +1 -3
- data/ext/zeromq/src/err.cpp +2 -4
- data/ext/zeromq/src/err.hpp +7 -4
- data/ext/zeromq/src/fd.hpp +1 -2
- data/ext/zeromq/src/fq.cpp +2 -5
- data/ext/zeromq/src/fq.hpp +2 -4
- data/ext/zeromq/src/i_decoder.hpp +11 -9
- data/ext/zeromq/src/i_encoder.hpp +7 -11
- data/ext/zeromq/src/i_engine.hpp +3 -3
- data/ext/zeromq/src/i_poll_events.hpp +1 -3
- data/ext/zeromq/src/io_object.cpp +1 -3
- data/ext/zeromq/src/io_object.hpp +1 -3
- data/ext/zeromq/src/io_thread.cpp +1 -3
- data/ext/zeromq/src/io_thread.hpp +1 -3
- data/ext/zeromq/src/ip.cpp +46 -5
- data/ext/zeromq/src/ip.hpp +7 -4
- data/ext/zeromq/src/ipc_address.cpp +13 -2
- data/ext/zeromq/src/ipc_address.hpp +1 -2
- data/ext/zeromq/src/ipc_connecter.cpp +3 -3
- data/ext/zeromq/src/ipc_connecter.hpp +1 -2
- data/ext/zeromq/src/ipc_listener.cpp +15 -10
- data/ext/zeromq/src/ipc_listener.hpp +1 -2
- data/ext/zeromq/src/kqueue.cpp +11 -3
- data/ext/zeromq/src/kqueue.hpp +7 -3
- data/ext/zeromq/src/lb.cpp +13 -11
- data/ext/zeromq/src/lb.hpp +10 -5
- data/ext/zeromq/src/libzmq.pc.cmake.in +10 -0
- data/ext/zeromq/src/likely.hpp +1 -2
- data/ext/zeromq/src/mailbox.cpp +1 -4
- data/ext/zeromq/src/mailbox.hpp +8 -3
- data/ext/zeromq/src/mechanism.cpp +163 -0
- data/ext/zeromq/src/mechanism.hpp +101 -0
- data/ext/zeromq/src/msg.cpp +38 -18
- data/ext/zeromq/src/msg.hpp +19 -7
- data/ext/zeromq/src/mtrie.cpp +16 -14
- data/ext/zeromq/src/mtrie.hpp +1 -3
- data/ext/zeromq/src/mutex.hpp +42 -3
- data/ext/zeromq/src/null_mechanism.cpp +282 -0
- data/ext/zeromq/src/null_mechanism.hpp +65 -0
- data/ext/zeromq/src/object.cpp +29 -3
- data/ext/zeromq/src/object.hpp +8 -5
- data/ext/zeromq/src/options.cpp +557 -485
- data/ext/zeromq/src/options.hpp +38 -24
- data/ext/zeromq/src/own.cpp +1 -2
- data/ext/zeromq/src/own.hpp +1 -2
- data/ext/zeromq/src/pair.cpp +8 -25
- data/ext/zeromq/src/pair.hpp +5 -22
- data/ext/zeromq/src/pgm_receiver.cpp +80 -67
- data/ext/zeromq/src/pgm_receiver.hpp +11 -10
- data/ext/zeromq/src/pgm_sender.cpp +37 -16
- data/ext/zeromq/src/pgm_sender.hpp +12 -6
- data/ext/zeromq/src/pgm_socket.cpp +8 -8
- data/ext/zeromq/src/pgm_socket.hpp +1 -4
- data/ext/zeromq/src/pipe.cpp +110 -72
- data/ext/zeromq/src/pipe.hpp +36 -27
- data/ext/zeromq/src/plain_mechanism.cpp +482 -0
- data/ext/zeromq/src/plain_mechanism.hpp +88 -0
- data/ext/zeromq/src/poll.cpp +1 -3
- data/ext/zeromq/src/poll.hpp +1 -3
- data/ext/zeromq/src/poller.hpp +1 -3
- data/ext/zeromq/src/poller_base.cpp +3 -3
- data/ext/zeromq/src/poller_base.hpp +1 -2
- data/ext/zeromq/src/precompiled.cpp +1 -2
- data/ext/zeromq/src/precompiled.hpp +1 -2
- data/ext/zeromq/src/proxy.cpp +1 -2
- data/ext/zeromq/src/proxy.hpp +1 -2
- data/ext/zeromq/src/pub.cpp +2 -16
- data/ext/zeromq/src/pub.hpp +2 -19
- data/ext/zeromq/src/pull.cpp +7 -24
- data/ext/zeromq/src/pull.hpp +4 -21
- data/ext/zeromq/src/push.cpp +8 -22
- data/ext/zeromq/src/push.hpp +4 -21
- data/ext/zeromq/src/random.cpp +1 -2
- data/ext/zeromq/src/random.hpp +1 -2
- data/ext/zeromq/src/raw_decoder.cpp +63 -0
- data/ext/zeromq/src/raw_decoder.hpp +66 -0
- data/ext/zeromq/src/raw_encoder.cpp +40 -0
- data/ext/zeromq/src/raw_encoder.hpp +60 -0
- data/ext/zeromq/src/reaper.cpp +12 -2
- data/ext/zeromq/src/reaper.hpp +6 -2
- data/ext/zeromq/src/rep.cpp +7 -21
- data/ext/zeromq/src/rep.hpp +3 -20
- data/ext/zeromq/src/req.cpp +132 -38
- data/ext/zeromq/src/req.hpp +27 -8
- data/ext/zeromq/src/router.cpp +109 -65
- data/ext/zeromq/src/router.hpp +9 -23
- data/ext/zeromq/src/select.cpp +1 -3
- data/ext/zeromq/src/select.hpp +1 -3
- data/ext/zeromq/src/session_base.cpp +164 -118
- data/ext/zeromq/src/session_base.hpp +29 -22
- data/ext/zeromq/src/signaler.cpp +127 -19
- data/ext/zeromq/src/signaler.hpp +20 -3
- data/ext/zeromq/src/socket_base.cpp +167 -134
- data/ext/zeromq/src/socket_base.hpp +18 -20
- data/ext/zeromq/src/stdint.hpp +1 -2
- data/ext/zeromq/src/stream.cpp +257 -0
- data/ext/zeromq/src/stream.hpp +97 -0
- data/ext/zeromq/src/stream_engine.cpp +405 -157
- data/ext/zeromq/src/stream_engine.hpp +72 -23
- data/ext/zeromq/src/sub.cpp +5 -18
- data/ext/zeromq/src/sub.hpp +2 -19
- data/ext/zeromq/src/tcp.cpp +23 -3
- data/ext/zeromq/src/tcp.hpp +7 -3
- data/ext/zeromq/src/tcp_address.cpp +35 -46
- data/ext/zeromq/src/tcp_address.hpp +7 -12
- data/ext/zeromq/src/tcp_connecter.cpp +10 -5
- data/ext/zeromq/src/tcp_connecter.hpp +1 -3
- data/ext/zeromq/src/tcp_listener.cpp +19 -8
- data/ext/zeromq/src/tcp_listener.hpp +1 -3
- data/ext/zeromq/src/thread.cpp +2 -4
- data/ext/zeromq/src/thread.hpp +1 -3
- data/ext/zeromq/src/trie.cpp +122 -125
- data/ext/zeromq/src/trie.hpp +1 -4
- data/ext/zeromq/src/v1_decoder.cpp +77 -91
- data/ext/zeromq/src/v1_decoder.hpp +10 -21
- data/ext/zeromq/src/v1_encoder.cpp +24 -62
- data/ext/zeromq/src/v1_encoder.hpp +7 -18
- data/ext/zeromq/src/v2_decoder.cpp +142 -0
- data/ext/zeromq/src/v2_decoder.hpp +57 -0
- data/ext/zeromq/src/v2_encoder.cpp +67 -0
- data/ext/zeromq/src/{i_msg_source.hpp → v2_encoder.hpp} +20 -15
- data/ext/zeromq/src/{v1_protocol.hpp → v2_protocol.hpp} +7 -11
- data/ext/zeromq/src/windows.hpp +2 -4
- data/ext/zeromq/src/wire.hpp +5 -6
- data/ext/zeromq/src/xpub.cpp +37 -46
- data/ext/zeromq/src/xpub.hpp +7 -23
- data/ext/zeromq/src/xsub.cpp +26 -40
- data/ext/zeromq/src/xsub.hpp +5 -21
- data/ext/zeromq/src/ypipe.hpp +3 -4
- data/ext/zeromq/src/ypipe_base.hpp +44 -0
- data/ext/zeromq/src/ypipe_conflate.hpp +127 -0
- data/ext/zeromq/src/yqueue.hpp +3 -7
- data/ext/zeromq/src/zmq.cpp +76 -96
- data/ext/zeromq/src/zmq_utils.cpp +146 -8
- data/ext/zeromq/tests/Makefile.am +56 -8
- data/ext/zeromq/tests/test_abstract_ipc.cpp +57 -0
- data/ext/zeromq/tests/test_conflate.cpp +75 -0
- data/ext/zeromq/tests/test_connect_resolve.cpp +14 -15
- data/ext/zeromq/tests/test_ctx_destroy.cpp +90 -0
- data/ext/zeromq/tests/test_ctx_options.cpp +52 -0
- data/ext/zeromq/tests/test_disconnect_inproc.cpp +35 -30
- data/ext/zeromq/tests/test_fork.cpp +81 -0
- data/ext/zeromq/tests/test_hwm.cpp +251 -35
- data/ext/zeromq/tests/test_immediate.cpp +229 -0
- data/ext/zeromq/tests/test_inproc_connect.cpp +339 -0
- data/ext/zeromq/tests/test_invalid_rep.cpp +9 -13
- data/ext/zeromq/tests/test_iov.cpp +106 -0
- data/ext/zeromq/tests/test_issue_566.cpp +85 -0
- data/ext/zeromq/tests/test_last_endpoint.cpp +14 -18
- data/ext/zeromq/tests/test_linger.cpp +93 -0
- data/ext/zeromq/tests/test_monitor.cpp +112 -129
- data/ext/zeromq/tests/test_msg_flags.cpp +17 -16
- data/ext/zeromq/tests/test_pair_inproc.cpp +25 -7
- data/ext/zeromq/tests/test_pair_ipc.cpp +4 -7
- data/ext/zeromq/tests/test_pair_tcp.cpp +4 -8
- data/ext/zeromq/tests/test_probe_router.cpp +72 -0
- data/ext/zeromq/tests/test_req_correlate.cpp +177 -0
- data/ext/zeromq/tests/test_req_relaxed.cpp +116 -0
- data/ext/zeromq/tests/test_reqrep_device.cpp +9 -17
- data/ext/zeromq/tests/test_reqrep_inproc.cpp +4 -7
- data/ext/zeromq/tests/test_reqrep_ipc.cpp +4 -7
- data/ext/zeromq/tests/test_reqrep_tcp.cpp +4 -8
- data/ext/zeromq/tests/test_router_mandatory.cpp +41 -22
- data/ext/zeromq/tests/test_security_curve.cpp +212 -0
- data/ext/zeromq/tests/test_security_null.cpp +148 -0
- data/ext/zeromq/tests/test_security_plain.cpp +150 -0
- data/ext/zeromq/tests/test_shutdown_stress.cpp +10 -23
- data/ext/zeromq/tests/test_spec_dealer.cpp +254 -0
- data/ext/zeromq/tests/test_spec_pushpull.cpp +293 -0
- data/ext/zeromq/tests/test_spec_rep.cpp +155 -0
- data/ext/zeromq/tests/test_spec_req.cpp +253 -0
- data/ext/zeromq/tests/test_spec_router.cpp +204 -0
- data/ext/zeromq/tests/test_stream.cpp +228 -0
- data/ext/zeromq/tests/test_sub_forward.cpp +14 -22
- data/ext/zeromq/tests/test_system.cpp +82 -0
- data/ext/zeromq/tests/test_term_endpoint.cpp +17 -31
- data/ext/zeromq/tests/test_timeo.cpp +34 -78
- data/ext/zeromq/tests/testutil.hpp +211 -26
- data/ext/zeromq/tools/Makefile.am +9 -0
- data/ext/zeromq/tools/curve_keygen.c +58 -0
- data/lib/zmq/version.rb +1 -1
- data/test/test_socket.rb +4 -3
- metadata +114 -15
- data/ext/zeromq/cmake/Modules/TestZMQVersion.cmake +0 -35
- data/ext/zeromq/foreign/openpgm/libpgm-5.1.118~dfsg.tar.gz +0 -0
- data/ext/zeromq/src/decoder.cpp +0 -166
- data/ext/zeromq/src/encoder.cpp +0 -102
- data/ext/zeromq/tests/test_connect_delay.cpp +0 -260
@@ -0,0 +1,90 @@
|
|
1
|
+
/*
|
2
|
+
Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
|
3
|
+
|
4
|
+
This file is part of 0MQ.
|
5
|
+
|
6
|
+
0MQ is free software; you can redistribute it and/or modify it under
|
7
|
+
the terms of the GNU Lesser General Public License as published by
|
8
|
+
the Free Software Foundation; either version 3 of the License, or
|
9
|
+
(at your option) any later version.
|
10
|
+
|
11
|
+
0MQ is distributed in the hope that it will be useful,
|
12
|
+
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
13
|
+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
14
|
+
GNU Lesser General Public License for more details.
|
15
|
+
|
16
|
+
You should have received a copy of the GNU Lesser General Public License
|
17
|
+
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
18
|
+
*/
|
19
|
+
|
20
|
+
#include "testutil.hpp"
|
21
|
+
|
22
|
+
static void receiver (void *socket)
|
23
|
+
{
|
24
|
+
char buffer[16];
|
25
|
+
int rc = zmq_recv (socket, &buffer, sizeof (buffer), 0);
|
26
|
+
assert(rc == -1);
|
27
|
+
}
|
28
|
+
|
29
|
+
void test_ctx_destroy()
|
30
|
+
{
|
31
|
+
int rc;
|
32
|
+
|
33
|
+
// Set up our context and sockets
|
34
|
+
void *ctx = zmq_ctx_new ();
|
35
|
+
assert (ctx);
|
36
|
+
|
37
|
+
void *socket = zmq_socket (ctx, ZMQ_PULL);
|
38
|
+
assert (socket);
|
39
|
+
|
40
|
+
// Close the socket
|
41
|
+
rc = zmq_close (socket);
|
42
|
+
assert (rc == 0);
|
43
|
+
|
44
|
+
// Destroy the context
|
45
|
+
rc = zmq_ctx_destroy (ctx);
|
46
|
+
assert (rc == 0);
|
47
|
+
}
|
48
|
+
|
49
|
+
void test_ctx_shutdown()
|
50
|
+
{
|
51
|
+
int rc;
|
52
|
+
|
53
|
+
// Set up our context and sockets
|
54
|
+
void *ctx = zmq_ctx_new ();
|
55
|
+
assert (ctx);
|
56
|
+
|
57
|
+
void *socket = zmq_socket (ctx, ZMQ_PULL);
|
58
|
+
assert (socket);
|
59
|
+
|
60
|
+
// Spawn a thread to receive on socket
|
61
|
+
void *receiver_thread = zmq_threadstart (&receiver, socket);
|
62
|
+
|
63
|
+
// Wait for thread to start up and block
|
64
|
+
zmq_sleep (1);
|
65
|
+
|
66
|
+
// Shutdown context, if we used destroy here we would deadlock.
|
67
|
+
rc = zmq_ctx_shutdown (ctx);
|
68
|
+
assert (rc == 0);
|
69
|
+
|
70
|
+
// Wait for thread to finish
|
71
|
+
zmq_threadclose (receiver_thread);
|
72
|
+
|
73
|
+
// Close the socket.
|
74
|
+
rc = zmq_close (socket);
|
75
|
+
assert (rc == 0);
|
76
|
+
|
77
|
+
// Destory the context, will now not hang as we have closed the socket.
|
78
|
+
rc = zmq_ctx_destroy (ctx);
|
79
|
+
assert (rc == 0);
|
80
|
+
}
|
81
|
+
|
82
|
+
int main (void)
|
83
|
+
{
|
84
|
+
setup_test_environment();
|
85
|
+
|
86
|
+
test_ctx_destroy();
|
87
|
+
test_ctx_shutdown();
|
88
|
+
|
89
|
+
return 0;
|
90
|
+
}
|
@@ -0,0 +1,52 @@
|
|
1
|
+
/*
|
2
|
+
Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
|
3
|
+
|
4
|
+
This file is part of 0MQ.
|
5
|
+
|
6
|
+
0MQ is free software; you can redistribute it and/or modify it under
|
7
|
+
the terms of the GNU Lesser General Public License as published by
|
8
|
+
the Free Software Foundation; either version 3 of the License, or
|
9
|
+
(at your option) any later version.
|
10
|
+
|
11
|
+
0MQ is distributed in the hope that it will be useful,
|
12
|
+
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
13
|
+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
14
|
+
GNU Lesser General Public License for more details.
|
15
|
+
|
16
|
+
You should have received a copy of the GNU Lesser General Public License
|
17
|
+
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
18
|
+
*/
|
19
|
+
|
20
|
+
#include "testutil.hpp"
|
21
|
+
|
22
|
+
int main (void)
|
23
|
+
{
|
24
|
+
setup_test_environment();
|
25
|
+
int rc;
|
26
|
+
|
27
|
+
// Set up our context and sockets
|
28
|
+
void *ctx = zmq_ctx_new ();
|
29
|
+
assert (ctx);
|
30
|
+
|
31
|
+
assert (zmq_ctx_get (ctx, ZMQ_MAX_SOCKETS) == ZMQ_MAX_SOCKETS_DFLT);
|
32
|
+
assert (zmq_ctx_get (ctx, ZMQ_IO_THREADS) == ZMQ_IO_THREADS_DFLT);
|
33
|
+
assert (zmq_ctx_get (ctx, ZMQ_IPV6) == 0);
|
34
|
+
|
35
|
+
rc = zmq_ctx_set (ctx, ZMQ_IPV6, true);
|
36
|
+
assert (zmq_ctx_get (ctx, ZMQ_IPV6) == true);
|
37
|
+
|
38
|
+
void *router = zmq_socket (ctx, ZMQ_ROUTER);
|
39
|
+
int ipv6;
|
40
|
+
size_t optsize = sizeof (int);
|
41
|
+
rc = zmq_getsockopt (router, ZMQ_IPV6, &ipv6, &optsize);
|
42
|
+
assert (rc == 0);
|
43
|
+
assert (ipv6);
|
44
|
+
|
45
|
+
rc = zmq_close (router);
|
46
|
+
assert (rc == 0);
|
47
|
+
|
48
|
+
rc = zmq_ctx_term (ctx);
|
49
|
+
assert (rc == 0);
|
50
|
+
|
51
|
+
return 0;
|
52
|
+
}
|
@@ -1,7 +1,23 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
1
|
+
/*
|
2
|
+
Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
|
3
|
+
|
4
|
+
This file is part of 0MQ.
|
5
|
+
|
6
|
+
0MQ is free software; you can redistribute it and/or modify it under
|
7
|
+
the terms of the GNU Lesser General Public License as published by
|
8
|
+
the Free Software Foundation; either version 3 of the License, or
|
9
|
+
(at your option) any later version.
|
10
|
+
|
11
|
+
0MQ is distributed in the hope that it will be useful,
|
12
|
+
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
13
|
+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
14
|
+
GNU Lesser General Public License for more details.
|
15
|
+
|
16
|
+
You should have received a copy of the GNU Lesser General Public License
|
17
|
+
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
18
|
+
*/
|
19
|
+
|
20
|
+
#include "testutil.hpp"
|
5
21
|
|
6
22
|
/// Initialize a zeromq message with a given null-terminated string
|
7
23
|
#define ZMQ_PREPARE_STRING(msg, data, size) \
|
@@ -13,6 +29,7 @@ int publicationsReceived = 0;
|
|
13
29
|
bool isSubscribed = false;
|
14
30
|
|
15
31
|
int main(int argc, char** argv) {
|
32
|
+
setup_test_environment();
|
16
33
|
void* context = zmq_ctx_new();
|
17
34
|
void* pubSocket;
|
18
35
|
void* subSocket;
|
@@ -22,34 +39,32 @@ int main(int argc, char** argv) {
|
|
22
39
|
zmq_setsockopt(subSocket, ZMQ_SUBSCRIBE, "foo", 3) && printf("zmq_setsockopt: %s\n",zmq_strerror(errno));
|
23
40
|
|
24
41
|
zmq_bind(pubSocket, "inproc://someInProcDescriptor") && printf("zmq_bind: %s\n", zmq_strerror(errno));
|
25
|
-
//zmq_bind(pubSocket, "tcp
|
42
|
+
//zmq_bind(pubSocket, "tcp://127.0.0.1:30010") && printf("zmq_bind: %s\n", zmq_strerror(errno));
|
26
43
|
|
27
|
-
|
44
|
+
int more;
|
28
45
|
size_t more_size = sizeof(more);
|
29
46
|
int iteration = 0;
|
30
47
|
|
31
|
-
while(1) {
|
48
|
+
while (1) {
|
32
49
|
zmq_pollitem_t items [] = {
|
33
|
-
{ subSocket,
|
34
|
-
{ pubSocket,
|
50
|
+
{ subSocket, 0, ZMQ_POLLIN, 0 }, // read publications
|
51
|
+
{ pubSocket, 0, ZMQ_POLLIN, 0 }, // read subscriptions
|
35
52
|
};
|
36
|
-
zmq_poll(items, 2,
|
53
|
+
int rc = zmq_poll (items, 2, 100);
|
37
54
|
|
38
|
-
if (items[1].revents & ZMQ_POLLIN) {
|
55
|
+
if (items [1].revents & ZMQ_POLLIN) {
|
39
56
|
while (1) {
|
40
57
|
zmq_msg_t msg;
|
41
58
|
zmq_msg_init (&msg);
|
42
59
|
zmq_msg_recv (&msg, pubSocket, 0);
|
43
|
-
int msgSize = zmq_msg_size(&msg);
|
44
60
|
char* buffer = (char*)zmq_msg_data(&msg);
|
45
61
|
|
46
62
|
if (buffer[0] == 0) {
|
47
63
|
assert(isSubscribed);
|
48
|
-
printf("unsubscribing from '%s'\n", strndup(buffer + 1, msgSize - 1));
|
49
64
|
isSubscribed = false;
|
50
|
-
}
|
65
|
+
}
|
66
|
+
else {
|
51
67
|
assert(!isSubscribed);
|
52
|
-
printf("subscribing on '%s'\n", strndup(buffer + 1, msgSize - 1));
|
53
68
|
isSubscribed = true;
|
54
69
|
}
|
55
70
|
|
@@ -66,11 +81,6 @@ int main(int argc, char** argv) {
|
|
66
81
|
zmq_msg_t msg;
|
67
82
|
zmq_msg_init (&msg);
|
68
83
|
zmq_msg_recv (&msg, subSocket, 0);
|
69
|
-
int msgSize = zmq_msg_size(&msg);
|
70
|
-
char* buffer = (char*)zmq_msg_data(&msg);
|
71
|
-
|
72
|
-
printf("received on subscriber '%s'\n", strndup(buffer, msgSize));
|
73
|
-
|
74
84
|
zmq_getsockopt (subSocket, ZMQ_RCVMORE, &more, &more_size);
|
75
85
|
zmq_msg_close (&msg);
|
76
86
|
|
@@ -80,41 +90,36 @@ int main(int argc, char** argv) {
|
|
80
90
|
}
|
81
91
|
}
|
82
92
|
}
|
83
|
-
|
84
93
|
if (iteration == 1) {
|
85
94
|
zmq_connect(subSocket, "inproc://someInProcDescriptor") && printf("zmq_connect: %s\n", zmq_strerror(errno));
|
86
95
|
//zmq_connect(subSocket, "tcp://127.0.0.1:30010") && printf("zmq_connect: %s\n", zmq_strerror(errno));
|
87
96
|
}
|
88
|
-
|
89
97
|
if (iteration == 4) {
|
90
98
|
zmq_disconnect(subSocket, "inproc://someInProcDescriptor") && printf("zmq_disconnect(%d): %s\n", errno, zmq_strerror(errno));
|
91
99
|
//zmq_disconnect(subSocket, "tcp://127.0.0.1:30010") && printf("zmq_disconnect: %s\n", zmq_strerror(errno));
|
92
100
|
}
|
93
|
-
|
94
|
-
if (iteration == 10) {
|
101
|
+
if (iteration > 4 && rc == 0)
|
95
102
|
break;
|
96
|
-
|
97
|
-
|
103
|
+
|
98
104
|
zmq_msg_t channelEnvlp;
|
99
105
|
ZMQ_PREPARE_STRING(channelEnvlp, "foo", 3);
|
100
|
-
|
106
|
+
zmq_msg_send (&channelEnvlp, pubSocket, ZMQ_SNDMORE) >= 0 || printf("zmq_msg_send: %s\n",zmq_strerror(errno));
|
101
107
|
zmq_msg_close(&channelEnvlp) && printf("zmq_msg_close: %s\n",zmq_strerror(errno));
|
102
108
|
|
103
109
|
zmq_msg_t message;
|
104
110
|
ZMQ_PREPARE_STRING(message, "this is foo!", 12);
|
105
|
-
|
111
|
+
zmq_msg_send (&message, pubSocket, 0) >= 0 || printf("zmq_msg_send: %s\n",zmq_strerror(errno));
|
106
112
|
zmq_msg_close(&message) && printf("zmq_msg_close: %s\n",zmq_strerror(errno));
|
107
113
|
|
108
114
|
iteration++;
|
109
115
|
}
|
110
|
-
|
111
116
|
assert(publicationsReceived == 3);
|
112
117
|
assert(!isSubscribed);
|
113
118
|
|
114
119
|
zmq_close(pubSocket) && printf("zmq_close: %s", zmq_strerror(errno));
|
115
120
|
zmq_close(subSocket) && printf("zmq_close: %s", zmq_strerror(errno));
|
116
121
|
|
117
|
-
|
122
|
+
zmq_ctx_term(context);
|
118
123
|
return 0;
|
119
124
|
}
|
120
125
|
|
@@ -0,0 +1,81 @@
|
|
1
|
+
/*
|
2
|
+
Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
|
3
|
+
|
4
|
+
This file is part of 0MQ.
|
5
|
+
|
6
|
+
0MQ is free software; you can redistribute it and/or modify it under
|
7
|
+
the terms of the GNU Lesser General Public License as published by
|
8
|
+
the Free Software Foundation; either version 3 of the License, or
|
9
|
+
(at your option) any later version.
|
10
|
+
|
11
|
+
0MQ is distributed in the hope that it will be useful,
|
12
|
+
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
13
|
+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
14
|
+
GNU Lesser General Public License for more details.
|
15
|
+
|
16
|
+
You should have received a copy of the GNU Lesser General Public License
|
17
|
+
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
18
|
+
*/
|
19
|
+
|
20
|
+
#include "testutil.hpp"
|
21
|
+
|
22
|
+
const char *address = "tcp://127.0.0.1:6571";
|
23
|
+
|
24
|
+
#define NUM_MESSAGES 5
|
25
|
+
|
26
|
+
int main (void)
|
27
|
+
{
|
28
|
+
setup_test_environment ();
|
29
|
+
void *ctx = zmq_ctx_new ();
|
30
|
+
assert (ctx);
|
31
|
+
|
32
|
+
// Create and bind pull socket to receive messages
|
33
|
+
void *pull = zmq_socket (ctx, ZMQ_PULL);
|
34
|
+
assert (pull);
|
35
|
+
int rc = zmq_bind (pull, address);
|
36
|
+
assert (rc == 0);
|
37
|
+
|
38
|
+
int pid = fork ();
|
39
|
+
if (pid == 0) {
|
40
|
+
// Child process
|
41
|
+
// Immediately close parent sockets and context
|
42
|
+
zmq_close (pull);
|
43
|
+
zmq_term (ctx);
|
44
|
+
|
45
|
+
// Create new context, socket, connect and send some messages
|
46
|
+
void *child_ctx = zmq_ctx_new ();
|
47
|
+
assert (child_ctx);
|
48
|
+
void *push = zmq_socket (child_ctx, ZMQ_PUSH);
|
49
|
+
assert (push);
|
50
|
+
rc = zmq_connect (push, address);
|
51
|
+
assert (rc == 0);
|
52
|
+
int count;
|
53
|
+
for (count = 0; count < NUM_MESSAGES; count++)
|
54
|
+
zmq_send (push, "Hello", 5, 0);
|
55
|
+
|
56
|
+
zmq_close (push);
|
57
|
+
zmq_ctx_destroy (child_ctx);
|
58
|
+
exit (0);
|
59
|
+
}
|
60
|
+
else {
|
61
|
+
// Parent process
|
62
|
+
int count;
|
63
|
+
for (count = 0; count < NUM_MESSAGES; count++) {
|
64
|
+
char buffer [5];
|
65
|
+
int num_bytes = zmq_recv (pull, buffer, 5, 0);
|
66
|
+
assert (num_bytes == 5);
|
67
|
+
}
|
68
|
+
int child_status;
|
69
|
+
while (true) {
|
70
|
+
rc = waitpid (pid, &child_status, 0);
|
71
|
+
if (rc == -1 && errno == EINTR)
|
72
|
+
continue;
|
73
|
+
assert (rc > 0);
|
74
|
+
// Verify the status code of the child was zero
|
75
|
+
assert (WEXITSTATUS (child_status) == 0);
|
76
|
+
break;
|
77
|
+
}
|
78
|
+
exit (0);
|
79
|
+
}
|
80
|
+
return 0;
|
81
|
+
}
|
@@ -1,6 +1,5 @@
|
|
1
1
|
/*
|
2
|
-
Copyright (c)
|
3
|
-
Copyright (c) 2010-2011 Other contributors as noted in the AUTHORS file
|
2
|
+
Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
|
4
3
|
|
5
4
|
This file is part of 0MQ.
|
6
5
|
|
@@ -18,66 +17,283 @@
|
|
18
17
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
19
18
|
*/
|
20
19
|
|
21
|
-
|
22
|
-
#include <stdio.h>
|
23
20
|
#include "testutil.hpp"
|
24
21
|
|
25
|
-
int
|
26
|
-
{
|
27
|
-
fprintf (stderr, "test_hwm running...\n");
|
22
|
+
const int MAX_SENDS = 10000;
|
28
23
|
|
29
|
-
|
24
|
+
enum TestType { BIND_FIRST, CONNECT_FIRST };
|
25
|
+
|
26
|
+
int test_defaults ()
|
27
|
+
{
|
28
|
+
void *ctx = zmq_ctx_new ();
|
30
29
|
assert (ctx);
|
30
|
+
int rc;
|
31
31
|
|
32
|
-
//
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
int hwm = 2;
|
37
|
-
int rc = zmq_setsockopt (sb, ZMQ_RCVHWM, &hwm, sizeof (hwm));
|
32
|
+
// Set up bind socket
|
33
|
+
void *bind_socket = zmq_socket (ctx, ZMQ_PULL);
|
34
|
+
assert (bind_socket);
|
35
|
+
rc = zmq_bind (bind_socket, "inproc://a");
|
38
36
|
assert (rc == 0);
|
39
|
-
|
37
|
+
|
38
|
+
// Set up connect socket
|
39
|
+
void *connect_socket = zmq_socket (ctx, ZMQ_PUSH);
|
40
|
+
assert (connect_socket);
|
41
|
+
rc = zmq_connect (connect_socket, "inproc://a");
|
42
|
+
assert (rc == 0);
|
43
|
+
|
44
|
+
// Send until we block
|
45
|
+
int send_count = 0;
|
46
|
+
while (send_count < MAX_SENDS && zmq_send (connect_socket, NULL, 0, ZMQ_DONTWAIT) == 0)
|
47
|
+
++send_count;
|
48
|
+
|
49
|
+
// Now receive all sent messages
|
50
|
+
int recv_count = 0;
|
51
|
+
while (zmq_recv (bind_socket, NULL, 0, ZMQ_DONTWAIT) == 0)
|
52
|
+
++recv_count;
|
53
|
+
|
54
|
+
assert (send_count == recv_count);
|
55
|
+
|
56
|
+
// Clean up
|
57
|
+
rc = zmq_close (connect_socket);
|
40
58
|
assert (rc == 0);
|
41
59
|
|
42
|
-
|
43
|
-
assert (sc);
|
44
|
-
rc = zmq_setsockopt (sc, ZMQ_SNDHWM, &hwm, sizeof (hwm));
|
60
|
+
rc = zmq_close (bind_socket);
|
45
61
|
assert (rc == 0);
|
46
|
-
|
62
|
+
|
63
|
+
rc = zmq_ctx_term (ctx);
|
47
64
|
assert (rc == 0);
|
48
65
|
|
49
|
-
|
50
|
-
|
66
|
+
return send_count;
|
67
|
+
}
|
68
|
+
|
69
|
+
int count_msg (int send_hwm, int recv_hwm, TestType testType)
|
70
|
+
{
|
71
|
+
void *ctx = zmq_ctx_new ();
|
72
|
+
assert (ctx);
|
73
|
+
int rc;
|
74
|
+
|
75
|
+
void *bind_socket;
|
76
|
+
void *connect_socket;
|
77
|
+
if (testType == BIND_FIRST)
|
51
78
|
{
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
79
|
+
// Set up bind socket
|
80
|
+
bind_socket = zmq_socket (ctx, ZMQ_PULL);
|
81
|
+
assert (bind_socket);
|
82
|
+
rc = zmq_setsockopt (bind_socket, ZMQ_RCVHWM, &recv_hwm, sizeof (recv_hwm));
|
83
|
+
assert (rc == 0);
|
84
|
+
rc = zmq_bind (bind_socket, "inproc://a");
|
85
|
+
assert (rc == 0);
|
86
|
+
|
87
|
+
// Set up connect socket
|
88
|
+
connect_socket = zmq_socket (ctx, ZMQ_PUSH);
|
89
|
+
assert (connect_socket);
|
90
|
+
rc = zmq_setsockopt (connect_socket, ZMQ_SNDHWM, &send_hwm, sizeof (send_hwm));
|
91
|
+
assert (rc == 0);
|
92
|
+
rc = zmq_connect (connect_socket, "inproc://a");
|
93
|
+
assert (rc == 0);
|
57
94
|
}
|
95
|
+
else
|
96
|
+
{
|
97
|
+
// Set up connect socket
|
98
|
+
connect_socket = zmq_socket (ctx, ZMQ_PUSH);
|
99
|
+
assert (connect_socket);
|
100
|
+
rc = zmq_setsockopt (connect_socket, ZMQ_SNDHWM, &send_hwm, sizeof (send_hwm));
|
101
|
+
assert (rc == 0);
|
102
|
+
rc = zmq_connect (connect_socket, "inproc://a");
|
103
|
+
assert (rc == 0);
|
58
104
|
|
59
|
-
|
60
|
-
|
61
|
-
|
105
|
+
// Set up bind socket
|
106
|
+
bind_socket = zmq_socket (ctx, ZMQ_PULL);
|
107
|
+
assert (bind_socket);
|
108
|
+
rc = zmq_setsockopt (bind_socket, ZMQ_RCVHWM, &recv_hwm, sizeof (recv_hwm));
|
109
|
+
assert (rc == 0);
|
110
|
+
rc = zmq_bind (bind_socket, "inproc://a");
|
62
111
|
assert (rc == 0);
|
63
112
|
}
|
64
113
|
|
114
|
+
// Send until we block
|
115
|
+
int send_count = 0;
|
116
|
+
while (send_count < MAX_SENDS && zmq_send (connect_socket, NULL, 0, ZMQ_DONTWAIT) == 0)
|
117
|
+
++send_count;
|
118
|
+
|
119
|
+
// Now receive all sent messages
|
120
|
+
int recv_count = 0;
|
121
|
+
while (zmq_recv (bind_socket, NULL, 0, ZMQ_DONTWAIT) == 0)
|
122
|
+
++recv_count;
|
123
|
+
|
124
|
+
assert (send_count == recv_count);
|
125
|
+
|
65
126
|
// Now it should be possible to send one more.
|
66
|
-
rc = zmq_send (
|
127
|
+
rc = zmq_send (connect_socket, NULL, 0, 0);
|
67
128
|
assert (rc == 0);
|
68
129
|
|
69
130
|
// Consume the remaining message.
|
70
|
-
rc = zmq_recv (
|
131
|
+
rc = zmq_recv (bind_socket, NULL, 0, 0);
|
132
|
+
assert (rc == 0);
|
133
|
+
|
134
|
+
// Clean up
|
135
|
+
rc = zmq_close (connect_socket);
|
136
|
+
assert (rc == 0);
|
137
|
+
|
138
|
+
rc = zmq_close (bind_socket);
|
139
|
+
assert (rc == 0);
|
140
|
+
|
141
|
+
rc = zmq_ctx_term (ctx);
|
142
|
+
assert (rc == 0);
|
143
|
+
|
144
|
+
return send_count;
|
145
|
+
}
|
146
|
+
|
147
|
+
int test_inproc_bind_first (int send_hwm, int recv_hwm)
|
148
|
+
{
|
149
|
+
return count_msg(send_hwm, recv_hwm, BIND_FIRST);
|
150
|
+
}
|
151
|
+
|
152
|
+
int test_inproc_connect_first (int send_hwm, int recv_hwm)
|
153
|
+
{
|
154
|
+
return count_msg(send_hwm, recv_hwm, CONNECT_FIRST);
|
155
|
+
}
|
156
|
+
|
157
|
+
int test_inproc_connect_and_close_first (int send_hwm, int recv_hwm)
|
158
|
+
{
|
159
|
+
void *ctx = zmq_ctx_new ();
|
160
|
+
assert (ctx);
|
161
|
+
int rc;
|
162
|
+
|
163
|
+
// Set up connect socket
|
164
|
+
void *connect_socket = zmq_socket (ctx, ZMQ_PUSH);
|
165
|
+
assert (connect_socket);
|
166
|
+
rc = zmq_setsockopt (connect_socket, ZMQ_SNDHWM, &send_hwm, sizeof (send_hwm));
|
167
|
+
assert (rc == 0);
|
168
|
+
rc = zmq_connect (connect_socket, "inproc://a");
|
169
|
+
assert (rc == 0);
|
170
|
+
|
171
|
+
// Send until we block
|
172
|
+
int send_count = 0;
|
173
|
+
while (send_count < MAX_SENDS && zmq_send (connect_socket, NULL, 0, ZMQ_DONTWAIT) == 0)
|
174
|
+
++send_count;
|
175
|
+
|
176
|
+
// Close connect
|
177
|
+
rc = zmq_close (connect_socket);
|
178
|
+
assert (rc == 0);
|
179
|
+
|
180
|
+
// Set up bind socket
|
181
|
+
void *bind_socket = zmq_socket (ctx, ZMQ_PULL);
|
182
|
+
assert (bind_socket);
|
183
|
+
rc = zmq_setsockopt (bind_socket, ZMQ_RCVHWM, &recv_hwm, sizeof (recv_hwm));
|
71
184
|
assert (rc == 0);
|
185
|
+
rc = zmq_bind (bind_socket, "inproc://a");
|
186
|
+
assert (rc == 0);
|
187
|
+
|
188
|
+
// Now receive all sent messages
|
189
|
+
int recv_count = 0;
|
190
|
+
while (zmq_recv (bind_socket, NULL, 0, ZMQ_DONTWAIT) == 0)
|
191
|
+
++recv_count;
|
192
|
+
|
193
|
+
assert (send_count == recv_count);
|
72
194
|
|
73
|
-
|
195
|
+
// Clean up
|
196
|
+
rc = zmq_close (bind_socket);
|
74
197
|
assert (rc == 0);
|
75
198
|
|
76
|
-
rc =
|
199
|
+
rc = zmq_ctx_term (ctx);
|
77
200
|
assert (rc == 0);
|
78
201
|
|
79
|
-
|
202
|
+
return send_count;
|
203
|
+
}
|
204
|
+
|
205
|
+
int test_inproc_bind_and_close_first (int send_hwm, int recv_hwm)
|
206
|
+
{
|
207
|
+
void *ctx = zmq_ctx_new ();
|
208
|
+
assert (ctx);
|
209
|
+
int rc;
|
210
|
+
|
211
|
+
// Set up bind socket
|
212
|
+
void *bind_socket = zmq_socket (ctx, ZMQ_PUSH);
|
213
|
+
assert (bind_socket);
|
214
|
+
rc = zmq_setsockopt (bind_socket, ZMQ_SNDHWM, &send_hwm, sizeof (send_hwm));
|
215
|
+
assert (rc == 0);
|
216
|
+
rc = zmq_bind (bind_socket, "inproc://a");
|
80
217
|
assert (rc == 0);
|
81
218
|
|
82
|
-
|
219
|
+
// Send until we block
|
220
|
+
int send_count = 0;
|
221
|
+
while (send_count < MAX_SENDS && zmq_send (bind_socket, NULL, 0, ZMQ_DONTWAIT) == 0)
|
222
|
+
++send_count;
|
223
|
+
|
224
|
+
// Close bind
|
225
|
+
rc = zmq_close (bind_socket);
|
226
|
+
assert (rc == 0);
|
227
|
+
|
228
|
+
/* Can't currently do connect without then wiring up a bind as things hang, this needs top be fixed.
|
229
|
+
// Set up connect socket
|
230
|
+
void *connect_socket = zmq_socket (ctx, ZMQ_PULL);
|
231
|
+
assert (connect_socket);
|
232
|
+
rc = zmq_setsockopt (connect_socket, ZMQ_RCVHWM, &recv_hwm, sizeof (recv_hwm));
|
233
|
+
assert (rc == 0);
|
234
|
+
rc = zmq_connect (connect_socket, "inproc://a");
|
235
|
+
assert (rc == 0);
|
236
|
+
|
237
|
+
// Now receive all sent messages
|
238
|
+
int recv_count = 0;
|
239
|
+
while (zmq_recv (connect_socket, NULL, 0, ZMQ_DONTWAIT) == 0)
|
240
|
+
++recv_count;
|
241
|
+
|
242
|
+
assert (send_count == recv_count);
|
243
|
+
*/
|
244
|
+
|
245
|
+
// Clean up
|
246
|
+
//rc = zmq_close (connect_socket);
|
247
|
+
//assert (rc == 0);
|
248
|
+
|
249
|
+
rc = zmq_ctx_term (ctx);
|
250
|
+
assert (rc == 0);
|
251
|
+
|
252
|
+
return send_count;
|
253
|
+
}
|
254
|
+
|
255
|
+
int main (void)
|
256
|
+
{
|
257
|
+
setup_test_environment();
|
258
|
+
|
259
|
+
int count;
|
260
|
+
|
261
|
+
// Default values are 1000 on send and 1000 one receive, so 2000 total
|
262
|
+
count = test_defaults ();
|
263
|
+
assert (count == 2000);
|
264
|
+
|
265
|
+
// Infinite send and receive buffer
|
266
|
+
count = test_inproc_bind_first (0, 0);
|
267
|
+
assert (count == MAX_SENDS);
|
268
|
+
count = test_inproc_connect_first (0, 0);
|
269
|
+
assert (count == MAX_SENDS);
|
270
|
+
|
271
|
+
// Infinite send buffer
|
272
|
+
count = test_inproc_bind_first (1, 0);
|
273
|
+
assert (count == MAX_SENDS);
|
274
|
+
count = test_inproc_connect_first (1, 0);
|
275
|
+
assert (count == MAX_SENDS);
|
276
|
+
|
277
|
+
// Infinite receive buffer
|
278
|
+
count = test_inproc_bind_first (0, 1);
|
279
|
+
assert (count == MAX_SENDS);
|
280
|
+
count = test_inproc_connect_first (0, 1);
|
281
|
+
assert (count == MAX_SENDS);
|
282
|
+
|
283
|
+
// Send and recv buffers hwm 1, so total that can be queued is 2
|
284
|
+
count = test_inproc_bind_first (1, 1);
|
285
|
+
assert (count == 2);
|
286
|
+
count = test_inproc_connect_first (1, 1);
|
287
|
+
assert (count == 2);
|
288
|
+
|
289
|
+
// Send hwm of 1, send before bind so total that can be queued is 1
|
290
|
+
count = test_inproc_connect_and_close_first (1, 0);
|
291
|
+
assert (count == 1);
|
292
|
+
|
293
|
+
// Send hwm of 1, send from bind side before connect so total that can be queued should be 1,
|
294
|
+
// however currently all messages get thrown away before the connect. BUG?
|
295
|
+
count = test_inproc_bind_and_close_first (1, 0);
|
296
|
+
//assert (count == 1);
|
297
|
+
|
298
|
+
return 0;
|
83
299
|
}
|