3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-11 07:44:04 +08:00
Code Issues Projects Releases Wiki Activity
2,195 Commits 4 Branches 39 Tags 31 MiB
Commit Graph

2195 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ian Barber
836fa4b7ca Revert "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" 
This reverts commit 336f72720a99195942ced5c6aad2bb8e0baa3f32.
 2012-06-12 14:47:10 +01:00
Ian Barber
2c6f26153e Revert "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" 
This reverts commit b84b007981d9247bcc7bd000e4aeb56baed56de2.
 2012-06-12 14:46:38 +01:00
Ian Barber
3ae68d67a4 Revert "Use the hiccup mechanism to notify the socket end of the pair of the change in state, and have it shutdown that end, and shutdown the local end normally. This seems to resolve the shutdown and race condition issues." 
This reverts commit 67497a26439239fdb95652b46d7e4e41fe672b31.
 2012-06-12 14:46:23 +01:00
Ian Barber
f5a072fee1 Revert "Code formatting, and clean up so that xhiccuped is only handled in case the pipe isn't terminating" 
This reverts commit 5da289cd5bf0f3c367d3eb091ac66e5f4ce2b97c.
 2012-06-12 14:46:01 +01:00
Ian Barber
6eeaf15179 Revert "Remove unnecessary condition in assert" 
This reverts commit 3053f7e368149044e5d5887e78fc96c1b9f33141.
 2012-06-12 14:45:36 +01:00
Ian Barber
c9926f6f24 Revert "As Martin pointed out, there is a race condition in the old code where a pipe could start shutting down after disconnection, but the new one could connect first. This connection would not get a pipe created for it, so the messages could never flow. The simplest way round this would be a flag, but it is possibly for a very bouncy but fast connection to go up and down twice I imagine, so instead I have added a counter. This starts at zero, and will null out the pipe if terminate is called while it is zero. On a disconnect situation the counter is incremented, and the pipe is the not nulled if the value is non zero. In the terminated function it is decremented for each pipe that is shut down, and the assertion that the terminated pipe == the current pipe is skipped while it is non-zero. This should deal with the race condition and not allow any extra terminated() calls without hitting the assertion." 
This reverts commit a5f7300da6aa2224638fc932fe5ca3624189b1c1.
 2012-06-12 14:45:14 +01:00
Ian Barber
19da88be67 Revert "Filter read and write activated calls from the pipe to the session, and delay shutdown in terminated until the final pipe is shutdown." 
This reverts commit a90c1db7d2c0d32f9a0177d46502505efac654a5.
 2012-06-12 14:44:41 +01:00
Ian Barber
4aaf3e6389 Revert "Add disconnect test" 
This reverts commit d8f3487ee1c15e9cd9df8a795529765f7bb00ef1.
 2012-06-12 14:44:12 +01:00
Ian Barber
eb14890d23 Revert "Revert "Merge branch 'master' of github.com:ianbarber/libzmq"" 
This reverts commit 029d3dfae2c2bf9e10c7f05d78593f481569bbd7.
 2012-06-12 14:43:18 +01:00
Ian Barber
bdd4e1351d Revert "Revert "Merge branch 'master' of github.com:zeromq/libzmq"" 
This reverts commit dde69fb9fb928db1850eb209db7aed79e26777fb.
 2012-06-12 14:28:32 +01:00
Ian Barber
029d3dfae2 Revert "Merge branch 'master' of github.com:ianbarber/libzmq" 
This reverts commit 33459029793474d14cdb48f85ad2c58dc7ed156f, reversing
changes made to 889b0e6f29f0cce566339b13b8a44f3b97836b6e.
 2012-06-12 14:13:17 +01:00
Ian Barber
dde69fb9fb Revert "Merge branch 'master' of github.com:zeromq/libzmq" 
This reverts commit 7b10586558268479e62ed901f3d8d76916bc6c8a, reversing
changes made to 33459029793474d14cdb48f85ad2c58dc7ed156f.
 2012-06-12 14:12:03 +01:00
Ian Barber
6117a2b099 Revert "Replace incomplete count with a std::set" 
This reverts commit 4aa5ba3d119b98c8f1e4e682a6ee7c57d460cc55.
Unintentional merge
 2012-06-12 14:07:54 +01:00
Ian Barber
4aa5ba3d11 Replace incomplete count with a std::set 
This commit removes the countdown flag and adds a set to store the pipes
that are currently being disconnected.
 2012-06-12 12:13:21 +01:00
Ian Barber
7b10586558 Merge branch 'master' of github.com:zeromq/libzmq 2012-06-12 11:34:24 +01:00
Ian Barber
3345902979 Merge branch 'master' of github.com:ianbarber/libzmq 2012-06-12 11:34:17 +01:00
Ian Barber
b448de926b Merge pull request #371 from hurtonm/fix_race_condition_in_connecters 
Fix race conditions in {tcp,ipc}_connecter
 2012-06-11 23:57:21 -07:00
Martin Hurton
3ec8e576d9 Fix race conditions in {tcp,ipc}_connecter 
Once the object has been terminated, it is unsafe for this object
to refer to its parent.

The bug was responsible for occasional
test_shutdown_stress failures.
 2012-06-12 01:47:31 +02:00
Ian Barber
d8f3487ee1 Add disconnect test 
Add a new section to the connect delay test that disconnects and
reconnects a socket to ensure that some messages are appropriately
blocked.
 2012-06-11 20:04:09 +01:00
Ian Barber
a90c1db7d2 Filter read and write activated calls from the pipe to the session, and delay shutdown in terminated until the final pipe is shutdown. 2012-06-11 07:58:59 +01:00
Ian Barber
a5f7300da6 As Martin pointed out, there is a race condition in the old code where a pipe could start shutting down after disconnection, but the new one could connect first. This connection would not get a pipe created for it, so the messages could never flow. The simplest way round this would be a flag, but it is possibly for a very bouncy but fast connection to go up and down twice I imagine, so instead I have added a counter. This starts at zero, and will null out the pipe if terminate is called while it is zero. On a disconnect situation the counter is incremented, and the pipe is the not nulled if the value is non zero. In the terminated function it is decremented for each pipe that is shut down, and the assertion that the terminated pipe == the current pipe is skipped while it is non-zero. This should deal with the race condition and not allow any extra terminated() calls without hitting the assertion. 2012-06-10 19:57:02 +01:00
Ian Barber
841cf69eb7 Merge branch 'master' of https://github.com/zeromq/libzmq 2012-06-10 19:18:18 +01:00
Ian Barber
ace8f753e1 Merge pull request #370 from hurtonm/code_cleanup 
Use struct keyword consistently with sockaddr and sockaddr_in
 2012-06-10 04:07:12 -07:00
Martin Hurton
1f53697211 Use struct keyword consistently with sockaddr and sockaddr_in 2012-06-10 02:29:49 +02:00
Pieter Hintjens
e9bfd76f87 Merge pull request #368 from hurtonm/code_cleanup 
Small code simplification
 2012-06-09 07:13:30 -07:00
Pieter Hintjens
66b7edfbd1 Merge pull request #367 from hurtonm/issue_309 
Fix the message decoder to ignore reserved flags.
 2012-06-09 07:12:48 -07:00
Martin Hurton
602c50117c Small code simplification 2012-06-09 14:21:01 +02:00
Martin Hurton
796212a985 Fix the message decoder to ignore reserved flags. 
Failing to clear the reserved flags, the decoder may produce
messages with 'identity' and 'shared' flags set.
This unintended modification of message flags can lead to memory
errors or asserion failures.

Fixes issue #309
 2012-06-09 13:39:44 +02:00
Ian Barber
3053f7e368 Remove unnecessary condition in assert 2012-06-09 00:08:14 +01:00
Ian Barber
5da289cd5b Code formatting, and clean up so that xhiccuped is only handled in case the pipe isn't terminating 2012-06-09 00:07:30 +01:00
Ian Barber
0bf1d0262e Merge branch 'master' of https://github.com/zeromq/libzmq 2012-06-08 23:55:58 +01:00
Ian Barber
67497a2643 Use the hiccup mechanism to notify the socket end of the pair of the change in state, and have it shutdown that end, and shutdown the local end normally. This seems to resolve the shutdown and race condition issues. 2012-06-08 23:55:42 +01:00
Ian Barber
b0792ec78a Merge pull request #366 from hitenp/tcp-consolidate 
Consolidate TCP-specific common code into their own files.
 2012-06-08 15:04:09 -07:00
Hiten P
db13fbf4a9 Consolidate TCP-specific common code into their own files. 
The TCP keepalive tuning code has been moved into the newly added
files; this also allows future TCP-specific code to be added into
these files, without bloating the IP level code and establishes a
known file structure for other IP-based transports.

Remember: this is a no-op change, hence no API or functionality
was changed as part of this commit.
 2012-06-08 18:18:52 +01:00
Ian Barber
1c6592157b Merge pull request #365 from hitenp/master 
Change connection failure test to use an invalid hostname
 2012-06-08 05:24:26 -07:00
Hiten P
31cb1f297d Change connection failure test to use an invalid hostname 
- invalid hostname set to 0mq.is.the.best (naturally!)
- issue happens as other valid-like non-existent hostnames were
  redirected by buggy Cable/ISP DNS servers
 2012-06-08 13:15:45 +01:00
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
889b0e6f29 Merge branch 'master' of github.com:zeromq/libzmq 2012-06-06 15:23:51 +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
Ian Barber
8643d71ee8 Merge branch 'master' of github.com:zeromq/libzmq 2012-06-06 15:04:56 +01:00
Ian Barber
3db9bf31b3 Merge pull request #363 from AlexBio/fix_nosigpipe_check 
Check if SO_NOSIGPIPE is defined
 2012-06-06 06:29:41 -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
f611c57c48 Merge pull request #362 from hintjens/master 
Bumped version for next release (3.3.0)
 2012-06-05 23:47:36 -07:00
Pieter Hintjens
e5bb5a60f4 Bumped version to 3.3.0 2012-06-06 06:57:43 +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
Pieter Hintjens
f8b79f888f Merge pull request #361 from vortechs2000/fix_aix7 
Fix up build on AIX7
 2012-06-05 09:38:38 -07:00
Pieter Hintjens
897b6b58ea Merge pull request #359 from vortechs2000/fix_older_linux_gcc 
Fix build on RHEL5 and SLES10
 2012-06-05 09:11:25 -07: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
3687789f9d Fix build on RHEL5 and SLES10 
GCC 4.1.2 on RHEL5 and SLES10 don't like not having a newline at the
end of a source file, and error out if it's missing.

Signed-off-by: AJ Lewis <aj.lewis@quantum.com>
 2012-06-05 09:22:22 -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
0b3478d6ec Fix whitespace in test 2012-06-03 23:11:08 +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
f687a2989b Merge branch 'master' of https://github.com/zeromq/libzmq 2012-06-01 21:49:07 +01:00
Ian Barber
98ef56039e Merge pull request #358 from steve-o/issue-320-author 
Issue 320 author
 2012-06-01 10:10:44 -07:00
Steven McCoy
0f58a98b3e Merge branch 'issue-320' of https://github.com/steve-o/libzmq into issue-320-author 2012-06-01 13:03:19 -04:00
Douglas Young
320684ef39 Return error on invalid PGM url instead of raising assertion (Douglas Young). 
Fix Win32 build.
 2012-06-01 13:02:29 -04: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
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