rbczmq 1.7.1 → 1.7.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (437) hide show
  1. checksums.yaml +8 -8
  2. data/.gitmodules +1 -1
  3. data/CHANGELOG.rdoc +4 -0
  4. data/Gemfile.lock +1 -1
  5. data/README.rdoc +5 -4
  6. data/ext/czmq/.gitignore +5 -0
  7. data/ext/czmq/.travis.yml +10 -1
  8. data/ext/czmq/AUTHORS +2 -0
  9. data/ext/czmq/COPYING.LESSER +3 -0
  10. data/ext/czmq/Makefile.am +13 -3
  11. data/ext/czmq/NEWS +132 -0
  12. data/ext/czmq/README.md +1553 -615
  13. data/ext/czmq/README.txt +188 -72
  14. data/ext/czmq/addons/Makefile.am +9 -0
  15. data/ext/czmq/addons/makecert.c +72 -0
  16. data/ext/czmq/builds/mingw32/Makefile.mingw32 +11 -3
  17. data/ext/czmq/builds/msvc/.gitignore +4 -1
  18. data/ext/czmq/builds/msvc/czmq.vcproj +4 -0
  19. data/ext/czmq/builds/msvc/czmq.vcxproj +6 -1
  20. data/ext/czmq/builds/msvc/czmq.vcxproj.filters +4 -1
  21. data/ext/{zeromq/cmake/Modules/zmq_version.cpp → czmq/builds/msvc/platform.h} +10 -9
  22. data/ext/czmq/configure.ac +64 -5
  23. data/ext/czmq/doc/Makefile.am +8 -1
  24. data/ext/czmq/doc/mkmans +17 -0
  25. data/ext/czmq/doc/zauth.txt +191 -0
  26. data/ext/czmq/doc/zbeacon.txt +13 -22
  27. data/ext/czmq/doc/zcert.txt +122 -0
  28. data/ext/czmq/doc/zcertstore.txt +107 -0
  29. data/ext/czmq/doc/zchunk.txt +77 -0
  30. data/ext/czmq/doc/zclock.txt +8 -0
  31. data/ext/czmq/doc/zconfig.txt +9 -63
  32. data/ext/czmq/doc/zctx.txt +26 -7
  33. data/ext/czmq/doc/zdir.txt +83 -0
  34. data/ext/czmq/doc/zfile.txt +130 -35
  35. data/ext/czmq/doc/zframe.txt +6 -39
  36. data/ext/czmq/doc/zhash.txt +55 -10
  37. data/ext/czmq/doc/zlist.txt +2 -4
  38. data/ext/czmq/doc/zloop.txt +7 -1
  39. data/ext/czmq/doc/zmsg.txt +75 -32
  40. data/ext/czmq/doc/zpoller.txt +88 -0
  41. data/ext/czmq/doc/zsocket.txt +50 -1
  42. data/ext/czmq/doc/zsockopt.txt +185 -251
  43. data/ext/czmq/doc/zstr.txt +14 -3
  44. data/ext/czmq/doc/zsys.txt +89 -1
  45. data/ext/czmq/doc/ztree.txt +21 -11
  46. data/ext/czmq/examples/security/LICENSE +18 -0
  47. data/ext/czmq/examples/security/README.txt +9 -0
  48. data/ext/czmq/examples/security/grasslands.c +29 -0
  49. data/ext/czmq/examples/security/hello.c +10 -0
  50. data/ext/czmq/examples/security/ironhouse.c +55 -0
  51. data/ext/czmq/examples/security/ironhouse2.c +103 -0
  52. data/ext/czmq/examples/security/stonehouse.c +51 -0
  53. data/ext/czmq/examples/security/strawhouse.c +44 -0
  54. data/ext/czmq/examples/security/woodhouse.c +40 -0
  55. data/ext/czmq/images/README_1.png +0 -0
  56. data/ext/czmq/images/README_2.png +0 -0
  57. data/ext/czmq/include/czmq.h +10 -4
  58. data/ext/czmq/include/czmq_prelude.h +42 -42
  59. data/ext/czmq/include/zauth.h +97 -0
  60. data/ext/czmq/include/zbeacon.h +0 -5
  61. data/ext/czmq/include/zcert.h +118 -0
  62. data/ext/czmq/include/zcertstore.h +78 -0
  63. data/ext/czmq/include/zchunk.h +87 -0
  64. data/ext/czmq/include/zclock.h +4 -0
  65. data/ext/czmq/include/zconfig.h +21 -12
  66. data/ext/czmq/include/zctx.h +34 -11
  67. data/ext/czmq/include/zdir.h +90 -0
  68. data/ext/czmq/include/zfile.h +104 -25
  69. data/ext/czmq/include/zframe.h +7 -20
  70. data/ext/czmq/include/zhash.h +13 -0
  71. data/ext/czmq/include/zlist.h +0 -4
  72. data/ext/czmq/include/zloop.h +5 -5
  73. data/ext/czmq/include/zmsg.h +59 -29
  74. data/ext/czmq/include/zmutex.h +5 -0
  75. data/ext/czmq/include/zpoller.h +72 -0
  76. data/ext/czmq/include/zsocket.h +12 -15
  77. data/ext/czmq/include/zsockopt.h +124 -121
  78. data/ext/czmq/include/zstr.h +12 -9
  79. data/ext/czmq/include/zsys.h +50 -2
  80. data/ext/czmq/mkdoc +1 -1
  81. data/ext/czmq/model/sockopts.xml +101 -21
  82. data/ext/czmq/scripts/sockopts.gsl +95 -41
  83. data/ext/czmq/src/Makefile.am +13 -0
  84. data/ext/czmq/src/czmq_selftest.c +16 -10
  85. data/ext/czmq/src/selftest +2 -2
  86. data/ext/czmq/src/zauth.c +714 -0
  87. data/ext/czmq/src/zbeacon.c +27 -35
  88. data/ext/czmq/src/zcert.c +463 -0
  89. data/ext/czmq/src/zcertstore.c +265 -0
  90. data/ext/czmq/src/zchunk.c +207 -0
  91. data/ext/czmq/src/zclock.c +18 -0
  92. data/ext/czmq/src/zconfig.c +116 -99
  93. data/ext/czmq/src/zctx.c +103 -18
  94. data/ext/czmq/src/zdir.c +409 -0
  95. data/ext/czmq/src/zfile.c +421 -130
  96. data/ext/czmq/src/zframe.c +28 -127
  97. data/ext/czmq/src/zhash.c +255 -139
  98. data/ext/czmq/src/zlist.c +2 -8
  99. data/ext/czmq/src/zloop.c +40 -13
  100. data/ext/czmq/src/zmsg.c +109 -141
  101. data/ext/czmq/src/zmutex.c +27 -1
  102. data/ext/czmq/src/zpoller.c +218 -0
  103. data/ext/czmq/src/zsocket.c +53 -66
  104. data/ext/czmq/src/zsockopt.c +2337 -682
  105. data/ext/czmq/src/zstr.c +48 -118
  106. data/ext/czmq/src/zsys.c +270 -3
  107. data/ext/czmq/src/zthread.c +2 -2
  108. data/ext/czmq/src/ztree.c +179 -180
  109. data/ext/rbczmq/beacon.c +1 -1
  110. data/ext/rbczmq/context.c +12 -3
  111. data/ext/rbczmq/context.h +7 -0
  112. data/ext/rbczmq/extconf.rb +13 -4
  113. data/ext/rbczmq/pollitem.c +1 -1
  114. data/ext/rbczmq/socket.c +34 -24
  115. data/ext/rbczmq/socket.h +3 -2
  116. data/ext/zeromq/AUTHORS +17 -3
  117. data/ext/zeromq/CMakeLists.txt +742 -339
  118. data/ext/zeromq/COPYING.LESSER +2 -0
  119. data/ext/zeromq/Makefile.am +3 -3
  120. data/ext/zeromq/NEWS +130 -1
  121. data/ext/zeromq/{README → README.md} +8 -9
  122. data/ext/zeromq/builds/cmake/Modules/FindAsciiDoc.cmake +24 -0
  123. data/ext/zeromq/builds/cmake/Modules/TestZMQVersion.cmake +18 -0
  124. data/ext/zeromq/builds/cmake/Modules/ZMQSourceRunChecks.cmake +129 -0
  125. data/ext/zeromq/{cmake → builds/cmake}/NSIS.template32.in +1 -1
  126. data/ext/zeromq/{cmake → builds/cmake}/NSIS.template64.in +1 -1
  127. data/ext/zeromq/builds/cmake/platform.hpp.in +88 -0
  128. data/ext/zeromq/builds/mingw32/Makefile.mingw32 +47 -0
  129. data/ext/zeromq/{src/i_msg_sink.hpp → builds/mingw32/platform.hpp} +10 -21
  130. data/ext/zeromq/builds/msvc/Makefile.am +5 -2
  131. data/ext/zeromq/builds/msvc/c_local_lat/c_local_lat.vcxproj +1 -1
  132. data/ext/zeromq/builds/msvc/c_local_lat/c_local_lat11.vcxproj +91 -0
  133. data/ext/zeromq/builds/msvc/c_local_thr/c_local_thr.vcproj +2 -0
  134. data/ext/zeromq/builds/msvc/c_local_thr/c_local_thr.vcxproj +21 -1
  135. data/ext/zeromq/builds/msvc/c_local_thr/c_local_thr11.vcxproj +111 -0
  136. data/ext/zeromq/builds/msvc/c_remote_lat/c_remote_lat.vcxproj +1 -1
  137. data/ext/zeromq/builds/msvc/c_remote_lat/c_remote_lat11.vcxproj +91 -0
  138. data/ext/zeromq/builds/msvc/c_remote_thr/c_remote_thr.vcproj +2 -0
  139. data/ext/zeromq/builds/msvc/c_remote_thr/c_remote_thr.vcxproj +21 -1
  140. data/ext/zeromq/builds/msvc/c_remote_thr/c_remote_thr11.vcxproj +111 -0
  141. data/ext/zeromq/builds/msvc/errno.cpp +1 -1
  142. data/ext/zeromq/builds/msvc/errno.hpp +1 -1
  143. data/ext/zeromq/builds/msvc/inproc_lat/inproc_lat.vcproj +176 -174
  144. data/ext/zeromq/builds/msvc/inproc_lat/inproc_lat.vcxproj +21 -1
  145. data/ext/zeromq/builds/msvc/inproc_lat/inproc_lat11.vcxproj +110 -0
  146. data/ext/zeromq/builds/msvc/inproc_thr/inproc_thr.vcproj +176 -174
  147. data/ext/zeromq/builds/msvc/inproc_thr/inproc_thr.vcxproj +21 -1
  148. data/ext/zeromq/builds/msvc/inproc_thr/inproc_thr11.vcxproj +110 -0
  149. data/ext/zeromq/builds/msvc/libzmq/libzmq.vcproj +997 -804
  150. data/ext/zeromq/builds/msvc/libzmq/libzmq.vcxproj +78 -2
  151. data/ext/zeromq/builds/msvc/libzmq/libzmq.vcxproj.filters +42 -6
  152. data/ext/zeromq/builds/msvc/libzmq/libzmq11.vcxproj +362 -0
  153. data/ext/zeromq/builds/msvc/msvc.sln +6 -0
  154. data/ext/zeromq/builds/msvc/msvc10.sln +36 -2
  155. data/ext/zeromq/builds/msvc/msvc11.sln +150 -0
  156. data/ext/zeromq/builds/msvc/properties/Static.props +15 -0
  157. data/ext/zeromq/builds/msvc/properties/ZeroMQ.props +0 -1
  158. data/ext/zeromq/builds/msvc/properties/ZeroMQ_Static.props +23 -0
  159. data/ext/zeromq/builds/redhat/zeromq.spec.in +2 -1
  160. data/ext/zeromq/{configure.in → configure.ac} +74 -15
  161. data/ext/zeromq/doc/Makefile.am +6 -4
  162. data/ext/zeromq/doc/zmq.txt +30 -3
  163. data/ext/zeromq/doc/zmq_bind.txt +2 -2
  164. data/ext/zeromq/doc/zmq_close.txt +2 -2
  165. data/ext/zeromq/doc/zmq_connect.txt +9 -7
  166. data/ext/zeromq/doc/zmq_ctx_destroy.txt +4 -3
  167. data/ext/zeromq/doc/zmq_ctx_get.txt +8 -3
  168. data/ext/zeromq/doc/zmq_ctx_new.txt +3 -2
  169. data/ext/zeromq/doc/zmq_ctx_set.txt +13 -1
  170. data/ext/zeromq/doc/zmq_ctx_shutdown.txt +52 -0
  171. data/ext/zeromq/doc/zmq_ctx_term.txt +67 -0
  172. data/ext/zeromq/doc/zmq_curve.txt +92 -0
  173. data/ext/zeromq/doc/zmq_curve_keypair.txt +56 -0
  174. data/ext/zeromq/doc/zmq_disconnect.txt +2 -2
  175. data/ext/zeromq/doc/zmq_epgm.txt +5 -4
  176. data/ext/zeromq/doc/zmq_errno.txt +2 -2
  177. data/ext/zeromq/doc/zmq_getsockopt.txt +149 -24
  178. data/ext/zeromq/doc/zmq_init.txt +2 -2
  179. data/ext/zeromq/doc/zmq_inproc.txt +2 -2
  180. data/ext/zeromq/doc/zmq_ipc.txt +10 -5
  181. data/ext/zeromq/doc/zmq_msg_close.txt +4 -3
  182. data/ext/zeromq/doc/zmq_msg_copy.txt +2 -2
  183. data/ext/zeromq/doc/zmq_msg_data.txt +2 -2
  184. data/ext/zeromq/doc/zmq_msg_get.txt +3 -3
  185. data/ext/zeromq/doc/zmq_msg_init.txt +2 -2
  186. data/ext/zeromq/doc/zmq_msg_init_data.txt +2 -2
  187. data/ext/zeromq/doc/zmq_msg_init_size.txt +2 -2
  188. data/ext/zeromq/doc/zmq_msg_more.txt +6 -4
  189. data/ext/zeromq/doc/zmq_msg_move.txt +2 -2
  190. data/ext/zeromq/doc/zmq_msg_recv.txt +3 -4
  191. data/ext/zeromq/doc/zmq_msg_send.txt +10 -7
  192. data/ext/zeromq/doc/zmq_msg_set.txt +2 -1
  193. data/ext/zeromq/doc/zmq_msg_size.txt +2 -2
  194. data/ext/zeromq/doc/zmq_null.txt +27 -0
  195. data/ext/zeromq/doc/zmq_pgm.txt +5 -4
  196. data/ext/zeromq/doc/zmq_plain.txt +37 -0
  197. data/ext/zeromq/doc/zmq_poll.txt +2 -6
  198. data/ext/zeromq/doc/zmq_proxy.txt +2 -1
  199. data/ext/zeromq/doc/zmq_recv.txt +2 -5
  200. data/ext/zeromq/doc/zmq_recvmsg.txt +3 -5
  201. data/ext/zeromq/doc/zmq_send.txt +9 -7
  202. data/ext/zeromq/doc/zmq_send_const.txt +103 -0
  203. data/ext/zeromq/doc/zmq_sendmsg.txt +8 -8
  204. data/ext/zeromq/doc/zmq_setsockopt.txt +291 -37
  205. data/ext/zeromq/doc/zmq_socket.txt +92 -21
  206. data/ext/zeromq/doc/zmq_socket_monitor.txt +102 -131
  207. data/ext/zeromq/doc/zmq_strerror.txt +3 -2
  208. data/ext/zeromq/doc/zmq_tcp.txt +4 -2
  209. data/ext/zeromq/doc/zmq_term.txt +3 -3
  210. data/ext/zeromq/doc/zmq_unbind.txt +2 -2
  211. data/ext/zeromq/doc/zmq_version.txt +3 -2
  212. data/ext/zeromq/doc/zmq_z85_decode.txt +50 -0
  213. data/ext/zeromq/doc/zmq_z85_encode.txt +57 -0
  214. data/ext/zeromq/foreign/openpgm/libpgm-5.2.122~dfsg.tar.gz +0 -0
  215. data/ext/zeromq/include/zmq.h +179 -136
  216. data/ext/zeromq/include/zmq_utils.h +44 -3
  217. data/ext/zeromq/perf/inproc_lat.cpp +2 -4
  218. data/ext/zeromq/perf/inproc_thr.cpp +1 -1
  219. data/ext/zeromq/perf/local_lat.cpp +1 -3
  220. data/ext/zeromq/perf/local_thr.cpp +1 -3
  221. data/ext/zeromq/perf/remote_lat.cpp +1 -3
  222. data/ext/zeromq/perf/remote_thr.cpp +1 -8
  223. data/ext/zeromq/src/Makefile.am +26 -7
  224. data/ext/zeromq/src/address.cpp +7 -8
  225. data/ext/zeromq/src/address.hpp +1 -2
  226. data/ext/zeromq/src/array.hpp +1 -3
  227. data/ext/zeromq/src/atomic_counter.hpp +11 -3
  228. data/ext/zeromq/src/atomic_ptr.hpp +9 -3
  229. data/ext/zeromq/src/blob.hpp +2 -2
  230. data/ext/zeromq/src/clock.cpp +3 -4
  231. data/ext/zeromq/src/clock.hpp +1 -2
  232. data/ext/zeromq/src/command.hpp +2 -3
  233. data/ext/zeromq/src/config.hpp +1 -3
  234. data/ext/zeromq/src/ctx.cpp +154 -15
  235. data/ext/zeromq/src/ctx.hpp +34 -3
  236. data/ext/zeromq/src/curve_client.cpp +410 -0
  237. data/ext/zeromq/src/curve_client.hpp +109 -0
  238. data/ext/zeromq/src/curve_server.cpp +629 -0
  239. data/ext/zeromq/src/curve_server.hpp +120 -0
  240. data/ext/zeromq/src/dbuffer.hpp +134 -0
  241. data/ext/zeromq/src/dealer.cpp +52 -60
  242. data/ext/zeromq/src/dealer.hpp +12 -26
  243. data/ext/zeromq/src/decoder.hpp +27 -102
  244. data/ext/zeromq/src/devpoll.cpp +1 -3
  245. data/ext/zeromq/src/devpoll.hpp +1 -3
  246. data/ext/zeromq/src/dist.cpp +17 -15
  247. data/ext/zeromq/src/dist.hpp +5 -6
  248. data/ext/zeromq/src/encoder.hpp +32 -52
  249. data/ext/zeromq/src/epoll.cpp +1 -3
  250. data/ext/zeromq/src/epoll.hpp +1 -3
  251. data/ext/zeromq/src/err.cpp +2 -4
  252. data/ext/zeromq/src/err.hpp +7 -4
  253. data/ext/zeromq/src/fd.hpp +1 -2
  254. data/ext/zeromq/src/fq.cpp +2 -5
  255. data/ext/zeromq/src/fq.hpp +2 -4
  256. data/ext/zeromq/src/i_decoder.hpp +11 -9
  257. data/ext/zeromq/src/i_encoder.hpp +7 -11
  258. data/ext/zeromq/src/i_engine.hpp +3 -3
  259. data/ext/zeromq/src/i_poll_events.hpp +1 -3
  260. data/ext/zeromq/src/io_object.cpp +1 -3
  261. data/ext/zeromq/src/io_object.hpp +1 -3
  262. data/ext/zeromq/src/io_thread.cpp +1 -3
  263. data/ext/zeromq/src/io_thread.hpp +1 -3
  264. data/ext/zeromq/src/ip.cpp +46 -5
  265. data/ext/zeromq/src/ip.hpp +7 -4
  266. data/ext/zeromq/src/ipc_address.cpp +13 -2
  267. data/ext/zeromq/src/ipc_address.hpp +1 -2
  268. data/ext/zeromq/src/ipc_connecter.cpp +3 -3
  269. data/ext/zeromq/src/ipc_connecter.hpp +1 -2
  270. data/ext/zeromq/src/ipc_listener.cpp +15 -10
  271. data/ext/zeromq/src/ipc_listener.hpp +1 -2
  272. data/ext/zeromq/src/kqueue.cpp +11 -3
  273. data/ext/zeromq/src/kqueue.hpp +7 -3
  274. data/ext/zeromq/src/lb.cpp +13 -11
  275. data/ext/zeromq/src/lb.hpp +10 -5
  276. data/ext/zeromq/src/libzmq.pc.cmake.in +10 -0
  277. data/ext/zeromq/src/likely.hpp +1 -2
  278. data/ext/zeromq/src/mailbox.cpp +1 -4
  279. data/ext/zeromq/src/mailbox.hpp +8 -3
  280. data/ext/zeromq/src/mechanism.cpp +163 -0
  281. data/ext/zeromq/src/mechanism.hpp +101 -0
  282. data/ext/zeromq/src/msg.cpp +38 -18
  283. data/ext/zeromq/src/msg.hpp +19 -7
  284. data/ext/zeromq/src/mtrie.cpp +16 -14
  285. data/ext/zeromq/src/mtrie.hpp +1 -3
  286. data/ext/zeromq/src/mutex.hpp +42 -3
  287. data/ext/zeromq/src/null_mechanism.cpp +282 -0
  288. data/ext/zeromq/src/null_mechanism.hpp +65 -0
  289. data/ext/zeromq/src/object.cpp +29 -3
  290. data/ext/zeromq/src/object.hpp +8 -5
  291. data/ext/zeromq/src/options.cpp +557 -485
  292. data/ext/zeromq/src/options.hpp +38 -24
  293. data/ext/zeromq/src/own.cpp +1 -2
  294. data/ext/zeromq/src/own.hpp +1 -2
  295. data/ext/zeromq/src/pair.cpp +8 -25
  296. data/ext/zeromq/src/pair.hpp +5 -22
  297. data/ext/zeromq/src/pgm_receiver.cpp +80 -67
  298. data/ext/zeromq/src/pgm_receiver.hpp +11 -10
  299. data/ext/zeromq/src/pgm_sender.cpp +37 -16
  300. data/ext/zeromq/src/pgm_sender.hpp +12 -6
  301. data/ext/zeromq/src/pgm_socket.cpp +8 -8
  302. data/ext/zeromq/src/pgm_socket.hpp +1 -4
  303. data/ext/zeromq/src/pipe.cpp +110 -72
  304. data/ext/zeromq/src/pipe.hpp +36 -27
  305. data/ext/zeromq/src/plain_mechanism.cpp +482 -0
  306. data/ext/zeromq/src/plain_mechanism.hpp +88 -0
  307. data/ext/zeromq/src/poll.cpp +1 -3
  308. data/ext/zeromq/src/poll.hpp +1 -3
  309. data/ext/zeromq/src/poller.hpp +1 -3
  310. data/ext/zeromq/src/poller_base.cpp +3 -3
  311. data/ext/zeromq/src/poller_base.hpp +1 -2
  312. data/ext/zeromq/src/precompiled.cpp +1 -2
  313. data/ext/zeromq/src/precompiled.hpp +1 -2
  314. data/ext/zeromq/src/proxy.cpp +1 -2
  315. data/ext/zeromq/src/proxy.hpp +1 -2
  316. data/ext/zeromq/src/pub.cpp +2 -16
  317. data/ext/zeromq/src/pub.hpp +2 -19
  318. data/ext/zeromq/src/pull.cpp +7 -24
  319. data/ext/zeromq/src/pull.hpp +4 -21
  320. data/ext/zeromq/src/push.cpp +8 -22
  321. data/ext/zeromq/src/push.hpp +4 -21
  322. data/ext/zeromq/src/random.cpp +1 -2
  323. data/ext/zeromq/src/random.hpp +1 -2
  324. data/ext/zeromq/src/raw_decoder.cpp +63 -0
  325. data/ext/zeromq/src/raw_decoder.hpp +66 -0
  326. data/ext/zeromq/src/raw_encoder.cpp +40 -0
  327. data/ext/zeromq/src/raw_encoder.hpp +60 -0
  328. data/ext/zeromq/src/reaper.cpp +12 -2
  329. data/ext/zeromq/src/reaper.hpp +6 -2
  330. data/ext/zeromq/src/rep.cpp +7 -21
  331. data/ext/zeromq/src/rep.hpp +3 -20
  332. data/ext/zeromq/src/req.cpp +132 -38
  333. data/ext/zeromq/src/req.hpp +27 -8
  334. data/ext/zeromq/src/router.cpp +109 -65
  335. data/ext/zeromq/src/router.hpp +9 -23
  336. data/ext/zeromq/src/select.cpp +1 -3
  337. data/ext/zeromq/src/select.hpp +1 -3
  338. data/ext/zeromq/src/session_base.cpp +164 -118
  339. data/ext/zeromq/src/session_base.hpp +29 -22
  340. data/ext/zeromq/src/signaler.cpp +127 -19
  341. data/ext/zeromq/src/signaler.hpp +20 -3
  342. data/ext/zeromq/src/socket_base.cpp +167 -134
  343. data/ext/zeromq/src/socket_base.hpp +18 -20
  344. data/ext/zeromq/src/stdint.hpp +1 -2
  345. data/ext/zeromq/src/stream.cpp +257 -0
  346. data/ext/zeromq/src/stream.hpp +97 -0
  347. data/ext/zeromq/src/stream_engine.cpp +405 -157
  348. data/ext/zeromq/src/stream_engine.hpp +72 -23
  349. data/ext/zeromq/src/sub.cpp +5 -18
  350. data/ext/zeromq/src/sub.hpp +2 -19
  351. data/ext/zeromq/src/tcp.cpp +23 -3
  352. data/ext/zeromq/src/tcp.hpp +7 -3
  353. data/ext/zeromq/src/tcp_address.cpp +35 -46
  354. data/ext/zeromq/src/tcp_address.hpp +7 -12
  355. data/ext/zeromq/src/tcp_connecter.cpp +10 -5
  356. data/ext/zeromq/src/tcp_connecter.hpp +1 -3
  357. data/ext/zeromq/src/tcp_listener.cpp +19 -8
  358. data/ext/zeromq/src/tcp_listener.hpp +1 -3
  359. data/ext/zeromq/src/thread.cpp +2 -4
  360. data/ext/zeromq/src/thread.hpp +1 -3
  361. data/ext/zeromq/src/trie.cpp +122 -125
  362. data/ext/zeromq/src/trie.hpp +1 -4
  363. data/ext/zeromq/src/v1_decoder.cpp +77 -91
  364. data/ext/zeromq/src/v1_decoder.hpp +10 -21
  365. data/ext/zeromq/src/v1_encoder.cpp +24 -62
  366. data/ext/zeromq/src/v1_encoder.hpp +7 -18
  367. data/ext/zeromq/src/v2_decoder.cpp +142 -0
  368. data/ext/zeromq/src/v2_decoder.hpp +57 -0
  369. data/ext/zeromq/src/v2_encoder.cpp +67 -0
  370. data/ext/zeromq/src/{i_msg_source.hpp → v2_encoder.hpp} +20 -15
  371. data/ext/zeromq/src/{v1_protocol.hpp → v2_protocol.hpp} +7 -11
  372. data/ext/zeromq/src/windows.hpp +2 -4
  373. data/ext/zeromq/src/wire.hpp +5 -6
  374. data/ext/zeromq/src/xpub.cpp +37 -46
  375. data/ext/zeromq/src/xpub.hpp +7 -23
  376. data/ext/zeromq/src/xsub.cpp +26 -40
  377. data/ext/zeromq/src/xsub.hpp +5 -21
  378. data/ext/zeromq/src/ypipe.hpp +3 -4
  379. data/ext/zeromq/src/ypipe_base.hpp +44 -0
  380. data/ext/zeromq/src/ypipe_conflate.hpp +127 -0
  381. data/ext/zeromq/src/yqueue.hpp +3 -7
  382. data/ext/zeromq/src/zmq.cpp +76 -96
  383. data/ext/zeromq/src/zmq_utils.cpp +146 -8
  384. data/ext/zeromq/tests/Makefile.am +56 -8
  385. data/ext/zeromq/tests/test_abstract_ipc.cpp +57 -0
  386. data/ext/zeromq/tests/test_conflate.cpp +75 -0
  387. data/ext/zeromq/tests/test_connect_resolve.cpp +14 -15
  388. data/ext/zeromq/tests/test_ctx_destroy.cpp +90 -0
  389. data/ext/zeromq/tests/test_ctx_options.cpp +52 -0
  390. data/ext/zeromq/tests/test_disconnect_inproc.cpp +35 -30
  391. data/ext/zeromq/tests/test_fork.cpp +81 -0
  392. data/ext/zeromq/tests/test_hwm.cpp +251 -35
  393. data/ext/zeromq/tests/test_immediate.cpp +229 -0
  394. data/ext/zeromq/tests/test_inproc_connect.cpp +339 -0
  395. data/ext/zeromq/tests/test_invalid_rep.cpp +9 -13
  396. data/ext/zeromq/tests/test_iov.cpp +106 -0
  397. data/ext/zeromq/tests/test_issue_566.cpp +85 -0
  398. data/ext/zeromq/tests/test_last_endpoint.cpp +14 -18
  399. data/ext/zeromq/tests/test_linger.cpp +93 -0
  400. data/ext/zeromq/tests/test_monitor.cpp +112 -129
  401. data/ext/zeromq/tests/test_msg_flags.cpp +17 -16
  402. data/ext/zeromq/tests/test_pair_inproc.cpp +25 -7
  403. data/ext/zeromq/tests/test_pair_ipc.cpp +4 -7
  404. data/ext/zeromq/tests/test_pair_tcp.cpp +4 -8
  405. data/ext/zeromq/tests/test_probe_router.cpp +72 -0
  406. data/ext/zeromq/tests/test_req_correlate.cpp +177 -0
  407. data/ext/zeromq/tests/test_req_relaxed.cpp +116 -0
  408. data/ext/zeromq/tests/test_reqrep_device.cpp +9 -17
  409. data/ext/zeromq/tests/test_reqrep_inproc.cpp +4 -7
  410. data/ext/zeromq/tests/test_reqrep_ipc.cpp +4 -7
  411. data/ext/zeromq/tests/test_reqrep_tcp.cpp +4 -8
  412. data/ext/zeromq/tests/test_router_mandatory.cpp +41 -22
  413. data/ext/zeromq/tests/test_security_curve.cpp +212 -0
  414. data/ext/zeromq/tests/test_security_null.cpp +148 -0
  415. data/ext/zeromq/tests/test_security_plain.cpp +150 -0
  416. data/ext/zeromq/tests/test_shutdown_stress.cpp +10 -23
  417. data/ext/zeromq/tests/test_spec_dealer.cpp +254 -0
  418. data/ext/zeromq/tests/test_spec_pushpull.cpp +293 -0
  419. data/ext/zeromq/tests/test_spec_rep.cpp +155 -0
  420. data/ext/zeromq/tests/test_spec_req.cpp +253 -0
  421. data/ext/zeromq/tests/test_spec_router.cpp +204 -0
  422. data/ext/zeromq/tests/test_stream.cpp +228 -0
  423. data/ext/zeromq/tests/test_sub_forward.cpp +14 -22
  424. data/ext/zeromq/tests/test_system.cpp +82 -0
  425. data/ext/zeromq/tests/test_term_endpoint.cpp +17 -31
  426. data/ext/zeromq/tests/test_timeo.cpp +34 -78
  427. data/ext/zeromq/tests/testutil.hpp +211 -26
  428. data/ext/zeromq/tools/Makefile.am +9 -0
  429. data/ext/zeromq/tools/curve_keygen.c +58 -0
  430. data/lib/zmq/version.rb +1 -1
  431. data/test/test_socket.rb +4 -3
  432. metadata +114 -15
  433. data/ext/zeromq/cmake/Modules/TestZMQVersion.cmake +0 -35
  434. data/ext/zeromq/foreign/openpgm/libpgm-5.1.118~dfsg.tar.gz +0 -0
  435. data/ext/zeromq/src/decoder.cpp +0 -166
  436. data/ext/zeromq/src/encoder.cpp +0 -102
  437. data/ext/zeromq/tests/test_connect_delay.cpp +0 -260
@@ -71,11 +71,9 @@ sequence of _zmq_send(request)_ and subsequent _zmq_recv(reply)_ calls. Each
71
71
  request sent is round-robined among all _services_, and each reply received is
72
72
  matched with the last issued request.
73
73
 
74
- When a 'ZMQ_REQ' socket enters the 'mute' state due to having reached the
75
- high water mark for all _services_, or if there are no _services_ at all, then
76
- any linkzmq:zmq_send[3] operations on the socket shall block until the
77
- 'mute' state ends or at least one _service_ becomes available for sending;
78
- messages are not discarded.
74
+ If no services are available, then any send operation on the socket shall
75
+ block until at least one _service_ becomes available. The REQ socket shall
76
+ not discard messages.
79
77
 
80
78
  [horizontal]
81
79
  .Summary of ZMQ_REQ characteristics
@@ -94,11 +92,7 @@ send replies to a _client_. This socket type allows only an alternating
94
92
  sequence of _zmq_recv(request)_ and subsequent _zmq_send(reply)_ calls. Each
95
93
  request received is fair-queued from among all _clients_, and each reply sent
96
94
  is routed to the _client_ that issued the last request. If the original
97
- requester doesn't exist any more the reply is silently discarded.
98
-
99
- When a 'ZMQ_REP' socket enters the 'mute' state due to having reached the
100
- high water mark for a _client_, then any replies sent to the _client_ in
101
- question shall be dropped until the mute state ends.
95
+ requester does not exist any more the reply is silently discarded.
102
96
 
103
97
  [horizontal]
104
98
  .Summary of ZMQ_REP characteristics
@@ -107,7 +101,6 @@ Direction:: Bidirectional
107
101
  Send/receive pattern:: Receive, Send, Receive, Send, ...
108
102
  Incoming routing strategy:: Fair-queued
109
103
  Outgoing routing strategy:: Last peer
110
- Action in mute state:: Drop
111
104
 
112
105
 
113
106
  ZMQ_DEALER
@@ -126,8 +119,6 @@ When a 'ZMQ_DEALER' socket is connected to a 'ZMQ_REP' socket each message sent
126
119
  must consist of an empty message part, the _delimiter_, followed by one or more
127
120
  _body parts_.
128
121
 
129
- Deprecated alias: 'ZMQ_XREQ'.
130
-
131
122
  [horizontal]
132
123
  .Summary of ZMQ_DEALER characteristics
133
124
  Compatible peer sockets:: 'ZMQ_ROUTER', 'ZMQ_REP', 'ZMQ_DEALER'
@@ -147,7 +138,7 @@ message before passing it to the application. Messages received are fair-queued
147
138
  from among all connected peers. When sending messages a 'ZMQ_ROUTER' socket shall
148
139
  remove the first part of the message and use it to determine the _identity_ of
149
140
  the peer the message shall be routed to. If the peer does not exist anymore
150
- the message shall be silently discarded by default, unless 'ZMQ_ROUTER_BEHAVIOR'
141
+ the message shall be silently discarded by default, unless 'ZMQ_ROUTER_MANDATORY'
151
142
  socket option is set to '1'.
152
143
 
153
144
  When a 'ZMQ_ROUTER' socket enters the 'mute' state due to having reached the
@@ -162,8 +153,6 @@ as seen by the application becomes: one or more _identity_ parts, _delimiter_
162
153
  part, one or more _body parts_. When sending replies to a 'ZMQ_REQ' socket the
163
154
  application must include the _delimiter_ part.
164
155
 
165
- Deprecated alias: 'ZMQ_XREP'.
166
-
167
156
  [horizontal]
168
157
  .Summary of ZMQ_ROUTER characteristics
169
158
  Compatible peer sockets:: 'ZMQ_DEALER', 'ZMQ_REQ', 'ZMQ_ROUTER'
@@ -216,7 +205,6 @@ Direction:: Unidirectional
216
205
  Send/receive pattern:: Receive only
217
206
  Incoming routing strategy:: Fair-queued
218
207
  Outgoing routing strategy:: N/A
219
- Action in mute state:: Drop
220
208
 
221
209
 
222
210
  ZMQ_XPUB
@@ -224,7 +212,8 @@ ZMQ_XPUB
224
212
  Same as ZMQ_PUB except that you can receive subscriptions from the peers
225
213
  in form of incoming messages. Subscription message is a byte 1 (for
226
214
  subscriptions) or byte 0 (for unsubscriptions) followed by the subscription
227
- body.
215
+ body. Messages without a sub/unsub prefix are also received, but have no
216
+ effect on subscription status.
228
217
 
229
218
  [horizontal]
230
219
  .Summary of ZMQ_XPUB characteristics
@@ -240,7 +229,8 @@ ZMQ_XSUB
240
229
  ^^^^^^^^
241
230
  Same as ZMQ_SUB except that you subscribe by sending subscription messages to
242
231
  the socket. Subscription message is a byte 1 (for subscriptions) or byte 0
243
- (for unsubscriptions) followed by the subscription body.
232
+ (for unsubscriptions) followed by the subscription body. Messages without a
233
+ sub/unsub prefix may also be sent, but have no effect on subscription status.
244
234
 
245
235
  [horizontal]
246
236
  .Summary of ZMQ_XSUB characteristics
@@ -333,6 +323,49 @@ Outgoing routing strategy:: N/A
333
323
  Action in mute state:: Block
334
324
 
335
325
 
326
+ Native Pattern
327
+ ~~~~~~~~~~~~~~
328
+ The native pattern is used for communicating with TCP peers and allows
329
+ asynchronous requests and replies in either direction.
330
+
331
+
332
+ ZMQ_STREAM
333
+ ^^^^^^^^^^
334
+ A socket of type 'ZMQ_STREAM' is used to send and receive TCP data from a
335
+ non-0MQ peer, when using the tcp:// transport. A 'ZMQ_STREAM' socket can
336
+ act as client and/or server, sending and/or receiving TCP data asynchronously.
337
+
338
+ When receiving TCP data, a 'ZMQ_STREAM' socket shall prepend a message part
339
+ containing the _identity_ of the originating peer to the message before passing
340
+ it to the application. Messages received are fair-queued from among all
341
+ connected peers.
342
+
343
+ When sending TCP data, a 'ZMQ_STREAM' socket shall remove the first part of the
344
+ message and use it to determine the _identity_ of the peer the message shall be
345
+ routed to, and unroutable messages shall cause an EHOSTUNREACH or EAGAIN error.
346
+
347
+ To open a connection to a server, use the zmq_connect call, and then fetch the
348
+ socket identity using the ZMQ_IDENTITY zmq_getsockopt call.
349
+
350
+ To close a specific client connection, as a server, send the identity frame
351
+ followed by a zero-length message (see EXAMPLE section).
352
+
353
+ The ZMQ_MSGMORE flag is ignored on data frames. You must send one identity frame
354
+ followed by one data frame.
355
+
356
+ Also, please note that omitting the ZMQ_MSGMORE flag will prevent sending further
357
+ data (from any client) on the same socket.
358
+
359
+ [horizontal]
360
+ .Summary of ZMQ_STREAM characteristics
361
+ Compatible peer sockets:: none.
362
+ Direction:: Bidirectional
363
+ Send/receive pattern:: Unrestricted
364
+ Outgoing routing strategy:: See text
365
+ Incoming routing strategy:: Fair-queued
366
+ Action in mute state:: EAGAIN
367
+
368
+
336
369
  RETURN VALUE
337
370
  ------------
338
371
  The _zmq_socket()_ function shall return an opaque handle to the newly created
@@ -351,6 +384,44 @@ The limit on the total number of open 0MQ sockets has been reached.
351
384
  *ETERM*::
352
385
  The context specified was terminated.
353
386
 
387
+ EXAMPLE
388
+ -------
389
+ .Creating a simple HTTP server using ZMQ_STREAM
390
+ ----
391
+ void *ctx = zmq_ctx_new ();
392
+ assert (ctx);
393
+ /* Create ZMQ_STREAM socket */
394
+ void *socket = zmq_socket (ctx, ZMQ_STREAM);
395
+ assert (socket);
396
+ int rc = zmq_bind (socket, "tcp://*:8080");
397
+ assert (rc == 0);
398
+ /* Data structure to hold the ZMQ_STREAM ID */
399
+ uint8_t id [256];
400
+ size_t id_size = 256;
401
+ while (1) {
402
+ /* Get HTTP request; ID frame and then request */
403
+ id_size = zmq_recv (server, id, 256, 0);
404
+ assert (id_size > 0);
405
+ /* Prepares the response */
406
+ char http_response [] =
407
+ "HTTP/1.0 200 OK\r\n"
408
+ "Content-Type: text/plain\r\n"
409
+ "\r\n"
410
+ "Hello, World!";
411
+ /* Sends the ID frame followed by the response */
412
+ zmq_send (socket, id, id_size, ZMQ_SNDMORE);
413
+ zmq_send (socket, http_response, strlen (http_response), ZMQ_SNDMORE);
414
+ /* Closes the connection by sending the ID frame followed by a zero response */
415
+ zmq_send (socket, id, id_size, ZMQ_SNDMORE);
416
+ zmq_send (socket, 0, 0, ZMQ_SNDMORE);
417
+ /* NOTE: If we don't use ZMQ_SNDMORE, then we won't be able to send more */
418
+ /* message to any client */
419
+ }
420
+ zmq_close (socket);
421
+ zmq_ctx_destroy (ctx);
422
+ ----
423
+
424
+
354
425
  SEE ALSO
355
426
  --------
356
427
  linkzmq:zmq_init[3]
@@ -365,5 +436,5 @@ linkzmq:zmq[7]
365
436
 
366
437
  AUTHORS
367
438
  -------
368
- This 0MQ manual page was written by Martin Sustrik <sustrik@250bpm.com>,
369
- Martin Lucina <mato@kotelna.sk>, and Pieter Hintjens <ph@imatix.com>.
439
+ This page was written by the 0MQ community. To make a change please
440
+ read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
@@ -17,168 +17,100 @@ DESCRIPTION
17
17
  -----------
18
18
  The _zmq_socket_monitor()_ function shall spawn a 'PAIR' socket that publishes
19
19
  socket state changes (events) over the inproc:// transport to a given endpoint.
20
- Messages are 'zmq_event_t' structs. It's recommended to connect via a 'PAIR'
21
- socket in another application thread and handle monitoring events there. It's
22
- possible to also supply a bitmask ('ZMQ_EVENT_ALL' or any combination of the
23
- 'ZMQ_EVENT_*' constants) of the events you're interested in.
24
20
 
25
- ----
26
- // monitoring thread
27
- static void *req_socket_monitor (void *ctx)
28
- {
29
- zmq_event_t event;
30
- int rc;
21
+ Messages consist of 2 Frames, the first containing the event-id and the
22
+ associated value. The second frame holds the affected endpoint as string.
31
23
 
32
- void *s = zmq_socket (ctx, ZMQ_PAIR);
33
- assert (s);
24
+ The layout of the first Frame is:
25
+ 16 bit event id
26
+ 32 bit event value
34
27
 
35
- rc = zmq_connect (s, "inproc://monitor.req");
36
- assert (rc == 0);
37
- while (true) {
38
- zmq_msg_t msg;
39
- zmq_msg_init (&msg);
40
- rc = zmq_recvmsg (s, &msg, 0);
41
- if (rc == -1 && zmq_errno() == ETERM) break;
42
- assert (rc != -1);
43
- memcpy (&event, zmq_msg_data (&msg), sizeof (event));
44
- switch (event.event) {
45
- case ZMQ_EVENT_CONNECTED:
46
- // handle socket connected event
47
- break;
48
- case ZMQ_EVENT_CLOSED:
49
- // handle socket closed event
50
- break;
51
- }
52
- }
53
- zmq_close (s);
54
- return NULL;
55
- }
28
+ event id and value are in the native byte order (for the machine the
29
+ application is running on). There is no padding between the fields.
56
30
 
57
- // register a monitor endpoint for all socket events
58
- rc = zmq_socket_monitor (req, "inproc://monitor.req", ZMQ_EVENT_ALL);
59
- assert (rc == 0);
31
+ The event value has to be interpreted in the context of the event id.
32
+ See 'Supported events' below for details.
60
33
 
61
- // spawn a monitoring thread
62
- rc = pthread_create (&threads [0], NULL, req_socket_monitor, ctx);
63
- assert (rc == 0);
64
34
  ----
65
35
 
66
36
  Only connection oriented (tcp and ipc) transports are supported in this initial
67
37
  implementation.
68
38
 
69
- Supported events are:
39
+ ----
70
40
 
41
+ Supported events
42
+ ----------------
71
43
 
72
44
  ZMQ_EVENT_CONNECTED: connection established
73
45
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
74
46
  The 'ZMQ_EVENT_CONNECTED' event triggers when a connection has been established
75
47
  to a remote peer. This can happen either synchronous or asynchronous.
48
+ Value is the FD of the newly connected socket.
76
49
 
77
- .Event metadata:
78
- ----
79
- data.connected.addr // peer address
80
- data.connected.fd // socket descriptor
81
- ----
82
50
 
83
51
  ZMQ_EVENT_CONNECT_DELAYED: synchronous connect failed, it's being polled
84
52
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
85
53
  The 'ZMQ_EVENT_CONNECT_DELAYED' event triggers when an immediate connection
86
- attempt is delayed and it's completion's being polled for.
54
+ attempt is delayed and its completion is being polled for.
55
+ Value has no meaning.
87
56
 
88
- .Event metadata:
89
- ----
90
- data.connect_delayed.addr // peer address
91
- data.connect_delayed.err // errno value
92
- ----
93
57
 
94
58
  ZMQ_EVENT_CONNECT_RETRIED: asynchronous connect / reconnection attempt
95
59
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
96
60
  The 'ZMQ_EVENT_CONNECT_RETRIED' event triggers when a connection attempt
97
61
  is being handled by reconnect timer. The reconnect interval's recomputed
98
62
  for each attempt.
63
+ Value is the reconnect interval.
99
64
 
100
- .Event metadata:
101
- ----
102
- data.connect_retried.addr // peer address
103
- data.connect_retried.interval // computed reconnect interval
104
- ----
105
65
 
106
66
  ZMQ_EVENT_LISTENING: socket bound to an address, ready to accept connections
107
67
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
108
68
  The 'ZMQ_EVENT_LISTENING' event triggers when a socket's successfully bound
109
69
  to a an interface.
70
+ Value is the FD of the newly bound socket.
110
71
 
111
- .Event metadata:
112
- ----
113
- data.listening.addr // listen address
114
- data.listening.fd // socket descriptor
115
- ----
116
72
 
117
73
  ZMQ_EVENT_BIND_FAILED: socket could not bind to an address
118
74
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
119
75
  The 'ZMQ_EVENT_BIND_FAILED' event triggers when a socket could not bind to
120
76
  a given interface.
77
+ Value is the errno generated by the bind call.
121
78
 
122
- .Event metadata:
123
- ----
124
- data.bind_failed.addr // listen address
125
- data.bind_failed.err // errno value
126
- ----
127
79
 
128
80
  ZMQ_EVENT_ACCEPTED: connection accepted to bound interface
129
81
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
130
82
  The 'ZMQ_EVENT_ACCEPTED' event triggers when a connection from a remote peer
131
83
  has been established with a socket's listen address.
84
+ Value is the FD of the accepted socket.
132
85
 
133
- .Event metadata:
134
- ----
135
- data.accepted.addr // listen address
136
- data.accepted.fd // socket descriptor
137
- ----
138
86
 
139
87
  ZMQ_EVENT_ACCEPT_FAILED: could not accept client connection
140
88
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
141
89
  The 'ZMQ_EVENT_ACCEPT_FAILED' event triggers when a connection attempt to
142
90
  a socket's bound address fails.
91
+ Value is the errno generated by accept.
143
92
 
144
- .Event metadata:
145
- ----
146
- data.accept_failed.addr // listen address
147
- data.accept_failed.err // errno value
148
- ----
149
93
 
150
94
  ZMQ_EVENT_CLOSED: connection closed
151
95
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
152
96
  The 'ZMQ_EVENT_CLOSED' event triggers when a connection's underlying descriptor
153
- has been closed.
97
+ has been closed.
98
+ Value is the former FD of the for the closed socket. FD has been closed already!
154
99
 
155
- .Event metadata:
156
- ----
157
- data.closed.addr // address
158
- data.closed.fd // socket descriptor
159
- ----
160
100
 
161
101
  ZMQ_EVENT_CLOSE_FAILED: connection couldn't be closed
162
102
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
163
103
  The 'ZMQ_EVENT_CLOSE_FAILED' event triggers when a descriptor could not be
164
- released back to the OS.
104
+ released back to the OS. Implementation note: ONLY FOR IPC SOCKETS.
105
+ Value is the errno generated by unlink.
165
106
 
166
- .Event metadata:
167
- ----
168
- data.close_failed.addr // address
169
- data.close_failed.err // errno value
170
- ----
171
107
 
172
108
  ZMQ_EVENT_DISCONNECTED: broken session
173
109
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
174
110
  The 'ZMQ_EVENT_DISCONNECTED' event triggers when the stream engine (tcp and ipc
175
111
  specific) detects a corrupted / broken session.
112
+ Value is the FD of the socket.
176
113
 
177
- .Event metadata:
178
- ----
179
- data.disconnected.addr // address
180
- data.disconnected.fd // socket descriptor
181
- ----
182
114
 
183
115
  RETURN VALUE
184
116
  ------------
@@ -203,78 +135,116 @@ EXAMPLE
203
135
  -------
204
136
  .Observing a 'REP' socket's connection state
205
137
  ----
138
+ #include <stdio.h>
139
+ #include <zmq.h>
140
+ #include <pthread.h>
141
+ #include <string.h>
142
+ #include <assert.h>
143
+
144
+ static int read_msg(void* s, zmq_event_t* event, char* ep)
145
+ {
146
+ int rc ;
147
+ zmq_msg_t msg1; // binary part
148
+ zmq_msg_init (&msg1);
149
+ zmq_msg_t msg2; // address part
150
+ zmq_msg_init (&msg2);
151
+ rc = zmq_msg_recv (&msg1, s, 0);
152
+ if (rc == -1 && zmq_errno() == ETERM)
153
+ return 1 ;
154
+ assert (rc != -1);
155
+ assert (zmq_msg_more(&msg1) != 0);
156
+ rc = zmq_msg_recv (&msg2, s, 0);
157
+ if (rc == -1 && zmq_errno() == ETERM)
158
+ return 1;
159
+ assert (rc != -1);
160
+ assert (zmq_msg_more(&msg2) == 0);
161
+ // copy binary data to event struct
162
+ const char* data = (char*)zmq_msg_data(&msg1);
163
+ memcpy(&(event->event), data, sizeof(event->event));
164
+ memcpy(&(event->value), data+sizeof(event->event), sizeof(event->value));
165
+ // copy address part
166
+ const size_t len = zmq_msg_size(&msg2) ;
167
+ ep = memcpy(ep, zmq_msg_data(&msg2), len);
168
+ *(ep + len) = 0 ;
169
+ return 0 ;
170
+ }
171
+
206
172
  // REP socket monitor thread
207
173
  static void *rep_socket_monitor (void *ctx)
208
174
  {
209
175
  zmq_event_t event;
176
+ static char addr[1025] ;
210
177
  int rc;
211
178
 
179
+ printf("starting monitor...\n");
180
+
212
181
  void *s = zmq_socket (ctx, ZMQ_PAIR);
213
182
  assert (s);
214
183
 
215
184
  rc = zmq_connect (s, "inproc://monitor.rep");
216
185
  assert (rc == 0);
217
- while (true) {
218
- zmq_msg_t msg;
219
- zmq_msg_init (&msg);
220
- rc = zmq_recvmsg (s, &msg, 0);
221
- if (rc == -1 && zmq_errno() == ETERM) break;
222
- assert (rc != -1);
223
- memcpy (&event, zmq_msg_data (&msg), sizeof (event));
186
+ while (!read_msg(s, &event, addr)) {
224
187
  switch (event.event) {
225
188
  case ZMQ_EVENT_LISTENING:
226
- printf ("listening socket descriptor %d\n", event.data.listening.fd);
227
- printf ("listening socket address %s\n", event.data.listening.addr);
189
+ printf ("listening socket descriptor %d\n", event.value);
190
+ printf ("listening socket address %s\n", addr);
228
191
  break;
229
192
  case ZMQ_EVENT_ACCEPTED:
230
- printf ("accepted socket descriptor %d\n", event.data.accepted.fd);
231
- printf ("accepted socket address %s\n", event.data.accepted.addr);
193
+ printf ("accepted socket descriptor %d\n", event.value);
194
+ printf ("accepted socket address %s\n", addr);
232
195
  break;
233
196
  case ZMQ_EVENT_CLOSE_FAILED:
234
- printf ("socket close failure error code %d\n", event.data.close_failed.err);
235
- printf ("socket address %s\n", event.data.close_failed.addr);
197
+ printf ("socket close failure error code %d\n", event.value);
198
+ printf ("socket address %s\n", addr);
236
199
  break;
237
200
  case ZMQ_EVENT_CLOSED:
238
- printf ("closed socket descriptor %d\n", event.data.closed.fd);
239
- printf ("closed socket address %s\n", event.data.closed.addr);
201
+ printf ("closed socket descriptor %d\n", event.value);
202
+ printf ("closed socket address %s\n", addr);
240
203
  break;
241
204
  case ZMQ_EVENT_DISCONNECTED:
242
- printf ("disconnected socket descriptor %d\n", event.data.disconnected.fd);
243
- printf ("disconnected socket address %s\n", event.data.disconnected.addr);
205
+ printf ("disconnected socket descriptor %d\n", event.value);
206
+ printf ("disconnected socket address %s\n", addr);
244
207
  break;
245
208
  }
246
- zmq_msg_close (&msg);
247
209
  }
248
210
  zmq_close (s);
249
211
  return NULL;
250
212
  }
251
213
 
252
214
 
253
- // Create the infrastructure
254
- void *ctx = zmq_init (1);
255
- assert (ctx);
215
+ int main()
216
+ {
217
+ const char* addr = "tcp://127.0.0.1:6666" ;
218
+ pthread_t thread ;
219
+
220
+ // Create the infrastructure
221
+ void *ctx = zmq_init (1);
222
+ assert (ctx);
223
+
224
+ // REP socket
225
+ void* rep = zmq_socket (ctx, ZMQ_REP);
226
+ assert (rep);
256
227
 
257
- // REP socket
258
- rep = zmq_socket (ctx, ZMQ_REP);
259
- assert (rep);
228
+ // REP socket monitor, all events
229
+ int rc = zmq_socket_monitor (rep, "inproc://monitor.rep", ZMQ_EVENT_ALL);
230
+ assert (rc == 0);
231
+ rc = pthread_create (&thread, NULL, rep_socket_monitor, ctx);
232
+ assert (rc == 0);
260
233
 
261
- // REP socket monitor, all events
262
- rc = zmq_socket_monitor (rep, "inproc://monitor.rep", ZMQ_EVENT_ALL);
263
- assert (rc == 0);
264
- rc = pthread_create (&threads [0], NULL, rep_socket_monitor, ctx);
265
- assert (rc == 0);
234
+ rc = zmq_bind (rep, addr);
235
+ assert (rc == 0);
266
236
 
267
- rc = zmq_bind (rep, addr);
268
- assert (rc == 0);
237
+ // Allow some time for event detection
238
+ zmq_sleep (1);
269
239
 
270
- // Allow some time for event detection
271
- zmq_sleep (1);
240
+ // Close the REP socket
241
+ rc = zmq_close (rep);
242
+ assert (rc == 0);
272
243
 
273
- // Close the REP socket
274
- rc = zmq_close (rep);
275
- assert (rc == 0);
244
+ zmq_term (ctx);
276
245
 
277
- zmq_term (ctx);
246
+ return 0 ;
247
+ }
278
248
  ----
279
249
 
280
250
 
@@ -285,4 +255,5 @@ linkzmq:zmq[7]
285
255
 
286
256
  AUTHORS
287
257
  -------
288
- This 0MQ manual page was written by Lourens Naudé <lourens@methodmissing.com>
258
+ This page was written by the 0MQ community. To make a change please
259
+ read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.