generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-14 02:57:47 +01:00
Code Issues Projects Releases Wiki Activity
1,788 Commits 4 Branches 39 Tags 40 MiB
4aaf3e6389
Commit Graph

1788 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ian Barber
4aaf3e6389 Revert "Add disconnect test" 
This reverts commit d8f3487ee1.
 2012-06-12 14:44:12 +01:00
Ian Barber
eb14890d23 Revert "Revert "Merge branch 'master' of github.com:ianbarber/libzmq"" 
This reverts commit 029d3dfae2.
 2012-06-12 14:43:18 +01:00
Ian Barber
bdd4e1351d Revert "Revert "Merge branch 'master' of github.com:zeromq/libzmq"" 
This reverts commit dde69fb9fb.
 2012-06-12 14:28:32 +01:00
Ian Barber
029d3dfae2 Revert "Merge branch 'master' of github.com:ianbarber/libzmq" 
This reverts commit 3345902979, reversing
changes made to 889b0e6f29.
 2012-06-12 14:13:17 +01:00
Ian Barber
dde69fb9fb Revert "Merge branch 'master' of github.com:zeromq/libzmq" 
This reverts commit 7b10586558, reversing
changes made to 3345902979.
 2012-06-12 14:12:03 +01:00
Ian Barber
6117a2b099 Revert "Replace incomplete count with a std::set" 
This reverts commit 4aa5ba3d11.
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