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

2795 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Pieter Hintjens
b40879f9de Merge pull request #722 from ricnewton/master 
Fix test warnings
 2013-10-28 03:30:53 -07:00
Richard Newton
379c280bde Fix test warning. 2013-10-28 08:34:32 +00:00
Richard Newton
15f5b7ff6a Fix test warning. 2013-10-28 08:30:31 +00:00
Richard Newton
c9772d0a5c Merge pull request #721 from minrk/init-raw 
add missing msg->init for ROUTER_RAW with empty message
 2013-10-28 01:19:00 -07:00
MinRK
366c8f87c4 test zmq_msg_close after sending empty message on ROUTER_RAW 2013-10-27 22:50:32 -07:00
MinRK
96ee8bb9d9 add missing msg->init for ROUTER_RAW with empty message 2013-10-27 22:50:04 -07:00
Pieter Hintjens
dad0933469 Merge pull request #718 from xantares/tarball_cmake 
include cmake files in tarball
 2013-10-25 00:53:38 -07:00
Richard Newton
628787c965 Merge pull request #720 from hintjens/master 
test_stream failed when response was broken into frames
 2013-10-24 00:30:48 -07:00
Pieter Hintjens
65050b1b03 Added --with-relaxed to disable pedantic compiles 2013-10-24 03:31:02 +02:00
Pieter Hintjens
1ee7b9b1ea test_stream failed when response was broken into frames 2013-10-23 23:58:39 +02:00
Pieter Hintjens
770d52ecfe Merge pull request #719 from xantares/mingw_arch 
fix use of CMAKE_SYSTEM_PROCESSOR
 2013-10-23 12:17:55 -07:00
xantares
ffd633b3bb fix use of CMAKE_SYSTEM_PROCESSOR 2013-10-23 20:22:20 +02:00
xantares
0beb39a448 Revert "fix use of CMAKE_SYSTEM_PROCESSOR" 
This reverts commit e5baf1e05e696619cb4400db9c9324996ab1400c.
 2013-10-23 20:21:35 +02:00
xantares
e5baf1e05e fix use of CMAKE_SYSTEM_PROCESSOR 2013-10-23 20:19:52 +02:00
xantares
e273d94db8 include cmake files in tarball 2013-10-23 19:06:29 +02:00
Richard Newton
71b423ae8d Merge pull request #717 from hintjens/master 
Clarified use of secret/public keys
 2013-10-23 07:16:40 -07:00
Pieter Hintjens
87718c6102 Clarified use of secret/public keys 2013-10-23 16:03:40 +02:00
Richard Newton
1f85ed06db Merge pull request #716 from hintjens/master 
Fixed man page for CURVE key options
 2013-10-23 03:16:49 -07:00
Pieter Hintjens
09426ff308 Fixed man page for CURVE key options 2013-10-23 12:04:40 +02:00
Pieter Hintjens
4582fe3276 Merge pull request #715 from ricnewton/master 
Add new tests to CMakeLists.txt
 2013-10-21 02:16:28 -07:00
Richard Newton
8ee2a47267 Add new tests to CMakeLists.txt 2013-10-21 10:06:17 +01:00
Richard Newton
41b2f83bef Merge pull request #714 from hintjens/master 
Cleaned up the code
 2013-10-21 01:58:00 -07:00
Pieter Hintjens
406e6051e4 Cleaned up the code 
- removed unnecessary malloc
- spaces, not tabs to indent
- renamed control states to be more logical
- renamed SUSPEND to PAUSE, feels more accurate
- fixed indentation, which was off in places
 2013-10-21 10:51:59 +02:00
Pieter Hintjens
08c91c0f94 Merge pull request #712 from lalebarde/master 
add proxy control flow and test
 2013-10-21 01:39:09 -07:00
Laurent Alebarde
984c2e94e4 small fix inzmq_proxy_steerable doc 2013-10-18 16:40:21 +02:00
Laurent Alebarde
99b13638eb add doc to zmq_proxy_steerable 2013-10-18 16:35:54 +02:00
Pieter Hintjens
5f1a9a4ae5 Merge pull request #713 from ricnewton/master 
Use consistant integer type in raw_decoder
 2013-10-18 06:37:16 -07:00
Laurent Alebarde
5250bdab9f add tests/test_proxy in gitignore 2013-10-18 15:22:53 +02:00
Richard Newton
1b8daed9db Use consistant integer type in raw_decoder 2013-10-18 14:20:30 +01:00
Richard Newton
1bb982ecc2 Merge branch 'master' of https://github.com/zeromq/libzmq 2013-10-18 14:09:39 +01:00
Laurent Alebarde
e33a382f8d new zmq_proxy is zmq_proxy_steerable to respect C API 2013-10-18 15:01:05 +02:00
Laurent Alebarde
1b75d1ecb5 add proxy control flow and test 2013-10-18 11:12:48 +02:00
Pieter Hintjens
3b628fd85a Merge pull request #710 from jenshz/patch-1 
Update zmq_msg_init_data.txt
 2013-10-14 11:28:37 -07:00
Jens Henrik Hertz
f0a0e4d817 Update zmq_msg_init_data.txt 2013-10-14 20:27:23 +02:00
Pieter Hintjens
6139a66eee Merge pull request #709 from hintjens/master 
Temporary workaround for broken libsodium install
 2013-10-13 05:46:55 -07:00
Pieter Hintjens
097c2c8f8b Temporary workaround for broken libsodium install 2013-10-13 14:45:58 +02:00
Ian Barber
ff90fa7f4d Merge pull request #708 from hurtonm/master 
Load identity message to decoder at start
 2013-10-11 06:33:04 -07:00
Martin Hurton
7ecab54ac3 Load identity message to decoder at start 2013-10-11 14:32:38 +02:00
Pieter Hintjens
9bb4215cfe Merge pull request #707 from xantares/master 
Fixed out-of-source build
 2013-10-11 02:45:35 -07:00
xantares
b2d52a3730 Fixed out-of-source build 2013-10-10 22:08:54 +02:00
Pieter Hintjens
82ab836306 Merge pull request #706 from hurtonm/master 
Rename engine's methods to improve code readability
 2013-10-09 11:44:32 -07:00
Martin Hurton
b35c08beb4 Rename engine's methods to improve code readability 2013-10-09 20:26:38 +02:00
Ian Barber
63e0fe915e Merge pull request #705 from hintjens/master 
Fixed doc for IDENTITY socket option
 2013-10-09 11:20:46 -07:00
Pieter Hintjens
50a1973ee6 Identity can only be set on sockets that can connect to ROUTER 2013-10-09 19:53:18 +02:00
Pieter Hintjens
cc2282556a Update NEWS 2013-10-08 17:54:01 +02:00
Richard Newton
1b6ca34d16 Merge pull request #703 from hintjens/master 
Reverted use of enums for zmq.h constants (too painful for binding authors)
 2013-10-08 06:05:42 -07:00
Pieter Hintjens
b7eb1cdcce Revert "replace macro constants with enum types for user facing constants" 
This reverts commit d4bb6d693f0542bbf35bc1b6810100d5b2a901a8.
 2013-10-08 14:51:19 +02:00
Pieter Hintjens
b0085a7f29 Revert "distinguish between options and defaults" 
This reverts commit e7804c5027633d18558c05b550ea11c46fb37c42.
 2013-10-08 14:51:00 +02:00
Pieter Hintjens
2cf6d52310 Fixed NEWS for 4.0.1 release 2013-10-08 10:48:37 +02:00
Pieter Hintjens
c629b6c7b0 Merge pull request #702 from hintjens/master 
Updated NEWS for 4.0.1 release
 2013-10-08 01:48:16 -07:00
Pieter Hintjens
6ef68be04f Updated NEWS for 4.0.1 release 2013-10-08 10:36:33 +02:00