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

4422 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pieter Hintjens
3e43258769 Merge pull request #1570 from djelenc/deque_bug 
Problem: Tests in Travis are failing randomly
 2015-09-06 02:01:02 +02:00
David Jelenc
64ffda90d2 Problem: Tests in Travis are failing randomly 
Tests were failing, because some deque calls were causing undefined
behavior: calling front() or pop_front() on an empty deque. Such
calls are now safeguarded.
 2015-09-06 01:49:50 +02:00
Constantin Rack
39a0d33912 Merge pull request #1569 from djelenc/xpub_manual_lost_subscriptions 
Fixed missing subscriptions on XPUB with manual subscriptions
 2015-09-05 16:30:36 +02:00
David Jelenc
8fd71d631d Fixed missing subscriptions on XPUB with manual subscriptions 
The patch fixes the issue #1568.
 2015-09-05 15:56:26 +02:00
Pieter Hintjens
47e1216e1e Merge pull request #1567 from djelenc/xpub_manual_proxy_disconnect_unsubscribe 
Problem: lingering subscriptions on XPUB sockets (#1566)
 2015-09-05 12:14:27 +02:00
David Jelenc
dd35e1db0f Problem: lingering subscriptions on XPUB sockets (#1566) 
The patch fixes lingering subscriptions that occur upon disconnection
on XPUB sockets with option XPUB_MANUAL when used in a XPUB-XSUB
proxies.
 2015-09-05 12:07:50 +02:00
Pieter Hintjens
9e8e81cf9a Merge pull request #1564 from c-rack/issue-1558-2 
Solution: do not call poller->add_fd() with -1. Fixes #1558
 2015-09-03 12:41:55 +02:00
Constantin Rack
5dad00ebdc Problem: do not call poller->add_fd() with -1. Fixes #1558 2015-09-03 12:31:55 +02:00
Pieter Hintjens
23c55612e4 Merge pull request #1563 from zeromq/revert-1561-issue-1558 
Revert "Solution: check return code of make_fdpair() with zmq_assert"
 2015-09-03 12:15:42 +02:00
Constantin Rack
2159618b56 Revert "Solution: check return code of make_fdpair() with zmq_assert" 2015-09-03 10:56:26 +02:00
Constantin Rack
13db11c6ae Merge pull request #1562 from markuspf/fix-dragonfly-compile-2 
Make DragonFly a first class citizen in terms of compilation
 2015-09-03 10:19:42 +02:00
Markus Pfeiffer
ee984b1fe6 Make DragonFly a first class citizen in terms of compilation 2015-09-03 09:00:12 +01:00
Pieter Hintjens
32d7da1103 Merge pull request #1561 from c-rack/issue-1558 
Solution: check return code of make_fdpair() with zmq_assert
 2015-09-02 23:25:51 +02:00
Constantin Rack
bb9788867f Problem: return code of make_fdpair() is not checked. Fixes #1558 2015-09-02 23:19:27 +02:00
Constantin Rack
801f39dbef Merge pull request #1557 from hintjens/master 
Cleaned up test case
 2015-09-02 10:02:56 +02:00
Pieter Hintjens
1fdf8f78e4 Cleaned up test case 2015-09-02 09:55:19 +02:00
Constantin Rack
146be48495 Merge pull request #1553 from flub/master 
Update zmq_inproc manpage for bind/connect order
 2015-08-27 12:50:17 +02:00
Floris Bruynooghe
f86264db3e Update zmq_inproc manpage for bind/connect order 
The order of zmq_bind() and zmq_connect() is no longer important
for the inproc transport since libzmq 4.0.  This updates this
in the zmq_inproc manpage.
 2015-08-27 10:40:21 +01:00
Constantin Rack
0e1448a26f Merge pull request #1550 from xaqq/master 
Problem: Identity frame from router has no metadata
 2015-08-24 22:35:31 +02:00
Pieter Hintjens
bc513b6381 Merge pull request #1547 from jemc/master 
Problem: Private/internal macros defined in public header.
 2015-08-22 09:09:56 +02:00
Joe Eli McIlvain
33419425eb Problem: Private/internal macros defined in public header. 
Solution: Move the macros to a private header.
 2015-08-21 16:12:22 -07:00
Pieter Hintjens
735c02ed5e Merge pull request #1546 from reza-ebrahimi/master 
rename ZMQ_UNUSED macro to LIBZMQ_UNUSED
 2015-08-21 23:57:18 +02:00
reza.ebrahimi
63260d8701 rename ZMQ_UNUSED macro to LIBZMQ_UNUSED 2015-08-22 00:31:25 +04:30
Constantin Rack
b07b1e270e Merge pull request #1545 from ricnewton/master 
Fix zmq crash when calling shutdown with a pending inproc socket connect
 2015-08-21 11:25:45 +02:00
Richard Newton
096007c574 Fix zmq crash when calling shutdown with a pending inproc socket connect 2015-08-21 10:06:54 +01:00
Constantin Rack
4e5843b8ff Merge pull request #1543 from csiro-workspace/master 
Set signaler_port to 0 which allows the OS to find a free port
 2015-08-21 08:12:09 +02:00
Matt Bolger
7e09306cb3 -Set signaler_port to 0 which allows the OS to find a free port, rather than crashing if 5905 is in use (https://github.com/zeromq/libzmq/issues/1542) 
-Added config.hpp to the source list so it shows up in generated projects
-Remove CMAKE_BUILD_TYPE setting for generators that don't use it
 2015-08-21 13:45:59 +10:00
Constantin Rack
ec98916e82 Merge pull request #1541 from jemc/master 
Problem: Source files contain mixed tabs and spaces.
 2015-08-20 16:54:03 +02:00
Joe Eli McIlvain
61217a2686 Problem: Source files contain mixed tabs and spaces. 
Solution: Convert to spaces and remove trailing whitespace in these files.
 2015-08-20 07:46:34 -07:00
Richard Newton
6aa5c20b3d Merge pull request #1540 from djelenc/fix_failing_tests 
Fixes failing tests regarding XPUB sockets.
 2015-08-20 14:44:45 +01:00
David Jelenc
1240d7ac83 Fixes failing tests regarding XPUB sockets. 
Fixes tests that were introduced in a previous pull request. See
https://github.com/zeromq/libzmq/pull/1539#issuecomment-132968987
 2015-08-20 15:32:23 +02:00
Constantin Rack
391bc12d17 Merge pull request #1539 from djelenc/issue1116 
Addresses zeromq/libzmq#1116.
 2015-08-20 12:34:19 +02:00
David Jelenc
b9634e11a3 Addresses zeromq/libzmq#1116. 
This patch  adds a new member of type deque to the
xpub class that contains pointers to metadata_t.
This deque is then used (alongside pending_data
and pending_flags) to preserve metadata when
copying messages.
 2015-08-20 12:09:56 +02:00
Kapp Arnaud
370b8c9bb1 Problem: Identity frame from router has no metadata 
The routing id (identity) frame return when reading from
a router doesn't have the same metadata as the "real"
message that follows.
For example, The ZAP "User-Id" property is missing.

This patch attach the "data message"'s metadata
to the "identity message" when it is read from the router.
 2015-08-20 01:15:18 +02:00
Constantin Rack
3f326b10d6 Merge pull request #1536 from bluca/ci-osx-missing-dependency 
CI run on OSX needs binutils
 2015-08-17 18:17:20 +02:00
Constantin Rack
709a1e9a2d Merge pull request #1535 from somdoron/master 
problem: trying to support polling on thread safe sockets with zmq_poll failed
 2015-08-17 18:11:52 +02:00
Luca Boccassi
0c4032b5af CI run on OSX needs binutils 
OSX does not ship with binutils, need to install it before the script
run via brew in order to be able to use greadelf, needed by the
qt-android CI script.
 2015-08-17 17:06:56 +01:00
somdoron
4da5ff6a7d revert to original zmq_polland creating zmq_pollfd_poll for polling on pollfd 2015-08-17 18:57:47 +03:00
Constantin Rack
a96f16e3fa Merge pull request #1534 from somdoron/master 
problem: new poller field in zmq_pollitem_t is changing the api
 2015-08-17 13:40:26 +02:00
somdoron
d83b045347 rename poller to pollfd 2015-08-17 14:20:49 +03:00
Pieter Hintjens
7d42aac0c5 Merge pull request #1533 from c-rack/fix-tests 
Problem: tests fail after PR #1531
 2015-08-17 13:17:53 +02:00
Constantin Rack
34fe5eaf26 Solution: explicitly set u.base.metadata to null 2015-08-17 12:41:27 +02:00
somdoron
5bae6911af remove poller field, using fd instead 2015-08-17 11:56:23 +03:00
Constantin Rack
87e7ed054b Merge pull request #1531 from reza-ebrahimi/master 
apply a change to LIBZMQ_DELETE macro (related to issue #1524)
 2015-08-16 22:54:01 +02:00
reza.ebrahimi
7058c54672 apply a change to LIBZMQ_DELETE macro (related to issue #1524) 2015-08-17 01:00:55 +04:30
Constantin Rack
6d9eb184b5 Merge pull request #1530 from reza-ebrahimi/master 
define a macro for heap object deletion in a unified manner (related …
 2015-08-16 22:21:19 +02:00
reza.ebrahimi
1621c25ef0 define a macro for heap object deletion in a unified manner (related to issue #1524) 2015-08-17 00:35:11 +04:30
Constantin Rack
9bf88bcc03 Merge pull request #1529 from bluca/container 
Container-based CI build
 2015-08-16 21:32:39 +02:00
Luca Boccassi
1ab4667412 Set -x in ci_build.sh to show commands in log 2015-08-16 20:20:59 +01:00
Luca Boccassi
f6b0eaddb5 Set sudo: false to force container build 2015-08-16 20:20:59 +01:00
Luca Boccassi
1afc30a6c4 CI build/install in local directory 2015-08-16 20:20:59 +01:00
Constantin Rack
9ebd54a9e5 Merge pull request #1528 from bluca/fix-travis-check 
CI build does not fail when tests fail. Fix #1527
 2015-08-16 17:45:57 +02:00
Luca Boccassi
f4e9e6f062 CI build does not fail when tests fail. Fix #1527 2015-08-16 16:41:17 +01:00
taotetek
eb1d72f81d Merge pull request #1526 from somdoron/master 
problem: new field is breaking existing code
 2015-08-16 11:09:28 -04:00
somdoron
9d829f72f4 moving new poller field to the end of the struct 2015-08-16 18:00:32 +03:00
Constantin Rack
e74e36def1 Merge pull request #1525 from somdoron/master 
problem: user cannot poll on thread safe sockets
 2015-08-16 13:10:16 +02:00
somdoron
6eddbd98bc polling on thread safe sockets 2015-08-16 13:57:28 +03:00
somdoron
1653d3c093 add new tests to gitignore 2015-08-16 13:57:28 +03:00
somdoron
1aaa893e02 add tests for polling on thread safe sockets 2015-08-16 13:57:28 +03:00
somdoron
a63818904d add methods to handle poller 2015-08-16 13:57:28 +03:00
somdoron
34968771ca add an option to check if the socket is thread safe 2015-08-16 11:50:50 +03:00
Constantin Rack
de018e8766 Merge pull request #1522 from reza-ebrahimi/master 
fixed issue with ticket #1517 (wrong lib output name in MSVC CMake bu…
 2015-08-14 16:13:41 +02:00
reza.ebrahimi
a50834cbec fixed issue with ticket #1517 (wrong lib output name in MSVC CMake build) and apply some improvements in CMake build system 2015-08-14 18:04:54 +04:30
Constantin Rack
eb2eec646f Merge pull request #1521 from reza-ebrahimi/master 
changing some camelCase variable names to snake_case in previous commit
 2015-08-14 14:42:54 +02:00
reza.ebrahimi
8e6ef4616e changing some camelCase variable names to snake_case in previous commit 2015-08-14 16:56:07 +04:30
Constantin Rack
003ae1bfc6 Merge pull request #1520 from reza-ebrahimi/master 
remove unnecessary multiple WSAGetLastError() calls
 2015-08-14 14:14:04 +02:00
reza.ebrahimi
d7b74d1f57 remove unnecessary multiple WSAGetLastError() calls 2015-08-14 16:29:18 +04:30
Constantin Rack
6d217aa919 Merge pull request #1519 from reza-ebrahimi/master 
place a ZMQ_UNUSED macro and replace all unused variables with ZMQ_UNUSED macro
 2015-08-14 13:28:53 +02:00
reza.ebrahimi
bff2284a50 place a ZMQ_UNUSED macro and replace all unused variables with ZMQ_UNUSED macro 2015-08-14 15:40:39 +04:30
Constantin Rack
bf27d58b7a Merge pull request #1518 from sappo/master 
Problem: Missing src/ prefix for libzmq library in Makefile.am ...
 2015-08-13 08:51:45 +02:00
sappo
8bf4d1eaaf Problem: Missing src/ prefix for libzmq library in Makefile.am for test_getsockopt_memset 
Solution: Add prefix to fix test compilation
 2015-08-13 07:13:00 +02:00
Constantin Rack
effc26c695 Merge pull request #1476 from hintjens/master 
Problem: lack test case for large stream messages
 2015-08-12 10:03:45 +02:00
Constantin Rack
08c2a9274e Merge pull request #1514 from rikvdh/master 
Merge fix for zeromq/zeromq4-1#52, getsockopt ZMQ_RCVMORE now resets all bits
 2015-08-11 23:30:59 +02:00
Constantin Rack
de55e3a355 Merge pull request #1515 from rikvdh/test-proxy-return 
Check proxy return values in tests
 2015-08-11 23:30:22 +02:00
Rik van der Heijden
5485d6e371 Check proxy return values in tests 2015-08-11 21:44:41 +02:00
Rik van der Heijden
c68e9a39bf Merge fix for zeromq/zeromq4-1#52, getsockopt ZMQ_RCVMORE now resets all bits 2015-08-11 21:37:50 +02:00
Pieter Hintjens
fd9bd1b2a5 Problem: broke Cmake build 2015-08-11 19:35:48 +02:00
Pieter Hintjens
5d5cdac161 Problem: source packages lack makefiles for all systems except msvc 
Solution: specify the necessary EXTRA_DIST

I added a Makefile.am in builds that covers all systems except msvc,
which already has a Makefile.am that does this.

Fixes #1505
 2015-08-11 19:34:25 +02:00
Pieter Hintjens
2b45e38b7b Problem: documentation for ZMQ_CTX_BLOCKY is wrong 
Solution: fix it. Default is true, not false.
 2015-08-11 19:34:25 +02:00
Pieter Hintjens
11fba2b813 Fixed compile errors in test_stream 2015-08-11 19:34:25 +02:00
Pieter Hintjens
92c4decb69 Problem: lack test case for large stream messages 
Solution: added to test_stream.cpp
 2015-08-11 19:34:25 +02:00
Constantin Rack
b791031423 Merge pull request #1512 from pijyoi/retransmit_fix 
fix: ZMQ_TCP_RETRANSMIT_TIMEOUT not applied to bind socket
 2015-08-07 10:02:52 +02:00
KIU Shueng Chuan
e129640471 fix: ZMQ_TCP_RETRANSMIT_TIMEOUT not applied to bind socket 2015-08-07 06:43:31 +08:00
Constantin Rack
84a93d4251 Merge pull request #1511 from sorenh/linger_fix 
Avoid terminating connections prematurely
 2015-08-06 20:45:45 +02:00
Soren Hansen
abc845d1af Avoid terminating connections prematurely 
While sending very large messages (far beyond what fits in a the tcp
buffer, so it takes multiple sendto system calls for it to finish),
zmq_close will close the connection regardless of ZMQ_LINGER.

In case no engine is attached, a pipe->check_read() is needed to look
for the delimiter in the pipe and ultimately trigger the pipe
termination.

However, if there *is* an engine attached, the check_read() looks ahead
and finds the delimiter and terminates the connection even though the
engine might actually still be in the middle of sending a message.

This happens because while the io_thread is still busy sending the data,
the pipe can get terminated and the io thread ends up being terminated.
 2015-08-06 20:09:37 +02:00
Richard Newton
ba6e1337a3 Merge pull request #1510 from pijyoi/retransmit_timeout 
add ZMQ_TCP_RETRANSMIT_TIMEOUT socket option
 2015-08-06 17:26:13 +01:00
KIU Shueng Chuan
c7f2cdd699 fix: Windows setsockopt needs char* cast 2015-08-07 00:05:13 +08:00
KIU Shueng Chuan
ca9215de1e add ZMQ_TCP_RETRANSMIT_TIMEOUT socket option 2015-08-06 23:36:27 +08:00
Constantin Rack
064c2e0836 Merge pull request #1508 from pijyoi/connect_timeout 
add ZMQ_CONNECT_TIMEOUT option
 2015-08-04 16:54:56 +02:00
KIU Shueng Chuan
c9971e08a0 write man pages 2015-08-04 22:17:02 +08:00
KIU Shueng Chuan
eeb697b5ac add connect timeout logic 2015-08-04 22:17:02 +08:00
KIU Shueng Chuan
c0ca2be642 add ZMQ_CONNECT_TIMEOUT socket option 2015-08-04 22:17:02 +08:00
KIU Shueng Chuan
4a0bde8130 rename timer_started to reconnect_timer_started 2015-08-04 22:17:02 +08:00
KAPP Arnaud
5724b55f7b Merge pull request #1507 from pijyoi/fixdoc 
ZMQ_TCP_KEEPALIVE_IDLE doc wrongly mentions TCP_KEEPCNT
 2015-08-04 15:52:53 +02:00
KIU Shueng Chuan
2d9c7f3a1f ZMQ_TCP_KEEPALIVE_IDLE doc wrongly mentions TCP_KEEPCNT 
was fixed in zmq_setsockopt.txt but not in zmq_getsockopt.txt
 2015-08-04 21:43:44 +08:00
Richard Newton
d65dab2039 Merge pull request #1504 from bluca/travis-file-limit 
Increase file limit in travis config
 2015-08-02 19:22:53 +01:00
Luca Boccassi
85da2ea42f Increase file limit in travis config 
Test cases occasionally fail, especially on OSX, due to socket limit.
Part of fix for #1502
 2015-08-02 19:20:34 +01:00
Constantin Rack
23655c5c56 Merge pull request #1503 from bluca/travis-ci-osx 
Travis ci osx
 2015-08-02 20:08:34 +02:00
Luca Boccassi
270a1ac577 Add OSX build to travis config. Fixes #1502 2015-08-02 18:59:34 +01:00
Luca Boccassi
20ba661019 Do not use ldconfig in CI if running on OSX 
ldconfig is not available on OSX, so Travis CI build fails
 2015-08-02 18:38:35 +01:00