0
0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-14 01:37:56 +08:00

4315 Commits

Author SHA1 Message Date
Benjamin Henrion
e19454e388 Problem: OpenWRT Makefile still uses tarballs, now using GIT HEAD master 2016-01-15 11:19:24 +01:00
Constantin Rack
d8941f599a Merge pull request #1705 from hintjens/master
Problem: no support for OpenWRT
2016-01-15 10:54:02 +01:00
Pieter Hintjens
055995e535 Problem: builds directory contains packaging scripts
Specifically, the RedHat tools.

Solution: move this into packaging/
2016-01-15 10:25:38 +01:00
Pieter Hintjens
d8d9ee3243 Problem: no support for OpenWRT
Solution: copy ZeroMQ packaging script from
https://github.com/vperron/openwrt-zmq-packages

Note: this is not usable as-such, needs fixing.
2016-01-15 10:10:06 +01:00
Pieter Hintjens
b9167df916 Merge pull request #1702 from GreatFruitOmsk/greatfruit-master
Add support for the RelWithDebInfo CMake configuration.
2016-01-14 15:16:14 +01:00
Ilya Kulakov
bfbb655491 Add support for the RelWithDebInfo CMake configuration.
It's now possible to build Release version with pdb file.
2016-01-14 18:20:00 +06:00
Constantin Rack
47d9caa49a Merge pull request #1701 from madebr/cmake_test_include_source_dir
Problem: On Windows CI, in tests/test_timers.c, "Windows.hpp" could not be found.
2016-01-14 10:04:12 +01:00
Anonymous Maarten
be36423bc2 Problem: On Windows CI, the included file Windows.hpp could not be
found.
Solution: Include the source directory

Problem: _sleep is a library function of Windows.
Solution: use sleep_
2016-01-14 02:53:24 +01:00
Constantin Rack
8f4574f8d0 Merge pull request #1700 from madebr/stable_sodium
Problem: Windows CI fails due to libsodium build failure
2016-01-14 01:02:46 +01:00
Anonymous Maarten
e7afed0655 Problem: Windows CI fails due to libsodium build failure
Solution: Use stable branch of libsodium
2016-01-14 00:59:57 +01:00
Pieter Hintjens
b9d831695f Merge pull request #1699 from somdoron/master
problem: when socket is destroyed before zmq_poller is the zmq_poller is accessing a dead socket
2016-01-13 14:27:22 +01:00
somdoron
6bbca7cf4a fix case when zmq_poller access a dead socket 2016-01-13 15:12:47 +02:00
KAPP Arnaud
714988e6c5 Merge pull request #1694 from hintjens/master
Problem: Android build is too slow
2016-01-05 17:34:32 +01:00
Pieter Hintjens
c49eef46ec Problem: Android build is too slow
Solution: use parallel make (-j 4) and don't build man pages.
2016-01-05 17:31:17 +01:00
Constantin Rack
f64c38583f Merge pull request #1692 from FredTreg/master
Test for issue #1690 (ZMQ_REQ_RELAXED)
2016-01-03 15:37:06 +01:00
Frederic Tregon
9bdb60577c Test for issue #1690 (ZMQ_REQ_RELAXED)
Current ZMQ_REQ_RELAXED test improvement to check that pipes are not closed
after executing two send() in a row with no recv() in between.
2016-01-03 15:28:07 +01:00
Constantin Rack
c30676fe52 Merge pull request #1691 from FredTreg/master
Fixed issue #1690 (ZMQ_REQ_RELAXED)
2016-01-01 20:04:34 +01:00
Frederic Tregon
89417ddb9f Fixed issue #1690 (ZMQ_REQ_RELAXED)
When using ZMQ_REQ_RELAXED and a 'send' is executed after another 'send' the
previous code would terminate the 'reply_pipe' if any.
This is incorrect as terminating the reply pipe also terminates the send pipe
as they are the same (a pipe associated with a socket is bidirectional).
Doing a terminate on the pipe sets an internal flag called out_active to false
and the pipe can no longer send messages.
Removing the 'terminate' solves the problem. Removing this call is not an issue
as the incorrect ordering of messages that could be incurred is taken care of
by the ZMQ_REQ_CORRELATE option if needed.
2016-01-01 19:19:33 +01:00
Constantin Rack
06402f4f28 Merge pull request #1687 from hintjens/master 2015-12-29 18:03:12 +01:00
Pieter Hintjens
2566c02a9e Problem: CLIENT and SERVER don't check SNDMORE
These sockets don't handle multipart data, so if callers send it,
they drop frames, and things break silently.

Solution: if the caller tries to use ZMQ_SNDMORE, return -1 and
set errno to EINVAL.
2015-12-29 17:00:06 +01:00
Constantin Rack
ae3b2734df Merge pull request #1684 from hintjens/master
Problem: still one error in vcxproj files
2015-12-21 19:13:27 +01:00
Pieter Hintjens
6bb0cc1fd5 Problem: still one error in vcxproj files
Solution: fix and try again.

(We could start to think of using zproject to generate these build
scripts as the only difference is C/C++)
2015-12-21 18:57:31 +01:00
Constantin Rack
6164e3d913 Merge pull request #1683 from hintjens/master
Problem: includes timer.cpp/hpp instead of timers.cpp/hpp
2015-12-21 18:42:32 +01:00
Pieter Hintjens
137afd5610 Problem: includes timer.cpp/hpp instead of timers.cpp/hpp
Solution: fix it.
2015-12-21 18:36:49 +01:00
Constantin Rack
1c874876ff Merge pull request #1682 from hintjens/master
Problem: performance tests don't link on Windows/MSVC
2015-12-21 13:24:00 +01:00
Pieter Hintjens
065fbcdc8f Problem: performance tests don't link on Windows/MSVC
Solution: add Iphlpapi.lib to libraries to link against
2015-12-21 13:07:13 +01:00
Constantin Rack
114f2b464f Merge pull request #1681 from hintjens/master
Problem: MSVC projects don't include timers.cpp/hpp
2015-12-21 11:17:37 +01:00
Constantin Rack
bf14b1f906 Merge pull request #1680 from hintjens/master
Fixes for Windows, and poller API
2015-12-21 11:09:28 +01:00
Pieter Hintjens
6665bffe11 Problem: MSVC projects don't include timers.cpp/hpp
Solution: add these
2015-12-21 11:09:11 +01:00
Pieter Hintjens
7893a6ac26 Problem: zmq poller API is not CLASS conformant
Solution: change zmq_poller_close(p) to zmq_poller_destroy(&p)
2015-12-21 11:01:16 +01:00
Pieter Hintjens
f8b9ca5f42 Problem: zmq timers API is not CLASS conformant
If we're going to add CLASS-like APIs we should use the proper
syntax; specifically 'destroy' instead of 'close', which is a
hangover from the 'ZeroMQ is like sockets' model we're slowly
moving away from.

Solution: change zmq_timers_close(p) to zmq_timers_destroy(&p)
2015-12-21 10:56:37 +01:00
Pieter Hintjens
627809568b Problem: on Windows, link fails on missing Iphlpapi.lib
Solution: add to project dependencies
2015-12-21 10:52:40 +01:00
Pieter Hintjens
78c3ba0dc5 Merge pull request #1677 from c-rack/faster-git-clone
Problem: build scripts don't need full git history
2015-12-20 19:36:07 +01:00
Constantin Rack
d32cb1ae6f Merge pull request #1679 from hintjens/master
Problem: Windows build gives warning on v2_decoder.cpp:130
2015-12-20 19:30:11 +01:00
Pieter Hintjens
97092d994d Problem: Windows build gives warning on v2_decoder.cpp:130
Solution: add explicit cast
2015-12-20 19:13:49 +01:00
Constantin Rack
33c5985eb2 Problem: build scripts don't need full git history
Solution: add `--depth 1` parameter to `git clone` commands
2015-12-19 13:17:22 +01:00
Pieter Hintjens
4705feb2f4 Merge pull request #1676 from GreatFruitOmsk/master
CMAKE_VS_PLATFORM_TOOLSET may not be set.
2015-12-18 16:07:11 +01:00
Ilya Kulakov
0475c6dfd8 CMAKE_VS_PLATFORM_TOOLSET may not be set.
E.g. for nmake.
2015-12-18 20:50:41 +06:00
Constantin Rack
c19470ece1 Merge pull request #1675 from somdoron/Timers
Problem: no way to schedule timers with zmq_poll or zmq_poller
2015-12-18 11:34:39 +01:00
somdoron
aadaf99011 add timers API to libzmq 2015-12-18 12:23:22 +02:00
Pieter Hintjens
9ce8fe8f66 Merge pull request #1674 from GreatFruitOmsk/master
Add missing header for the if_nametoindex on Windows.
2015-12-18 10:57:46 +01:00
Ilya Kulakov
b76ccb8b1a Add missing header for the if_nametoindex on Windows. 2015-12-18 15:54:18 +06:00
Constantin Rack
066ff133f0 Merge pull request #1672 from GreatFruitOmsk/master
Fix redirecting location of pdb via CMAKE_PDB_OUTPUT_DIRECTORY.
2015-12-18 09:58:32 +01:00
Ilya Kulakov
923645060a Fix redirecting location of pdb via CMAKE_PDB_OUTPUT_DIRECTORY. 2015-12-18 14:52:17 +06:00
Constantin Rack
b67cdcfd0b Merge pull request #1670 from hintjens/master
CI was broken by #54799c (reverted)
2015-12-18 09:06:12 +01:00
Pieter Hintjens
987eb6ddc3 Merge pull request #1671 from brian-peloton/master
Fix alignment of initial chunk in yqueue
2015-12-17 21:10:35 +01:00
Brian Silverman
700b91d102 Fix alignment of initial chunk in yqueue
Clang's UndefinedBehaviorSanitizer catches this in the tests.
2015-12-17 14:28:15 -05:00
Pieter Hintjens
f3bcb73f02 Fixed old path to qt-android 2015-12-17 16:24:35 +01:00
Pieter Hintjens
31c35498af Revert "fixes #1565: Allow session to flush commands on an engine error"
This reverts commit 54799c8c6fa605f7272e966912f6e93161f9d11d.

This change broke the tests/test_shutdown_stress testcase.
2015-12-17 16:20:48 +01:00
KAPP Arnaud
768fc7699e Merge pull request #1668 from zoobab/master
Build success message + Build zmq for android with a Dockerfile
2015-12-17 14:12:26 +01:00
Benjamin Henrion
8f1810d1e2 Add a Dockerfile to build libzmq for android 2015-12-17 00:11:26 +01:00
Pieter Hintjens
819a879ff2 Merge pull request #1669 from bluca/travis_android
Problem: travis CI tries to build "qt-android"
2015-12-16 14:20:47 +01:00
Luca Boccassi
bd222d9206 Problem: travis CI tries to build "qt-android"
Solution: change .travis.yml to build "android" instead of "qt-android"
2015-12-16 13:11:45 +00:00
Constantin Rack
a9bad3bc13 Merge pull request #1665 from hintjens/master
Problem: builds/qt-android name is inaccurate
2015-12-14 19:59:51 +01:00
Pieter Hintjens
9b45ba7067 Problem: builds/qt-android name is inaccurate
Solution: rename to simple builds/android.
2015-12-14 19:01:13 +01:00
Constantin Rack
f00eb5aae6 Merge pull request #1664 from Kentzo/vmci
Add special interface to represent local VMCI context.
2015-12-14 14:31:05 +01:00
Ilya Kulakov
3caa637e1b Add special interface to represent local VMCI context. 2015-12-14 19:20:27 +06:00
Constantin Rack
301989614f Merge pull request #1663 from hurtonm/master 2015-12-11 15:36:12 +01:00
Martin Hurton
3ae5c55e46 Fix mailmap entry for Max Skaller 2015-12-11 15:26:42 +01:00
Martin Hurton
86efa67d97 Add mailmap entry for Chuck Remes 2015-12-11 15:26:19 +01:00
Pieter Hintjens
7eeb7d5e74 Merge pull request #1662 from hurtonm/master
Add mailmap file
2015-12-10 17:08:01 +01:00
Martin Hurton
d8af708ad9 Add mailmap file 2015-12-10 15:44:22 +01:00
Joe Eli McIlvain
c18904cbd2 Merge pull request #1659 from syenna/master
Add missing support for IPv6 link local addresses
2015-12-09 14:37:22 -08:00
Sathish Yenna
7cfa93352e Add missing support for IPv6 link local addresses (which include % followed by the interface name) 2015-12-09 16:26:34 -06:00
Constantin Rack
6eeef5eb7c Merge pull request #1658 from hintjens/master
Problem: zmq_vmci man page claims to be zmq_ipc man page
2015-12-09 10:47:36 +01:00
Constantin Rack
3cc7cfc015 Merge pull request #1657 from Kentzo/vmci
Don't build VMCI by default.
2015-12-09 10:47:19 +01:00
Ilya Kulakov
6ae70a9428 Remove unnecessray comment and unnecessary include. 2015-12-09 15:45:15 +06:00
Ilya Kulakov
141de87085 Fix a typo in reference to with_norm_ext. 2015-12-09 15:45:15 +06:00
Pieter Hintjens
4dcfb23e2e Problem: zmq_vmci man page claims to be zmq_ipc man page
Solution: fix this.
2015-12-09 10:45:12 +01:00
Constantin Rack
765fd20937 Merge pull request #1656 from bluca/vmci_include 2015-12-08 19:21:10 +01:00
Luca Boccassi
64ce6ca772 Problem: build fails, vmci enabled by default
Solution: disable vmci by default
Fixes issue #1655
2015-12-08 17:58:31 +00:00
Luca Boccassi
a556b500da Problem: build failure, vmci include out of IFDEF
Solution: do not include vmci header outside of vmci IFDEF
Fixes issue #1655
2015-12-08 17:53:31 +00:00
Pieter Hintjens
fc7e3bc3a4 Merge pull request #1654 from Kentzo/vmci
Add the VMCI transport.
2015-12-08 08:50:24 +01:00
Ilya Kulakov
68b13fbddb Add the VMCI transport.
VMCI transport allows fast communication between the Host
and a virtual machine, between virtual machines on the same host,
and within a virtual machine (like IPC).

It requires VMware to be installed on the host and Guest Additions
to be installed on a guest.
2015-12-08 13:16:09 +06:00
Pieter Hintjens
61f74e2dfc Merge pull request #1652 from chrisstaite/master
Adjust start of heartbeat timer
2015-11-30 21:32:37 +01:00
Chris
ba3cf3c006 Only start the heartbeat timer when the underlying mechanism is ready to stop cipher streams from trying to encrypt a heartbeat before the handshake has completed. Addresses issue #1601. 2015-11-30 20:18:25 +00:00
Pieter Hintjens
f6018e81d8 Merge pull request #1651 from wcs1only/master
fixes #1565: Allow session to flush commands on an engine error
2015-11-30 16:14:30 +01:00
Charles Stanley
54799c8c6f fixes #1565: Allow session to flush commands on an engine error 2015-11-30 10:05:47 -05:00
Pieter Hintjens
e56b486735 Merge pull request #1650 from c-rack/show-log-on-build-error
Solution: print test-suite.log if "make check" fails
2015-11-27 08:47:53 +01:00
Constantin Rack
dfaa92cd1e Problem: test-suite.log is not accessible on failing CI build
Currently, a test fails on Travis-CI but that can not be reproduced locally.
Without the contents of the test-suite.log, this is difficult to analyze.

Solution: print test-suite.log if "make check" fails

This is based on the following answer on SO:
http://stackoverflow.com/a/32597140
2015-11-25 09:17:53 +01:00
Constantin Rack
782fbe5bef Merge pull request #1649 from sheremetyev/fix-pipe-activation-race
Fix pipe activation race
2015-11-24 19:02:36 +01:00
Fedor Sheremetyev
bad93c536a Set LWM to half of HWL.
This reduces chances of race between writer deactivation and activation.

Reader sends activation command to writer when number or messages is
multiple of LWM. In situation with high throughput (millions of messages
per second) and correspondingly large HWM (e.g. 10M) the difference
between HWM needs to be large enough - so that activation command is
received before pipe becomes full.
2015-11-24 17:33:38 +00:00
Fedor Sheremetyev
234018d749 Add test demostrating that HWM applies to messages that have been already consumed. 2015-11-24 17:33:19 +00:00
Pieter Hintjens
6e064f9f75 Merge pull request #1648 from c-rack/remove-out-batch-size
Solution: remove `out_batch_size` from src/config.hpp
2015-11-24 10:13:52 +02:00
Constantin Rack
f9b8a94c90 Problem: out_batch_size has been replaced by ZMQ_TCP_SEND_BUFFER option in cdeec4c1
Solution: remove `out_batch_size` from src/config.hpp
2015-11-24 09:04:07 +01:00
Constantin Rack
b407b54b44 Merge pull request #1647 from banburybill/master
Add new option ZMQ_MULTICAST_MAXTPDU to set PGM_MTU.
2015-11-23 21:31:42 +01:00
Jim Hague
e71471b2e8 Add new option ZMQ_MULTICAST_MAXTPDU to set PGM_MTU.
Fixes #1646
2015-11-23 19:35:02 +00:00
Constantin Rack
5d04dc354e Merge pull request #1645 from somdoron/master
Problem: router socket can do pipe handover while reading multipart message
2015-11-21 18:12:42 +01:00
somdoron
804bce8294 Fix pipe terimation in router while reading message 2015-11-20 21:27:56 +02:00
Pieter Hintjens
4f7dc49642 Merge pull request #1643 from somdoron/master
Problem: when STREAM socket HWM is reached an assert will happen as metadata is trying to set twice
2015-11-19 13:47:28 +02:00
somdoron
210572201d Fix a bug when stream_engine try to set alreadt set metadata 2015-11-18 15:02:19 +02:00
Pieter Hintjens
afc7c5c745 Merge pull request #1641 from c-rack/fix-recv-send-buffer
Solution: change behaviour of tcp_send/recv_buffer_size option
2015-11-13 12:29:09 +01:00
Constantin Rack
fc1099ffd1 Problem: documentation shows wrong default value
Solution: fix documentation
2015-11-13 11:08:23 +01:00
Constantin Rack
ec41f6540f Problem: tcp_recv/send_buffer should be byte value instead of scale factor
Solution: change option behaviour and adopt documentation
2015-11-13 10:47:15 +01:00
Constantin Rack
5ba328d7f3 Problem: there is no test for setsockopt ZMQ_TCP_SEND/RECV_BUFFER
Solution: add test case
2015-11-13 10:44:00 +01:00
Pieter Hintjens
f80faeca29 Merge pull request #1640 from c-rack/fix-setsockopt
Solution: fix compilation errors
2015-11-13 10:27:31 +01:00
Constantin Rack
a992d9aca0 Problem: comparison between signed and unsigned integer expressions
Solution: make tcp_recv_buffer_size and tcp_send_buffer_size unsigned
2015-11-13 10:08:30 +01:00
Constantin Rack
98d5d4d7f0 Problem: call of overloaded ‘pow()’ is ambiguous
Solution: make base a double value
2015-11-13 09:47:03 +01:00
Constantin Rack
18c517020b Merge pull request #1638 from jens-auer/tcp_buffer_options
Tcp buffer options to set RECV/SEND buffer
2015-11-12 23:17:14 +01:00
Jens Auer
908d6b6740 Update options.cpp
Fixed ZMQ_TCP_RECV_BUFFER set case.
2015-11-08 21:48:36 +01:00