1356 Commits

Author SHA1 Message Date
Ian Barber
b84b007981 Reverted to a simpler shutdown. This seems to disconnect and reconnect the pipe properly, but there is a problem in overall shutdown when the pipe has blocked and reconnected - the session seems to get terminated() called on it only in shutdown for the original pipe, by which point it has been replaced. I am not sure at the moment why this only happens then, but this does mean this patch is broken at the moment 2012-06-06 23:12:56 +01:00
Ian Barber
1dcedf7ab1 Merge pull request #364 from AlexBio/fix_unused_variable
Remove unused variable which causes build to fail with -Werror
2012-06-06 07:16:29 -07:00
Alessandro Ghedini
4bd78bb4cf Check if SO_NOSIGPIPE is defined 2012-06-06 15:08:00 +02:00
Alessandro Ghedini
271ced98cf Remove unused variable which causes build to fail with -Werror 2012-06-06 15:06:13 +02:00
Ian Barber
336f72720a The previous code to block the socket from receiving on that pipe during a disconnect was vulnerable to a race condition. This code calls with the terminate functions of both ends of the pipe - I believe this should be safer. This required storing a pointer to the socket end of the pipe 2012-06-05 21:44:23 +01:00
Ian Barber
5008f385ba When detaching a pipe, as well as checking the delay on connect sockopt is set, also ensure that the protocol is not pgm or epgm as we are not implementing the functionality for multicase types 2012-06-05 18:41:38 +01:00
Ian Barber
4d4674e088 Merge pull request #360 from vortechs2000/fix_hpux
Fix build on HPUX 11iv3
2012-06-05 10:33:34 -07:00
Ian Barber
09d18e4b3c Merge branch 'master' of https://github.com/zeromq/libzmq 2012-06-05 18:32:15 +01:00
AJ Lewis
97c48ccda6 Fix build on HPUX 11iv3
The socket length variable for getsockname and accept must be an
(int *) instead of a (socklen_t *) on HPUX.

Signed-off-by: AJ Lewis <aj.lewis@quantum.com>
2012-06-05 09:44:02 -05:00
AJ Lewis
616bcf9fc2 Fix up build on AIX7
Copy logic from zmq.cpp into device.cpp for getting poll.h included.

Ensure that zmq.h is included *after* poll.h in both zmq.cpp and
device.cpp.

Signed-off-by: AJ Lewis <aj.lewis@quantum.com>
2012-06-05 09:15:37 -05:00
Ian Barber
09956dee93 Restoring comment for clarity 2012-06-04 11:41:20 +01:00
Ian Barber
ace7c99b91 Removing unnecessary outpipe values that had been used for reconnecting existing pipes - no longer needed when using a pipe term for the delay_attach situation. 2012-06-04 11:40:14 +01:00
Ian Barber
55cbdfcf26 Fix incorrect whitespace in if statement 2012-06-04 10:31:30 +01:00
Ian Barber
29f8d9ca15 Remove unnecessary extra test in pipe assertion - now we are terminating pipes we don't need to allow the case in which a pipe is rebound to the same sink 2012-06-04 10:29:44 +01:00
Ian Barber
c13f1d52ff On the advice of Martin Hurton, removed the new command type and just terminated the pipe in a reconnect situation, and notified the socket of the same. This handles the blocking properly, but at the cost of potentially losing in flight messages. However, this is a reasonable trade off given how much simpler it makes the patch. 2012-06-04 10:27:16 +01:00
Ian Barber
1566091bc6 Rebinding on reconnection to allow for the pipe blocking will set the event sink again, which will cause an assert to be triggered. I have modified that to allow for setting the same sink to be OK. I believe this should be ok - on termination, if a pipe hasn't reconnected, it would just attempt to be erased from the pipes list again, which is reasonable 2012-06-03 23:27:02 +01:00
Ian Barber
b5ace39e2a Fix condition so that PGM and EPGM sockets always create pipes immediately, even if delay_attach_on_connect is set. This allows passing through the icanhasall flag, and is realistic given the fact those protocols should be able to connect immediately 2012-06-03 23:01:24 +01:00
Ian Barber
6f6466f088 Fix a number of whitespace issues in various parts of the code, add validation to most calls on the test and take a first stab at implementing the reconnection pipe blocking.
It didn't seem straightforward to use any of the existing process calls, so I have added a new command to command_t and friends called detach. This instructs the socket_base to remove the pipe from it's pipe list. The session base stores a copy of the outpipe, and will resend the bind command on reconnection. This should allow balancing again.
2012-06-03 22:57:47 +01:00
Ian Barber
06485d9200 Remove the extra outpipe handling as the session is quite capable of delaying the creation of the pipe until the connection has happened. Simply don't build the pipe, and let it do that automatically. 2012-06-03 22:05:36 +01:00
Ian Barber
297af95451 And another typo on the same comment 2012-06-03 21:38:41 +01:00
Ian Barber
b79aaaf473 Remove extra brackets as suggested by Martin H, and fix up a comment which was missing a word 2012-06-03 21:34:41 +01:00
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
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
Steven McCoy
13976a3d65 Return error on invalid PGM url instead of raising assertion.
Fix Win32 build.
2012-05-30 20:52:19 -04: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
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
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
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
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é
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
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
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
Lourens Naudé
d0461752ff Merge branch 'master' into events 2012-05-11 22:08:17 +01:00
Ian Barber
c7af07cc77 Merge pull request #336 from mauri-melato/master
Fix #366 - On Windows, preventing sockets to be inherited by child processes.
2012-05-08 06:42:12 -07:00
Martin Hurton
641943944d Simplify encoder's loop 2012-05-08 14:23:05 +02:00
Martin Hurton
3d93c1af5b Fix issue #268
This patch fixes a bug in the message encoder which was
responsible for computing incorrect message offset.
The bug affected PGM receiver making it unable to
decode inital messages.
2012-05-08 09:44:45 +02:00
unknown
5fe6ddfda3 On Windows, preventing sockets to be inherited by child processes. 2012-05-07 15:46:55 +02:00