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

3827 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Thomas Rodgers
638ddeb404 resolve #1347 Support limited metadata for STREAM sockets 2015-02-18 12:28:58 -06:00
Joe Eli McIlvain
8a526874ab Merge pull request #1356 from rodgert/master 
Fix autogen.sh warning about trailing whitespace
 2015-02-18 09:07:58 -09:00
Thomas Rodgers
39338e2fe4 Fix autogen.sh warning about trailing whitespace 2015-02-18 12:02:24 -06:00
Pieter Hintjens
fe2ce47a44 Merge pull request #1355 from evoskuil/master 
Fix error return for clock_gettime.
 2015-02-14 08:18:46 +01:00
evoskuil
bc53d710ff Fix error return for clock_gettime. 2015-02-13 23:10:39 -08:00
Pieter Hintjens
759c3e314c Merge pull request #1354 from evoskuil/master 
Problem: build break in OSX, VS2010, VS2012
 2015-02-14 07:59:24 +01:00
evoskuil
a8f11b3c3d Add clock_gettime implementation for OSX. 2015-02-13 22:50:28 -08:00
evoskuil
6630f19686 Apply VS2013 changes to VS2010 and VS2012. 2015-02-13 15:08:17 -08:00
Pieter Hintjens
55886b8b46 Merge pull request #1352 from somdoron/master 
thread safety bug - lock when sending
 2015-02-13 09:10:18 +01:00
somdoron
deaa89656f thread safety bug - lock when sending 2015-02-13 09:30:29 +02:00
Pieter Hintjens
cac4d7aa10 Merge pull request #1350 from zeromq/revert-1345-bzimmerman_CMAKE 
Revert "Bzimmerman cmake"
 2015-02-12 20:35:29 +01:00
Doron Somech
a4de3df73e Revert "Bzimmerman cmake" 2015-02-12 21:29:09 +02:00
Pieter Hintjens
5d42fe1bf7 Merge pull request #1349 from somdoron/master 
problem: client and server sockets are not thread safe
 2015-02-12 20:06:08 +01:00
somdoron
5a897f7509 allocate reaper_signal only when needed 2015-02-12 20:42:31 +02:00
somdoron
bbdd8662ba thread safety - supporting windows 2015-02-12 18:54:23 +02:00
somdoron
6749c9b3eb thread safety 2015-02-12 18:54:22 +02:00
Pieter Hintjens
88c6e696ab Merge pull request #1348 from evoskuil/master 
Problem: VS projects missing client/server.
 2015-02-11 23:02:08 +01:00
evoskuil
6bf1609a10 Update VS DLL and NuGet versioning to 4.2.0. 2015-02-11 13:23:58 -08:00
evoskuil
91eead1d20 Add client.cpp/hpp and server.cpp/hpp to VS projects. 2015-02-11 13:17:13 -08:00
evoskuil
2fd2fca531 Make implicit cast explicit. 2015-02-11 13:10:55 -08:00
evoskuil
6724f41427 Fix forcing to bool. 2015-02-11 13:09:25 -08:00
Pieter Hintjens
405a749525 Merge pull request #1345 from QbaseLLC/bzimmerman_CMAKE 
Bzimmerman cmake
 2015-02-09 22:38:28 +01:00
Bryan Zimmerman
c743bd95b4 changed test tools to compile statically 2015-02-09 13:32:29 -05:00
Bryan Zimmerman
caf4276710 removed packaged export 
added version to builds
other cleanup
 2015-02-09 10:47:05 -05:00
Bryan Zimmerman
fef20b1c83 Merge remote-tracking branch 'remotes/origin/HEAD' into bzimmerman_CMAKE 2015-02-09 08:46:00 -05:00
Constantin Rack
c9418db684 Merge pull request #1344 from febeling/cond-build-tools 
Problem: Cross compile for iOS isn't working for auxiliary tools
 2015-02-07 16:17:50 +01:00
Florian Ebeling
54b56210ad Problem: curve keygen build cannot be switched off 2015-02-07 15:36:14 +01:00
Florian Ebeling
2d59594a3a Problem: perf tools build cannot be switched off 2015-02-07 15:36:14 +01:00
Telford Berkey
49f58c0021 Merge remote-tracking branch 'remotes/upstream/master' 2015-02-06 11:27:46 -05:00
Telford Berkey
702008666c Adding Bryan's changes. 2015-02-06 11:27:11 -05:00
Bryan Zimmerman
2bb72add49 update to use new find_program syntax 2015-02-06 11:03:14 -05:00
Bryan Zimmerman
552c13616e replace check_library and check_include with find_file and find_library 2015-02-06 10:42:23 -05:00
Pieter Hintjens
e05c805688 Merge pull request #1342 from chickenkiller/master 
acinclude.m4: make kernel-specific flags cacheable
 2015-02-06 15:22:12 +01:00
Lionel Orry
9daf6dd7c4 acinclude.m4: make kernel-specific flags cacheable 
Specifically when cross-compiling, one can be willing to force these
variable values using the environment of a config.cache file. This
commit makes this possible.

The affected variables are:

* libzmq_cv_sock_cloexec
* libzmq_cv_so_keepalive
* libzmq_cv_tcp_keepcnt
* libzmq_cv_tcp_keepidle
* libzmq_cv_tcp_keepintvl
* libzmq_cv_tcp_keepalive

Signed-off-by: Lionel Orry <lionel.orry@gmail.com>
 2015-02-06 15:11:07 +01:00
Telford Berkey
ade54d72e7 Merge remote-tracking branch 'remotes/upstream/master' 2015-02-05 10:52:05 -05:00
Joe Eli McIlvain
8e89d11628 Merge pull request #1339 from evoskuil/master 
Add missing EOL at EOF.
 2015-02-04 15:42:03 -09:00
evoskuil
1a0d134666 Add missing EOL at EOF. 2015-02-04 16:27:57 -08:00
Telford Berkey
05df7072d6 Merge remote-tracking branch 'remotes/upstream/master' 2015-02-02 10:27:25 -05:00
Richard Newton
34cd718e0f Merge pull request #1337 from somdoron/JenkinsFix 
problem: jenkins build failed
 2015-02-02 14:52:45 +00:00
somdoron
ee962117ef fix jenkins build 2015-02-02 16:42:50 +02:00
Pieter Hintjens
edb3a13fd4 Merge pull request #1336 from somdoron/ClientSocket 
problem: client socket is missing
 2015-02-02 15:23:18 +01:00
somdoron
79f162aa7b test the client socket can drop multi frame messages that being sent to it 2015-02-02 16:12:21 +02:00
somdoron
14a19cd5d4 test the server socket can drop multi frame messages that being sent to it 2015-02-02 15:57:30 +02:00
somdoron
862cd41c65 implement client socket type and drop messages when more flag is set on client and server 2015-02-02 11:59:13 +02:00
Pieter Hintjens
a6362a454f Merge pull request #1334 from somdoron/ServerSocket 
Problem: sockets are not thread safe
 2015-02-02 10:23:58 +01:00
somdoron
5632b57b4a adds server socket type and routing id to msg 2015-02-02 01:17:37 +02:00
Telford Berkey
d5e7922d41 Merge remote-tracking branch 'remotes/upstream/master' 2015-01-30 08:39:44 -05:00
taotetek
9826a7b19d Merge pull request #1333 from hintjens/master 
Problem: test cases are failing on slower PCs (eee PC)
 2015-01-30 12:12:16 +01:00
Pieter Hintjens
a7a512ab3d Problem: test cases are failing on slower PCs (eee PC) 
Solution: raise timeouts from 100-150 msec to 250 msec
 2015-01-30 11:57:31 +01:00
Telford Berkey
e351cbdd8f Merge remote-tracking branch 'remotes/upstream/master' 2015-01-29 10:16:56 -05:00
Constantin Rack
9fc0d2f1a3 Merge pull request #1331 from jemc/master 
Problem: qt-android build script out of date
 2015-01-29 07:45:56 +01:00
Joe Eli McIlvain
2894634829 Problem: qt-android build script out of date 
Solution: copy changes from latest zproject
 2015-01-28 17:30:35 -08:00
Joe Eli McIlvain
153e0487de Merge pull request #1330 from rodgert/master 
Use GCC/Clang compiler intrinsics for atomic operations
 2015-01-28 14:55:13 -08:00
Thomas Rodgers
937d485e74 Add cast to make Clang happy 2015-01-28 16:38:14 -06:00
Telford Berkey
be8cdc2bf6 Merge branch 'master' of https://github.com/zeromq/libzmq 2015-01-28 12:49:38 -05:00
Thomas Rodgers
e6c45f5376 Support using compielr intrinsics for atomic operations 
Works with GCC and most likely clang
 2015-01-28 10:27:15 -06:00
Pieter Hintjens
8c8d23c761 Merge pull request #1328 from rodgert/master 
Code cleanup - removing unused local
 2015-01-27 19:41:45 +01:00
Thomas Rodgers
d8c15cf43b Code cleanup - removing unused local 2015-01-27 12:40:35 -06:00
Pieter Hintjens
0303131390 Merge pull request #1327 from rodgert/master 
Clean up of metadata_t
 2015-01-27 16:51:46 +01:00
Pieter Hintjens
bccf0bc813 Merge pull request #1326 from rodgert/master 
resolve #1325 Alignment issue with zmq_msg_t on SPARC CPU
 2015-01-27 16:39:02 +01:00
Thomas Rodgers
1c72bf4e55 Clean up of metadata_t 
* There is no clear reason why the map should hold const std::strings
* This class is never derived, there doesn't seem to be a compelling
  reason to ever do so, so no need to make virtual members
* In general const member data is an anti-pattern, the *only* reason
  is to prevent assignability, and the accepted idiom for that is to
  to declare the assigment operator private. This change does so, and
  also prevents copy construction.
 2015-01-27 09:33:47 -06:00
Thomas Rodgers
d9fb1d36ff resolve #1325 Alignment issue with zmq_msg_t on SPARC CPU 
should be backported probably
 2015-01-27 09:20:39 -06:00
Pieter Hintjens
96a27d11c9 Merge pull request #1324 from jruffin/invert-matching 
Added socket option ZMQ_INVERT_MATCHING.
 2015-01-26 18:08:28 +01:00
Julien Ruffin
cf2238f80e Added socket option ZMQ_INVERT_MATCHING. 
ZMQ_INVERT_MATCHING reverses the PUB/SUB prefix matching. The subscription
list becomes a rejection list. The PUB socket sends messages to all
connected (X)SUB sockets that do not have any matching subscription.

Whenever the option is used on a PUB/XPUB socket, any connecting SUB
sockets must also set it or they will reject everything the publisher
sends them. XSUB sockets are unaffected because they do not filter out
incoming messages.
 2015-01-26 17:59:43 +01:00
Constantin Rack
148cec0a52 Merge pull request #1323 from ricnewton/master 
Fix Windows build
 2015-01-26 10:38:46 +01:00
Richard Newton
415b49ba0d Fix Windows build 2015-01-26 09:12:07 +00:00