Commit Graph

2846 Commits

Author SHA1 Message Date
Pieter Hintjens
1596a5e871 Merge pull request #743 from ricnewton/master
Add test case for many sockets
2013-11-07 09:18:53 -08:00
Richard Newton
97cfa64d93 Merge branch 'master' of https://github.com/zeromq/libzmq 2013-11-07 16:49:06 +00:00
Richard Newton
998c10a1b7 Merge pull request #741 from hintjens/master
Simplified error handling for make_fdpair on Windows
2013-11-07 08:48:48 -08:00
Richard Newton
c4f09953d8 Merge remote-tracking branch 'upstream/master' 2013-11-07 16:48:07 +00:00
Richard Newton
554b3c1f70 Add test case for many sockets 2013-11-07 16:47:55 +00:00
Pieter Hintjens
de5a787868 Merge pull request #742 from psl-felipefarinon/master
Fixing issue #583. Using low resolution timer for clock::now_ms
2013-11-07 08:12:48 -08:00
psl-felipefarinon
b8a9f299fb Fixing issue #583. Using low resolution timer for clock::now_ms 2013-11-07 14:06:54 -02:00
Pieter Hintjens
51f8571933 Simplified fdpair reset after fork 2013-11-07 15:30:25 +01:00
Pieter Hintjens
2be70dca1a Simplified error handling for make_fdpair on Windows 2013-11-07 15:26:56 +01:00
Richard Newton
e3898b5d77 Merge pull request #740 from hintjens/master
Fix for issue 574
2013-11-07 06:20:34 -08:00
Pieter Hintjens
c573f6b812 Fix for issue 574 2013-11-07 14:59:53 +01:00
Pieter Hintjens
729e9496b2 Merge pull request #739 from mbarbisan/master
Modified the zmq_setsockopt documentation to include the ZMQ_ROUTER_HAND...
2013-11-06 23:34:36 -08:00
Mark Barbisan
e84f17bbb4 Modified the zmq_setsockopt documentation to include the ZMQ_ROUTER_HANDOVER option 2013-11-06 23:21:28 -05:00
Pieter Hintjens
6ed1f4766a Merge pull request #738 from ricnewton/master
Fix race condition on shutdown
2013-11-06 07:41:02 -08:00
Richard Newton
844689ed9a Fix race condition on shutdown 2013-11-06 15:19:04 +00:00
Richard Newton
8797af777b Merge pull request #737 from hintjens/master
Removed over-long pauses in tests
2013-11-06 04:53:05 -08:00
Pieter Hintjens
5b60540ed0 Removed over-long pauses in tests
- used msleep (10) in most places instead of zmq_sleep (1)
- may cause failures on slower machines
- to change, modify SETTLE_TIME in testutil.h
- tested down to 1 msec on fast boxes
2013-11-06 13:42:57 +01:00
Richard Newton
c2c6ec1907 Merge pull request #736 from Hugne/lookup_domain
zmq: change TIPC default lookup domain when connecting
2013-11-05 04:39:43 -08:00
Erik Hugne
edbfae3141 zmq: change TIPC default lookup domain when connecting
By default, TIPC uses a closest first approach to find
a publication that can satisfy your connection request.
Any publication on the local node will automatically
be chosen for all requests, even if you're trying to
spread it out over multiple machines.
We fix this by widening the default lookup scope.

Signed-off-by: Erik Hugne <erik.hugne@ericsson.com>
2013-11-05 13:28:07 +01:00
Pieter Hintjens
370045367d Merge pull request #735 from Hugne/tipc_docs
zmq: add TIPC manpage
2013-11-05 04:08:10 -08:00
Erik Hugne
bbbccebbe7 zmq: add TIPC manpage
Signed-off-by: Erik Hugne <erik.hugne@ericsson.com>
2013-11-05 13:02:41 +01:00
Richard Newton
0d5ffd5a0c Merge pull request #734 from hintjens/master
Fixed issue 578
2013-11-04 07:54:07 -08:00
Pieter Hintjens
5e6aa58a14 Fixed issue 578 - corrected type usage 2013-11-04 16:04:13 +01:00
Pieter Hintjens
d7c8021afc Fixed issue 578 2013-11-04 15:39:20 +01:00
Pieter Hintjens
75af9ddb78 Merge pull request #733 from mingulov/doc
Doc examples with zmq_msg_close usage - parameter is 'zmq_msg_t *'
2013-11-04 05:29:36 -08:00
Denis Mingulov
bdf8bc3193 Doc examples with zmq_msg_close usage - parameter is 'zmq_msg_t *'
Documentation examples for zmq_msg_get and zmq_msg_more functions have an
incorrect call to zmq_msg_close function - with 'zmq_msg_t' as a parameter
despite 'zmq_msg_t *' is required, so it is impossible to compile these
examples properly.

Also for zmq_msg_get example - declaration of zmq_msg_t variable is added
(like it is done in other examples).
2013-11-04 15:19:34 +02:00
Pieter Hintjens
027990a112 Merge pull request #732 from Hugne/tipc
zmq: narrow condition to include TIPC in build/test
2013-11-01 07:14:00 -07:00
Erik Hugne
58ac87def1 zmq: narrow condition to include TIPC in build/test
As TIPC transport for 0MQ will only work on post 3.8
Linux kernels where nonblocking connect was added,
we add AC_RUN test to check for this functionality.
Should the test fail, tipc is excluded from build/test.

Signed-off-by: Erik Hugne <erik.hugne@ericsson.com>
2013-11-01 14:59:31 +01:00
Pieter Hintjens
299068b571 Merge pull request #731 from mbarbisan/master
Shorten ZMQ_ROUTER_REASSIGN_IDENTITIES to ZMQ_ROUTER_HANDOVER. Also, add...
2013-11-01 06:30:27 -07:00
Pieter Hintjens
2db808f250 Merge pull request #730 from Hugne/tipc
Tipc support
2013-11-01 04:05:55 -07:00
Erik Hugne
632677e805 ricnewton review comment
Signed-off-by: Erik Hugne <erik.hugne@ericsson.com>
2013-11-01 11:17:10 +01:00
Erik Hugne
9d5a379331 zmq: add TIPC transport tests
The tests are identical to the TCP ones, only the
addressing is changed.

Signed-off-by: Erik Hugne <erik.hugne@ericsson.com>
2013-11-01 10:10:02 +01:00
Erik Hugne
eab85b5295 zmq: add support for TIPC transport
A ZeroMQ application can opt for TIPC based sockets
using the TIPC port name format:
zmq_bind(sb, "tipc://{type,lower,upper}");
zmq_connect(sc, "tipc://{type,inst}");

'type' is the service ID, and 'lower/upper' can be
used for service partitioning or basic load
balancing.

ZeroMQ TIPC transport requires a kernel >= 3.8
(nonblocking connect support for TIPC).

Signed-off-by: Erik Hugne <erik.hugne@ericsson.com>
2013-11-01 10:09:22 +01:00
Mark Barbisan
5e71475d45 Shorten ZMQ_ROUTER_REASSIGN_IDENTITIES to ZMQ_ROUTER_HANDOVER. Also, added a test for the HANDOVER functionality. 2013-11-01 00:03:00 -04:00
Pieter Hintjens
bc88b88804 Merge pull request #729 from mbarbisan/master
Fixed LIBZMQ-556: ROUTER socket does not support reconnection from clients with multiple NICs
2013-10-31 11:01:55 -07:00
Pieter Hintjens
9d22ab1c4f Merge pull request #728 from NetImperia/patch-1
Update tcp_connecter.cpp - Crash Fix: Assertion failed: Permission denied (..\..\..\src\tcp_connecter.cpp:279) on windows 8
2013-10-31 06:08:20 -07:00
Mark Barbisan
3825f3b300 Add support to the ROUTER socket to reassign identities upon name collision. 2013-10-30 23:45:46 -04:00
NetImperia
c75ed69af3 Update tcp_connecter.cpp
Crash Fix: Assertion failed: Permission denied (..\..\..\src\tcp_connecter.cpp:279) on windows 8
2013-10-30 18:16:06 -07:00
Pieter Hintjens
2a03d541dc Merge pull request #727 from ricnewton/master
Remove redundant entry in tests makefile.
2013-10-29 04:24:38 -07:00
Richard Newton
5405c6ac21 Remove redundant entry in tests makefile. 2013-10-29 11:18:49 +00:00
Richard Newton
37450fad66 Merge pull request #726 from mattconnolly/master
Adding source for test_stream_empty
2013-10-29 04:17:12 -07:00
Matt Connolly
36d7bba389 Adding source for test_stream_empty 2013-10-29 20:50:52 +10:00
Pieter Hintjens
9f87f747e3 Merge pull request #725 from ricnewton/master
Sync cmake tests with tests in makefile.am
2013-10-29 02:32:22 -07:00
Richard Newton
2b08047d36 Fix formatting issue. 2013-10-29 09:10:00 +00:00
Richard Newton
54a379f966 Clean up dead code in cmake. 2013-10-29 09:07:38 +00:00
Richard Newton
5a74ad56a9 Sync cmake tests with tests in makefile.am 2013-10-29 09:06:24 +00:00
Richard Newton
335cffc1e3 Merge pull request #724 from hintjens/master
Renamed test_router_raw_empty to test_stream_empty
2013-10-28 16:11:42 -07:00
Pieter Hintjens
eaba5dfe37 Renamed test_router_raw_empty to test_stream_empty
* The ZMQ_ROUTER_RAW API was deprecated in favor of ZMQ_STREAM
* Same issue hit router.cpp, which I've fixed
2013-10-28 21:00:42 +01:00
Richard Newton
ac63e56255 Merge pull request #723 from hintjens/master
Fixed ref to zmq_socket_monitor
2013-10-28 04:05:02 -07:00
Pieter Hintjens
c2c0f39d36 Fixed ref to zmq_socket_monitor 2013-10-28 11:48:34 +01:00