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

4194 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Constantin Rack
bc2f5f76f8 Merge pull request #1424 from ricnewton/master 
Fix xpub test to set hwm before bind.
 2015-06-05 13:48:20 +02:00
Richard Newton
dc105ffc78 Fix xpub test to set hwm before bind. 2015-06-05 12:19:48 +01:00
Pieter Hintjens
d4b11b0d17 Merge pull request #1423 from ricnewton/master 
Fail ZMQ_SNDHWM and ZMQ_RCVHWM setsockopt if already connected.
 2015-06-05 12:24:17 +02:00
Richard Newton
32770d2e60 Remove accidentally committed appveyor file. 2015-06-05 10:50:02 +01:00
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
Martin Hurton
2e06737bf4 pub: Don't delay pipe termination 2015-04-28 07:48:54 +02:00
Martin Hurton
09a65c5598 push: Don't delay pipe termination 2015-04-28 07:48:04 +02:00
Richard Newton
aabbe3f33a Merge pull request #1383 from somdoron/master 
change minimum version to windows vista
 2015-04-27 13:33:55 +01:00
somdoron
c2dcc80602 change minimum version to windows vista and implement dummy condition variable for lower versions 2015-04-26 09:16:01 +03:00
Pieter Hintjens
dbacc34238 Merge pull request #1379 from evoskuil/master 
Problem: integer narrowing issues.
 2015-04-22 08:45:19 +03:00
evoskuil
30bd7c481e Fix integer narrowing issues. 2015-04-21 22:26:32 -07:00
Constantin Rack
cd830dd203 Merge pull request #1378 from CommanderBubble/master 
Allow configure to support mingw64
 2015-04-21 14:15:14 +02:00
Michael
a53404f2f9 Merge pull request #1 from CommanderBubble/CommanderBubble-configure.ac-adds_mingw64_support 
allow host_os to accept mingw64
 2015-04-21 22:03:59 +10:00
Richard Newton
88ac63189c Merge pull request #1341 from hintjens/master 
Problem: issue #1144, 1377
 2015-04-20 12:28:54 +01:00
Pieter Hintjens
594e3dcceb Problem: shutdown asserts if WSASTARUP wasn't done previously 
This is a silly assertion that causes problems if libzmq.dll is
called in some esoteric ways.

Solution: if the shutdown code detects WSANOTINITIALISED, then
exit silently.

Fixes #1377
Fixes #1144
 2015-04-20 12:53:37 +02:00
Pieter Hintjens
0673cd4e69 Problem: test_disconnect_inproc sometimes fails 
Solution: add settle pause after zmq_connect

Fixes #1340
 2015-04-20 12:53:37 +02:00
Constantin Rack
9a4c4da265 Merge pull request #1375 from natano/configure_bitrig 
Add Bitrig to OS detection in configure.ac.
 2015-04-18 08:48:50 +02:00
Martin Natano
8957ad5edf Add Bitrig to OS detection in configure.ac. 2015-04-17 22:14:53 +02:00
Richard Newton
f9fe77f421 Merge branch 'master' of https://github.com/zeromq/libzmq 2015-04-16 15:00:32 +01:00
Michael
c9bdcfc584 allow host_os to accept mingw64 
Changes the pattern for the host_os matches to *mingw* from *mingw32* to accept both mingw32 and mingw64 versions.
 2015-04-16 00:40:32 +10:00
Constantin Rack
04a9d582fd Merge pull request #1374 from kreuzberger/master 
Fix for issue #1287: ZMQ_XPUB_NODROP documentation
 2015-04-14 18:36:45 +02:00
Jörg Kreuzberger
d4a5803495 Update zmq_setsockopt.txt 
#1287
 2015-04-14 18:32:06 +02:00
Jörg Kreuzberger
18b6e6803b Add documenation for ZMQ_XPUP_NODROP 
fix for issue #1287
 2015-04-14 18:30:27 +02:00
Richard Newton
a756eee30b Merge branch 'master' of https://github.com/zeromq/libzmq 2015-04-14 10:36:54 +01:00
Constantin Rack
6b4d9bca0c Merge pull request #1370 from calid/unbind-enoent 
doc: add ENOENT to list of zmq_unbind error codes
 2015-03-15 14:14:20 +01:00
Dylan Cali
edc0640206 doc: add ENOENT to list of zmq_unbind error codes 
Resolves zeromq/libzmq#1353
 2015-03-15 08:07:13 -05:00
Constantin Rack
2d435eb692 Merge pull request #1369 from calid/ctx-term-vs-destroy 
update zmq_ctx_term description for consistency
 2015-03-15 12:53:26 +01:00
Dylan Cali
023505aced update zmq_ctx_term description for consistency 
zmq_term and zmq_ctx_destroy are just aliases for zmq_ctx_term. that
being the case use 'terminate' in the description for all three so there
isn't any confusion about behavior.

also update the deprecates list in zmq_ctx_term to include
zmq_ctx_destroy.
 2015-03-15 06:29:21 -05:00
Pieter Hintjens
4820d493b0 Merge pull request #1368 from calid/docfix-zmq-msg-init 
doc: zmq_msg_init does not set errno
 2015-03-15 09:51:40 +01:00
Dylan Cali
4c92fefe1b doc: zmq_msg_init does not set errno 
In fact it always returns zero.
 2015-03-15 02:12:02 -05:00
Constantin Rack
eb34533728 Merge pull request #1367 from evoskuil/master 
Problem: wrong default VC rt lib for release dynamic exe.
 2015-03-14 13:18:06 +01:00
evoskuil
1e27b364a4 Fix default VC rt lib for release dynamic exe. 2015-03-14 05:10:40 -07:00
Constantin Rack
6b06bc310f Merge pull request #1366 from xantares/patch-1 
fix CMP0053 warning with cmake 3.1
 2015-03-11 10:46:06 +01:00
xantares
032c5eda3d fix CMP0053 warning with cmake 3.1 2015-03-11 10:35:59 +01:00
Constantin Rack
ec4200a9d3 Merge pull request #1365 from xantares/master 
fix cmake build system
 2015-03-11 10:25:45 +01:00
xantares
0f24f675f5 set soversion without ZMQ_BUILD_FRAMEWORK 2015-03-11 09:15:40 +00:00
xantares
80044c9ed6 mutualize win32 flags 2015-03-11 09:10:23 +00:00
xantares
7dfa7b7a5d do not mix DLL_EXPORT & ZMQ_STATIC definitions 2015-03-11 09:03:21 +00:00
xantares
1d2b34dbe4 install *.txt in share/zmq 2015-03-11 08:51:59 +00:00
xantares
866e752b04 do not install sources 2015-03-11 08:50:39 +00:00
Constantin Rack
1a5ced9f47 Merge pull request #1361 from rodgert/master 
Allow zmq_msg_gets checks to assert rather than segfault
 2015-02-20 05:59:31 +01:00
Thomas Rodgers
d47980a6ed Allow zmq_msg_gets checks to assert rather than segfault 2015-02-19 20:28:10 -06:00
Pieter Hintjens
f053854e51 Merge pull request #1360 from hurtonm/master 
Adjust number of sent messages on hiccups
 2015-02-19 22:09:58 +01:00
Martin Hurton
5ed6ac60e2 Adjust number of sent messages on hiccups 
Not adjusting the sent message count may lead to situation when SUB
socket does not forward its subscriptions.
 2015-02-19 21:47:26 +01:00
Constantin Rack
b7e52755e4 Merge pull request #1359 from rodgert/master 
resolve #1347 addresses issue of no metadata on identity frame
 2015-02-19 20:33:32 +01:00
Thomas Rodgers
700f7bfede resolve #1347 addresses issue of no metadata on identity frame 2015-02-19 13:22:32 -06:00
Pieter Hintjens
1e6e5b1c0a Merge pull request #1357 from rodgert/master 
Support limited metadata for STREAM sockets
 2015-02-19 09:25:53 +01:00
Thomas Rodgers
4b948b1f3b Code cleanup 2015-02-18 21:24:57 -06:00
Thomas Rodgers
cf0804bb7c Remove unused include 2015-02-18 21:10:50 -06:00
Thomas Rodgers
8daa74dc77 Fix comment from prior commit 2015-02-18 13:05:05 -06:00
Thomas Rodgers
fefe0d42fa Update gitignore to include recently added tests for server sockets 2015-02-18 12:30:05 -06:00