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

3794 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Constantin Rack
4ad2edff38 Merge pull request #1322 from hintjens/master 
Problem: commit afb24b53 broke ZMQ_STREAM contract
 2015-01-23 18:03:10 +01:00
Pieter Hintjens
6ced7027a0 Problem: commit afb24b53 broke ZMQ_STREAM contract 
Symptom is that ZMQ_STREAM sockets in 4.1.0 and 4.1.1 generate zero
sized messages on each new connection, unlike 4.0.x which did not do
this.

Person who made this commit also changed test cases so that contract
breakage did not show. Same person was later banned for persistently
poor form in CZMQ contributions.

Solution: enable connect notifications on ZMQ_STREAM sockets using a
new ZMQ_STREAM_NOTIFY setting. By default, socket does not deliver
notifications, and behaves as in 4.0.x.

Fixes #1316
 2015-01-23 15:25:40 +01:00
Constantin Rack
0d9852a2a5 Merge pull request #1321 from hintjens/master 
Problem: copyright statements are out of date
 2015-01-22 10:49:56 +01:00
Pieter Hintjens
94d9a4ffdf Problem: copyright statements are out of date 
Solution: update for 2015

Fixes #1320
 2015-01-22 10:32:37 +01:00
Joe Eli McIlvain
fd560b489c Merge pull request #1319 from rodgert/master 
Remove more test_id2fd cruft
 2015-01-21 14:46:15 -08:00
Thomas Rodgers
73bf0fb1a3 Remoe more test_id2fd cruft 2015-01-21 16:44:41 -06:00
Constantin Rack
3d440507ea Merge pull request #1317 from topher200/master 
documentation clarification on pipe::write failure
 2015-01-20 21:20:09 +01:00
Topher Brown
708298eaf1 documentation clarification on pipe::write failure 
When pipe::write succeeds, it takes control of the message's data buffer.
When it fails, it has not taken control. The caller should clean up the
message appropriately (msg::close).
 2015-01-20 15:06:58 -05:00
Joe Eli McIlvain
be23e699c9 Merge pull request #1314 from topher200/master 
Close messages that failed to send
 2015-01-19 18:10:11 -08:00
Topher Brown
866a04656e Close messages that failed to send 
pipe_t.write only takes control of the underlying message memory when it
succeeds. When it returns failure, we must close the message ourselves to
clean up that memory.

This patch is sponsored by FarSounder, Inc (farsounder.com)
 2015-01-19 19:46:26 -05:00
Telford Berkey
03a1b0e296 Merge remote-tracking branch 'upstream/master' 2015-01-19 15:19:56 -05:00
KAPP Arnaud
94b0ad3eaa Merge pull request #1312 from rodgert/master 
fix typo in zmq_msg_gets documentation
 2015-01-18 03:48:29 +01:00
Thomas Rodgers
40d2f9ad5d fix typo in zmq_msg_gets documentation 2015-01-17 20:15:31 -06:00
Constantin Rack
53431a5583 Merge pull request #1310 from rodgert/master 
Fix typo in zmq_msg_gets documentation
 2015-01-16 22:54:17 +01:00
Thomas Rodgers
4e89ae616a Fix typo in zmq_msg_gets documentation 2015-01-16 15:45:09 -06:00
KAPP Arnaud
0e404ec844 Merge pull request #1309 from rodgert/master 
Add 'Peer-Address' property to connection metadata
 2015-01-16 22:43:04 +01:00
Thomas Rodgers
cf2bd3b6ae Expand on 'Peer-Address' property documentation 2015-01-16 15:37:22 -06:00
Thomas Rodgers
97f3126175 Formatting cleanup 2015-01-16 15:04:19 -06:00
Thomas Rodgers
b443618333 Code cleanup 
std::map::insert() has always had range based insertion, removed
explicit loops.
 2015-01-16 15:03:13 -06:00
Thomas Rodgers
7d224d7871 Add 'Peer-Address' property to connection metadata 
Allows non-C/C++ based clients easy access to the peer's IP address via
zmq_msg_gets(&msg, "Peer-Address") instead of zmq_msg_get(&msg, ZMQ_SRCFD)
followed by calls to getpeername and getnameinfo
 2015-01-16 14:52:16 -06:00
Constantin Rack
2e76bbe4f6 Merge pull request #1308 from rodgert/master 
Try to clarify the intent of zmq_msg_gets() in documentation
 2015-01-16 18:27:40 +01:00
Thomas Rodgers
39285cb969 Try to clarify the intent of zmq_msg_gets() in documentation 2015-01-16 10:50:04 -06:00
Pieter Hintjens
10466626be Merge pull request #1301 from rodgert/master 
Make alignment compiler directive
 2015-01-13 23:54:25 +01:00
Thomas Rodgers
413f835bc8 Make alignment compiler directive 2015-01-13 16:47:00 -06:00
Pieter Hintjens
b6b990f5f9 Merge pull request #1300 from moteus/master 
Fix. Use C++03 compatible way to align struct. (Build on MSVC)
 2015-01-13 17:07:19 +01:00
Alexey Melnichuk
57cb34f123 Fix. Use C++03 compatible way to align struct. (Build on MSVC) 
#1299 break compiling with MSVC 2010.
 2015-01-13 19:09:49 +04:00
Pieter Hintjens
3503fdad33 Merge pull request #1299 from rodgert/master 
Align inter-thread shared structures on cache-line granularity
 2015-01-12 20:43:29 +01:00
Thomas Rodgers
6372fc2e56 Align inter-thread shared structers on cache-line granularity 
Specifically ypipe_t specializations for msg_t and command_t.

Currently only supports platforms where posix_memalign is available.
 2015-01-12 13:37:32 -06:00
Pieter Hintjens
c816e42266 Merge pull request #1298 from rodgert/master 
Increase size of zmq_msg_t to 64 bytes
 2015-01-10 23:58:57 +01:00
Thomas Rodgers
90194036bf Increase size of zmq_msg_t to 64 bytes 
Increasing it would have at least two benefits -

* More messages would be 'VSM' messages, so it would reduce allocation
overhead a bit.
* Remove any chance of false sharing of things that are, by design,
pushed by value onto a ypipe_t<msg_t> which is shared between two threads.

The only downside I see is slightly increased memory consumption on memory
constrained applications.

- Full discussion of this rationale is part of issue #1295
 2015-01-10 16:44:55 -06:00
Constantin Rack
95e7611471 Merge pull request #1297 from rodgert/master 
Remove ZMQ_IDENTITY_FD socket option
 2015-01-10 00:44:45 +01:00
Thomas Rodgers
a55005feb1 Remove documentation for ZMQ_IDENTITY_FD 2015-01-09 17:32:05 -06:00
Thomas Rodgers
7c0a644625 Remove of ZMQ_IDENTITY_FD socket option 
Revert "linking fd to pipe identity via socket option"

This reverts commit fe3e8c5c70dc3fbcb0244c5f4c52dcd71b80f858.

Conflicts:
	include/zmq.h
	src/pipe.hpp
	src/session_base.cpp
 2015-01-09 17:28:50 -06:00