Commit Graph

3940 Commits

Author SHA1 Message Date
Richard Newton
9f8b8af926 Fail ZMQ_SNDHWM and ZMQ_RCVHWM setsockopt if already connected. 2015-06-05 10:43:40 +01:00
Richard Newton
64e711eb50 Merge branch 'master' of https://github.com/zeromq/libzmq 2015-06-05 08:47:20 +01:00
Constantin Rack
383f67a5cc Merge pull request #1422 from hintjens/master
Problem: tests/test_socketopt_hwm fails and breaks CI
2015-06-05 00:00:50 +02:00
Pieter Hintjens
e37d715702 Problem: tests/test_socketopt_hwm fails and breaks CI
Solution: mark this as XFAIL
2015-06-04 23:57:50 +02:00
Richard Newton
1540737561 Merge branch 'master' of https://github.com/zeromq/libzmq 2015-06-04 08:24:05 +01:00
Pieter Hintjens
bfb0ac1cc4 Merge pull request #1418 from xaqq/setsockopt
Introduce a failing test against zmq_setsockpt().
2015-06-04 06:41:35 +02:00
Kapp Arnaud
fb960147ca Introduce a failing test against zmq_setsockpt().
Problem: zmq_setsockpt() returns success when changing the
HWM after a bind or connect() even though the call has no effect.

Solution: Introduce a failing test a reminder we need to patch it.
2015-06-04 01:38:45 +02:00
Pieter Hintjens
9e80f07a8d Merge pull request #1417 from jens-auer/zero_copy
Zero copy message receive in v2_decoder
2015-06-03 23:09:03 +02:00
Jens Auer
e9b403a7b1 zero-copy message receive
Construct messages from a reference-counted buffer allocated once
per receive instead of copying the data.
2015-06-03 23:03:14 +02:00
Jens Auer
611e96c701 Allocation-free msg::init_data
With a msg_t size of 64 bytes, it becomes possible to embedd the content_t's members
struct for large messages directly in the msg_t. This saves the dynamic allocation
of content_t obejcts when using msg_t::init_data.

content_t contains a zmq::atomic_counter_t object which is not a POD in C++98
and thus it cannot be used as a member of the union u. To bypass this, C++11
is used which has relaxed rules for POD and atomic_counter is a C++11-POD. An
alternative would have been to make atomic_counter a classical POD by removing
constructors and all private member functions, i.e. have a struct and free functions
to manipulate it.

A new msg_t::init function is added which decides to either to copy the data for size<64 bytes
or use msg_t::init_data to do zero-copy initialization.
2015-06-03 22:44:33 +02:00
KAPP Arnaud
03d6a7341b Merge pull request #1415 from hintjens/master
Fixes to README
2015-06-03 00:40:42 +02:00
Pieter Hintjens
3e330d6e2b Fixes to README 2015-06-02 23:44:12 +02:00
Pieter Hintjens
a07244cda2 Merge pull request #1414 from hintjens/master
Problem: source file headers are somewhat confusing about LGPLv3
2015-06-02 23:40:52 +02:00
Pieter Hintjens
8620c3e032 Problem: source file headers are somewhat confusing about LGPLv3
Of course people still "can" distributed the sources under the
LGPLv3. However we provide COPYING.LESSER with additional grants.

Solution: specify these grants in the header of each source file.
2015-06-02 22:33:55 +02:00
Constantin Rack
1e10222b8f Merge pull request #1413 from malexzx/master
HPUX build and gmake check issues solution. Fixes #1412
2015-06-02 17:41:36 +02:00
ALEKSANDR MELNIKOV
1eb8e2a69f HPUX build and gmake check issues solution (#1412) 2015-06-02 20:17:15 +06:00
Constantin Rack
4676e6551f Merge pull request #1411 from jens-auer/address-sanitizer
Fixed out-of-bounds access when releasing socket handles.
2015-05-31 17:50:32 +02:00
Jens Auer
d337cf5a96 Fixed out-of-bounds access when releasing socket handles. 2015-05-31 17:42:26 +02:00
Constantin Rack
a146503d30 Merge pull request #1409 from rikvdh/master
Fix another degradation, CPU maxes out when POLLOUT is set
2015-05-27 14:50:24 +02:00
Rik van der Heijden
aa2e74c2a2 Fix another degradation, CPU maxes out when POLLOUT is set because poll exits on POLLOUT and doesn't wait for POLLIN. 2015-05-27 14:27:53 +02:00
Pieter Hintjens
d8077bb3da Merge pull request #1406 from rikvdh/master
Fix degradation from #1382, POLLOUT was tested but not requested
2015-05-24 22:58:46 +02:00
Rik van der Heijden
ae630cf3eb Fix degradation from #1382, POLLOUT was tested but not requested 2015-05-24 22:39:36 +02:00
Pieter Hintjens
099fd43836 Merge pull request #1405 from c-rack/fix-brackets
Problem: missing brackets
2015-05-23 23:20:29 +02:00
Constantin Rack
8a3296c1aa Solution: add missing brackets 2015-05-23 23:18:10 +02:00
Constantin Rack
f9315e1980 Merge pull request #1403 from dfons/master
doc/zmq_socket.txt: Remove note about ZMQ_PAIR being experimental.
2015-05-22 21:07:44 +02:00
Diego Fons
fcf7b22b92 doc/zmq_socket.txt: Remove note about ZMQ_PAIR being experimental. 2015-05-22 15:46:28 -03:00
Richard Newton
dfaa55fa7b Merge branch 'master' of https://github.com/zeromq/libzmq 2015-05-21 15:00:05 +01:00
Pieter Hintjens
f03a78bbfc Merge pull request #1401 from taotetek/master
Problem: libzmq has temp debug printf
2015-05-19 17:48:20 +02:00
Brian Knox
537626258f remove temp printf from stream_engine 2015-05-19 09:38:53 -04:00
Constantin Rack
d35473ecae Merge pull request #1398 from jacmet/pkgconfig-static-linking
libzmq: Fix pkg-config files for static linking
2015-05-13 08:34:51 +02:00
Peter Korsgaard
e89577d30c libzmq: Fix pkg-config files for static linking
Libzmq uses C++ standard library features, so users of it should link
against that as well when statically linking.

Add it to Libs.private so users using pkg-config automatically gets the
correct linker flags.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-05-13 08:01:34 +02:00
Pieter Hintjens
4c36c93a31 Merge pull request #1397 from danriegsecker/master
Some test fail to build targeting less that Windows Vista
2015-05-07 22:56:40 +02:00
Dan Riegsecker
f4f918ba73 Some test fail to build targeting less that Windows Vista
When targeting a version of Windows less than Windows Vista, the
security tests fail to build. Added a check for Windows version
and substituted inet_pton for inet_addr. Fixes libzmq issue #1396.
2015-05-07 16:52:37 -04:00
Constantin Rack
59add707cd Merge pull request #1395 from anton-sergeev/master
Add CMake option for perf-tools
2015-05-06 18:23:57 +02:00
Anton Sergeev
5f9b258295 Make CMake option for perf-tools
This allow disable making perf-tools in Release build type

Signed-off-by: Anton Sergeev <Anton.Sergeev@elecard.ru>
2015-05-06 21:25:26 +06:00
Pieter Hintjens
3699242c4e Merge pull request #1394 from BurningEnlightenment/master
REPLACE CMAKE MSVC VERSION SUFFIX VARIABLE
2015-05-05 22:05:55 +02:00
Henrik S. Gaßmann
f0a76318f4 REPLACE MSVC VERSION SUFFIX VARIABLE
Replace _zmq_COMPILER with CMAKE_VS_PLATFORM_TOOLSET; so the suffix can
be automagically generated for every MSVC compiler supported by cmake.
2015-05-05 21:39:50 +02:00
Pieter Hintjens
959ab527f4 Merge pull request #1391 from CommanderBubble/master
FD_SETSIZE Increase to 1024
2015-05-01 18:21:11 +02:00
Michael
1bfff06b8d Merge pull request #3 from CommanderBubble/FD-SETSIZE-update
FD_SETSIZE Increase to 1024
2015-05-02 01:17:56 +10:00
Michael
166a14c4a5 Update configure.ac 2015-05-02 01:13:33 +10:00
Michael
bd795d6f7a Update configure.ac 2015-05-02 01:12:22 +10:00
Michael
095741cd9c set FD_SETSIZE to 1024 on mingw
Sets FD_SETSIZE to 1024 under mingw systems, increasing it from the default of 64, and brings it into line with the previous limit for CMake builds on mingw.
2015-05-02 01:11:54 +10:00
Michael
235a1dbf7d Merge pull request #2 from zeromq/master
update to current master
2015-05-02 00:54:49 +10:00
Richard Newton
43a1192ca4 Merge pull request #1390 from hintjens/master
Problem: incomplete specs for test_proxy_terminate
2015-05-01 10:52:05 +01:00
Pieter Hintjens
74888769d6 Problem: incomplete specs for test_proxy_terminate
Solution: fixed this in Makefile.am
2015-05-01 11:31:45 +02:00
Pieter Hintjens
eead3bc661 Merge pull request #1388 from rikvdh/issue-1382
Fix for issue #1382
2015-05-01 11:18:56 +02:00
Rik van der Heijden
7b9e9b838d Issue #1382: Do not send data to backend when there are no listeners (+ tests) 2015-05-01 10:39:29 +02:00
Pieter Hintjens
e1e9fb3629 Merge pull request #1387 from c-rack/1386-libsodium-checkout
Solution: Build libsodium from latest master branch. Fixes 1386.
2015-04-28 14:02:54 +03:00
Constantin Rack
7e8ba0ecff Solution: Build libsodium from latest master branch. Fixes 1386. 2015-04-28 10:42:56 +02:00
Constantin Rack
3ec0e770b5 Merge pull request #1384 from hurtonm/master
Release memory on connection termination for pub, push sockets
2015-04-28 08:22:47 +02:00