Commit Graph

1775 Commits

Author SHA1 Message Date
Ian Barber
fe3fb419fe After speaking with Ben Gray and the discussion on the mailing list, this is an attempt to create a sockopt to allow connecting pipes to not immediately be available for traffic. The problem is in a PUSH to many PULL situation, where there is a connect to a PULL which is not there. This connect will immediately create a pipe (unlike bind), and traffic will be load balanced to that pipe. This means if there is a persistently unavailable end point then the traffic will queue until HWM is hit, and older messages will be lost.
This patch adds a sockopt ZMQ_DELAY_ATTACH_ON_CONNECT, which if set to 1 will attempt to preempt this behavior. It does this by extending the use of the session_base to include in the outbound as well as the inbound pipe, and only associates the pipe with the socket once it receives the connected callback via a process_attach message. This works, and a test has been added to show so, but may introduce unexpected complications. The shutdown logic in this class has become marginally more awkward because of this, requiring the session to serve as the sink for both pipes if shutdown occurs with a still-connecting pipe in place. It is also possible there could be issues around flushing the messages, but as I could not directly think how to create such an issue I have not written any code with regards to that.

The documentation has been updated to reflect the change, but please do check over the code and test and review.
2012-06-01 17:58:19 +01:00
Pieter Hintjens
c28af41ca4 Merge pull request #356 from hurtonm/code_cleanup
lb: code cleanup
2012-05-31 07:29:55 -07:00
Pieter Hintjens
bc150de81e Merge pull request #355 from hurtonm/fq_lb_fix
Prevent connection starvation
2012-05-31 07:29:22 -07:00
Martin Hurton
89ff277bec lb: code cleanup 2012-05-31 15:59:59 +02:00
Martin Hurton
2973eaf446 Prevent connection starvation
When removing a pipe from the lb or fq component,
make sure we do not remove another pipe from the active set.
2012-05-31 15:35:45 +02:00
Pieter Hintjens
4e7be102f4 Merge pull request #354 from steve-o/issue-320
Return error on invalid PGM url instead of raising assertion.
2012-05-31 01:19:22 -07:00
Steven McCoy
13976a3d65 Return error on invalid PGM url instead of raising assertion.
Fix Win32 build.
2012-05-30 20:52:19 -04:00
Pieter Hintjens
32befeb0a6 Merge pull request #353 from steve-o/master
Fix title on zmq_disconnect manpage.
2012-05-30 09:59:55 -07:00
Steven McCoy
75df0194bf Fix title on zmq_disconnect manpage. 2012-05-30 12:53:53 -04:00
Pieter Hintjens
1adb7b1017 Merge pull request #352 from hurtonm/issue_370
Fix issue #370
2012-05-29 13:29:58 -07:00
Martin Hurton
7fe45af30f Fix issue #370
The patch extends the internal session's API with the reset method.
This method is used to reset a session's state so that it can
handle a new connection.
2012-05-29 22:10:51 +02:00
Pieter Hintjens
f7bd543c36 Merge pull request #351 from hurtonm/code_cleanup
Code cleanup
2012-05-28 14:34:57 -07:00
Martin Hurton
24b79c7e0b Prefer errno_assert/alloc_assert to zmq_assert 2012-05-28 23:17:03 +02:00
Martin Hurton
013967681d fq: code cleanup 2012-05-28 22:01:37 +02:00
Pieter Hintjens
8152502f69 Merge pull request #350 from hurtonm/issue_369
Fix issue #369
2012-05-28 08:39:20 -07:00
Martin Hurton
130dfc5b5f Fix issue #369
The bug was that after reconnect, the session did not
handle identity messages properly.
2012-05-28 17:08:27 +02:00
Ian Barber
e30e48c23e Merge pull request #349 from hintjens/master
Fixed zmq_poll.txt manpage for issue #361
2012-05-28 02:16:29 -07:00
Pieter Hintjens
2ab12efe11 Fixing issue #361 2012-05-28 11:01:21 +02:00
Pieter Hintjens
3a76d246a8 Merge pull request #348 from hurtonm/code_cleanup
Code cleanup
2012-05-28 00:47:26 -07:00
Martin Hurton
d0b9005ef0 Don't assume SOCKET_ERROR is -1 on Windows 2012-05-27 23:38:33 +02:00
Martin Hurton
ac53f1a728 Remove unnecessary casts 2012-05-27 23:38:16 +02:00
Martin Hurton
e0534643fa Simplify error handling in tcp_connecter 2012-05-27 23:38:16 +02:00
Martin Hurton
13ef1e4f26 Make wsa_error_to_errno pure function 2012-05-27 16:10:19 +02:00
Martin Hurton
a8f9a0d891 Use zmq_assert rather then assert 2012-05-27 15:31:59 +02:00
Martin Hurton
52ed4cdccf Remove dead code 2012-05-27 15:18:38 +02:00
Martin Hurton
7cfd03ba72 Remove unplug from i_engine interface 2012-05-27 15:18:38 +02:00
Pieter Hintjens
5db30fe991 Merge pull request #347 from methodmissing/monitor-doc-fails
Fix too long underline in zmq_ctx_set_monitor() docs
2012-05-24 06:45:27 -07:00
Lourens Naudé
b85ff17822 Fix too long underline in monitor docs 2012-05-24 09:39:48 +01:00
Pieter Hintjens
74af2f9402 Merge pull request #346 from methodmissing/monitor-regressions
Rename monitor documentation source file to match zmq_ctx_set_monitor() API
2012-05-23 07:21:41 -07:00
Lourens Naudé
400f6f3863 Rename monitor documentation source file to match zmq_ctx_set_monitor() API 2012-05-23 01:35:22 +01:00
Pieter Hintjens
22b4388e29 Merge pull request #345 from methodmissing/monitor-regressions
Moves the monitoring infrastructure to a global zmq_ctx_set_monitor () API to avoid strict aliasing issues with function pointers and socket options.
2012-05-22 16:18:54 -07:00
Lourens Naudé
1e92ee0a0e Oust last remaning ZMQ_MONITOR reference from NEWS as well 2012-05-22 23:45:15 +01:00
Lourens Naudé
adf7a7ade1 Merge branch 'master' into monitor-regressions 2012-05-22 23:35:30 +01:00
Lourens Naudé
991b7fcc04 Rename zmq_monitor to zmq_ctx_set_monitor for compat with existing context specific APIs 2012-05-22 20:15:18 +01:00
Lourens Naudé
04f0e7f26e Documentation for zmq_monitor 2012-05-22 20:08:02 +01:00
Ian Barber
20152a6e3e Merge pull request #344 from hintjens/master
Fixed bogus reference to zmq_ctx_put
2012-05-22 07:31:28 -07:00
Pieter Hintjens
604456a8b0 Man page for zmq_ctx_new had error, fixed 2012-05-21 15:59:55 -05:00
Lourens Naudé
f27c02d01e Change context monitor_event prototype to accept a va_list instead 2012-05-21 21:22:16 +01:00
Lourens Naudé
4767159f39 Initial stab at a context level monitor callback and registration API 2012-05-21 20:47:11 +01:00
Pieter Hintjens
7cb19fbf1c Merge pull request #343 from jimenezrick/master
Doc improvement: document interface omission in zmq_pgm.txt
2012-05-21 06:00:02 -07:00
Pieter Hintjens
65b6351e4a Merge pull request #342 from ipechorin/master
Solaris/SunCC build fix: could not find a match for std::multimap<...>::insert(std::pair<...,...>)
2012-05-21 05:59:32 -07:00
Ricardo Catalinas Jiménez
0e053e3478 Doc improvement: document interface omission in zmq_pgm.txt
The PGM transport supports the omission of the network interface to
select the default one like:

  announce.connect("epgm://eth0;239.255.128.46:64646"); // Use eth0
  announce.connect("epgm://239.255.128.46:64646"); // Use the default

Also, mention C++ in the additional community bindings of 0MQ in
zmq.txt.
2012-05-21 14:06:34 +02:00
Lourens Naudé
e13b3723b8 Rename type zmq_monitor_fn -> zmq_monitor for a more natural callback definition API (zmq_monitor type, monitor.function callback) 2012-05-20 18:27:59 +01:00
Lourens Naudé
06cce15479 Change zmq_monitor_fn type to cast between pointer-to-object and pointer-to-function in a more standards compliant way 2012-05-20 18:22:13 +01:00
Ivan Pechorin
d25dce9df9 Solaris/SunCC build fix: could not find a match for std::multimap<...>::insert(std::pair<...,...>) 2012-05-20 13:34:08 +02:00
Pieter Hintjens
5ef63318f8 Merge pull request #341 from kennytm/master
Allow the ZMQ_MONITOR code compilable on gcc 4.7 on Linux.
2012-05-13 06:39:16 -07:00
KennyTM~
c995de6584 Allow the ZMQ_MONITOR code compilable on gcc 4.7 on Linux.
The current ZMQ_MONITOR code does not compile in gcc 4.7, as -pedantic
and -Werror are enabled, and ISO C++ doesn't allow casting between
normal pointers (void*) and function pointers, as pedantically their
size could be different. This caused the library not compilable. This
commit workaround the problem by introducing one more indirection, i.e.
instead of calling

    (void *)listener

which is an error, we have to use

    *(void **)&listener

which is an undefined behavior :) but works on most platforms

Also, `optval_ = monitor` will not set the parameter in getsockopt(),
and the extra casting caused the LHS to be an rvalue which again makes
the code not compilable. The proper way is to pass a pointer of function
pointer and assign with indirection, i.e. `*optval_ = monitor`.

Also, fixed an asciidoc error in zmq_getsockopt.txt because the `~~~~`
is too long.
2012-05-13 20:49:05 +08:00
Pieter Hintjens
89d5054e59 Merge pull request #340 from methodmissing/events
Expose a ZMQ_MONITOR socket option to register a callback for notification of state changes in socket state ( stream engine, tcp and ipc transport only )
2012-05-11 15:18:50 -07:00
Lourens Naudé
d0461752ff Merge branch 'master' into events 2012-05-11 22:08:17 +01:00
Pieter Hintjens
70b067ecc6 Merge pull request #339 from ianbarber/master
Add disconnect and unbind documentation
2012-05-11 06:23:58 -07:00