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,815 Commits 4 Branches 39 Tags 31 MiB
Commit Graph

3815 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pieter Hintjens
25de6a03ac Merge pull request #1159 from kreuzberger/master 
Bugfix wrong CMakeLists.txt after rename of file
 2014-08-13 06:12:29 +02:00
kreuzberger
212220dda7 Bugfix wrong CMakeLists.txt after rename of file 2014-08-12 21:34:30 +02:00
Martin Hurton
ea719a8dff Merge pull request #1151 from hintjens/master 
Documentation patches
 2014-08-12 14:04:34 +02:00
Pieter Hintjens
f20b70bef5 Cleaned up test_xpub_nodrop 
Renamed test case to actually explain what it's testing, and cleaned up
the code a little.
 2014-08-12 12:37:49 +02:00
Pieter Hintjens
a7fed989a6 Minor changes to Travis CI script 2014-08-12 12:37:49 +02:00
Pieter Hintjens
785aebc6a8 Reworking Travis script 2014-08-12 12:37:49 +02:00
Pieter Hintjens
75d4f50be3 Problem: ZMQ_CURVE_SECRETKEY reads beyond end of Z85 data 
Solution: change setsockopts on printable keys to expect 41, nor 40
bytes. Code still accepts 40 bytes for compatibility, and copies the
key to a well-terminated string before using it.

Fixes #1148
 2014-08-12 12:37:49 +02:00
Pieter Hintjens
0dcf6b5e2b Added AppDynamics as corporate author 2014-08-12 12:37:49 +02:00
Pieter Hintjens
2c5baff95f Note that ZMQ_TCP_ACCEPT_FILTER is deprecated 2014-08-12 12:37:49 +02:00
Pieter Hintjens
acc4fe8794 Merge pull request #1158 from hurtonm/master 
Code cleanup
 2014-08-12 12:32:24 +02:00
Martin Hurton
214553972d Return -1 when failed to publish message 2014-08-12 10:51:37 +02:00
Martin Hurton
228426ac44 Code cleanup 2014-08-12 09:31:19 +02:00
Pieter Hintjens
bb6d18d5a2 Merge pull request #1156 from kreuzberger/master 
Provide socket option for pub sockets to not silently drop message
 2014-08-09 00:52:21 +02:00
kreuzberger
f042ea9e26 better naming of flags and variables to real functionality: nodrop 2014-08-08 19:45:41 +02:00
kreuzberger
d9a3cc48d4 do not silently drop messages in publisher if hwm is reached 2014-08-08 19:36:00 +02:00
Pieter Hintjens
446e8efb07 Merge pull request #1155 from mrvn/pull-document_hwm_behaviour_with_ZMQ_ROUTER_MANDATORY 
Document altered HWM behaviour when ZMQ_ROUTER_MANDATORY is set.
 2014-08-07 13:29:14 +02:00
Goswin von Brederlow
da6cf63857 Document altered HWM behaviour when ZMQ_ROUTER_MANDATORY is set. 2014-08-07 13:16:12 +02:00
Pieter Hintjens
bbbe8d7832 Merge pull request #1154 from mrvn/pull-test_router_mandatory_hwm 
Add test for HWM behaviour for mandatory ROUTER sockets over tcp
 2014-08-07 13:09:54 +02:00
Goswin von Brederlow
893995e698 Add test for HWM behaviour for mandatory ROUTER sockets over tcp 2014-08-07 12:52:07 +02:00
Pieter Hintjens
0f780ef733 Merge pull request #1152 from drodri/task/cmake_structure 
moved root CMakeLists.txt tests config to tests/CMakeLists.txt
 2014-08-05 13:37:37 +02:00
Diego
6537e202d6 moved root CMakeLists.txt tests config to tests/CMakeLists.txt 2014-08-05 13:24:32 +02:00
Pieter Hintjens
0c4ee0a9b0 Merge pull request #1147 from rodgert/master 
Update zmq_msg_get(ZMQ_SHARED) to return true for type_cmsg messages
 2014-07-29 21:12:24 +02:00
Thomas Rodgers
03f097a541 Update zmq_msg_get(ZMQ_SHARED) to return true for type_cmsg messages 2014-07-29 13:43:38 -05:00
Pieter Hintjens
416ee8e75c Merge pull request #1146 from minrk/utf8-metadata 
define encoding for message metadata to be UTF8
 2014-07-29 01:02:43 +02:00
Pieter Hintjens
10a2e6c24d Merge pull request #1145 from pijyoi/master 
use enum retired_fd instead of -1
 2014-07-28 22:29:09 +02:00
MinRK
4406329100 define encoding for message metadata to be UTF8 
clarifies that these are text fields,
and removes ambiguity about how to create proper
text object from stored bytes.
 2014-07-28 13:23:56 -07:00
KIU Shueng Chuan
6bcced7537 use enum retired_fd instead of -1 2014-07-29 04:16:44 +08:00
Trevor Bernard
ac99d50abb Merge pull request #1142 from hintjens/master 
Problem: does not install man pages correctly when out of tree
 2014-07-25 16:49:34 -03:00
Pieter Hintjens
cdbe557727 Problem: does not install man pages correctly when out of tree 
Solution: fix Makefile.am

As per Richard Sharpe on zeromq-dev.
 2014-07-25 21:39:51 +02:00
Pieter Hintjens
817912d795 Merge pull request #1139 from ewen-naos-nz/zos 
z/OS: Updated to build libzmq git master
 2014-07-25 00:40:15 +02:00
Ewen McNeill
326dec067f z/OS: Updated portability notes 
Updated:
    builds/zos/README.md: Updated with portability notes resulting
       from building zeromq/libzmq/master as of 2014-07-23 on z/OS
       UNIX System Services.

       Current z/OS UNIX status: all expected tests pass, except
       "test_proxy", which hangs and times out.
 2014-07-24 14:48:49 +12:00
Ewen McNeill
f1cd2055de z/OS: chmod +x builds/zos/{cxxall,runtests} 2014-07-24 14:13:59 +12:00
Ewen McNeill
256c32d1fb z/OS: builds/zos/platform.hpp for libzmq 4.1.0 2014-07-24 14:06:00 +12:00
Ewen McNeill
501666d07e z/OS: Skip pthread_{get,set}schedparam 
Updated:
    src/thread.cpp: On older z/OS UNIX System Services,
        pthread_{get,set}schedparam is not present (searching the
        Internet suggests it may be present in later version than
        the one being used for z/OS UNIX System Services porting).

        Make zmq::thread_t::setSchedulingParameters() a no-op on
        z/OS UNIX System Services.

    NOTE: pthread_{get,set}schedparam appear to have been introduced
    by POSIX.1-2001 or IEEE 1003.1-2004 so may not be universally
    available, and thus more platforms may need this "no-op" treatment.
 2014-07-24 13:54:21 +12:00
Ewen McNeill
b27bafff60 z/OS: Autodetect tests to run 
Updated:
    builds/zos/runtests: Extract tests to run from tests/Makefile.am
      at runtime, rather than hard coding tests list (to simplfy
      later maintenance).  test_*_tipc is excluded as BUILD_TIPC is
      not defined on z/OS UNIX System Services.  XFAIL_TESTS are also
      excluded, following current logic in tests/Makefile.am
 2014-07-24 13:50:38 +12:00
Ewen McNeill
9d4f719e94 z/OS: Update build defines: 
Updated:
    builds/zos/cxxall: Defines ZMQ_HAVE_ZOS for platform portability;
        define ZMQ_USE_POLL _instead_ of ZMQ_FORCE_POLL, due to change
        in src/poller.hpp since ZeroMQ 4.0.x branch
 2014-07-24 13:48:19 +12:00
Ewen McNeill
829b1bb4d4 Include testutil.hpp if using SETTLE_TIME 
Updated:
   tests/test_connect_delay_tipc.cpp
   tests/test_sub_forward_tipc.cpp
   tests/test_term_endpoint_tipc.cpp
 2014-07-24 13:00:21 +12:00
Ewen McNeill
217e0ae9c6 Remove "const" from std::map key 
Updated:
    src/metdata.hpp: Remove explicit "const" from key of std::map<>
       because the key is implicitly const already (see
       http://en.cppreference.com/w/cpp/container/map and
       http://www.cplusplus.com/reference/map/map/).

On some platforms (such as z/OS UNIX System Services) explicitly
declaring the map key as "const" causes template expansion errors
as it tries to create separate allocators for "const const std::string"
and "const std::string" only to find that they clash.  (Presumably
some compilers collapse these into one earlier.)

There are no template expansion errors if the map key is left to be
implicitly const.
 2014-07-24 12:26:13 +12:00
Ewen McNeill
6b21b1ecfa z/OS: Avoid removing libzmq.pc.in in makeclean 2014-07-24 11:13:24 +12:00
Ewen McNeill
5cab63e1a1 z/OS: Transferrring from GitHub to z/OS UNIX 
Updated:
   builds/zos/README.md: Outlined process to transfer source from
     GitHub to z/OS UNIX System Services, including character set
     conversion for the source
 2014-07-24 10:42:30 +12:00
Ewen McNeill
f8ec9b5fad z/OS: Make builds/zos scripts executable 2014-07-24 09:28:06 +12:00
Pieter Hintjens
57a70d5e3b Merge pull request #1138 from ewen-naos-nz/zos 
z/OS UNIX System Services port: EAGAIN, SIGPIPE
 2014-07-23 07:06:53 +02:00
Ewen McNeill
0af693c496 z/OS: Loop on EAGAIN on close() in ~signaler 
Updated:
    src/signaler.cpp: Add close_wait_ms() static function to loop
       when receiving EAGAIN in response to close(), with ms long
       sleeps, up to a maximum limit (default 2000ms == 2 seconds);
       used in signaler_t::~signaler_t() destructor.
 2014-07-23 14:01:43 +12:00
Ewen McNeill
fc80e8cda1 z/OS: signal(SIGPIPE, SIG_IGN) for tests 
Updated:
   tests/testutil.hpp: Add signal(SIGPIPE, SIG_IGN) to
        setup_test_environment(), on z/OS (__MVS__)
 2014-07-23 13:39:45 +12:00
Ewen McNeill
19808ff878 z/OS: Documented SIGPIPE considerations 
Updated:
    README.md: Documented need for application to handle/ignore SIGPIPE
 2014-07-23 13:09:28 +12:00
Pieter Hintjens
070fcd472e Merge pull request #1137 from evoskuil/master 
VS updates for socks, rem libsodium VS crypt32 dependency.
 2014-07-22 21:43:55 +02:00
evoskuil
f96ebba7c2 Add socks files to VS2010 builds, update VS2012/2010 filters. 2014-07-22 12:02:23 -07:00
evoskuil
126b9d3a2a Remove libsodium VS import props crypt32.lib dependency. 2014-07-22 12:01:15 -07:00
evoskuil
0efd8d9bf3 Update VS filters for socks additions. 2014-07-22 11:21:57 -07:00
Pieter Hintjens
b0103de608 Merge pull request #1136 from ewen-naos-nz/zos 
z/OS UNIX System Services port
 2014-07-22 07:59:45 +02:00
Ewen McNeill
f72f4b2526 Extend z/OS UNIX port to allow building DLL 
Updated:
   README.md:  describes process of building/using DLL
   makelibzmq: Build DLL as well as static library (unless BUILD_DLL=false)
   maketests:  Dynamically link to ../src/libzmq.so if present
   runtests:   Explicitly place ../src at start of LIBPATH
   makeclean:  Also remove files created for DLL
   cxxall:     Bumped updated date to reflect last edit
 2014-07-22 16:44:56 +12:00
Ewen McNeill
6e0c1c0a80 builds/zos/* portability files to z/OS UNIX 
builds/zos includes:
    README.md: Overview of z/OS UNIX System Services port (Markdown)
    makelibzmq: Compile src/*.cpp and make libzmq.a
    maketests:  Compile tests/*.cpp and make test_* executables
    runtests:   Run tests/test_* executables and report results
    makeclean:  Remove built files
    zc++: /bin/c++ wrapper supplying required build arguments
    cxxall: run zc++ for all *.cpp files in directory

    platform.hpp: pre-generated (and edited) src/platform.hpp for z/OS
    test_fork.cpp: updated tests/test_fork.cpp that completes on z/OS
 2014-07-22 12:05:51 +12:00
Pieter Hintjens
81b9f21bdd Merge pull request #1132 from rodgert/master 
Added test and doc section for ZMQ_SHARED message flag
 2014-07-13 02:03:51 +02:00
Thomas Rodgers
82282d6973 Added test and doc section for ZMQ_SHARED message flag 2014-07-12 18:05:49 -05:00
Pieter Hintjens
d4d65da20d Merge pull request #1131 from rodgert/master 
Added ZMQ_SHARED message option to zmq_msg_get()
 2014-07-12 16:06:26 +02:00
Thomas Rodgers
3497244c41 Added ZMQ_SHARED message option to zmq_msg_get() 2014-07-12 09:01:27 -05:00
Pieter Hintjens
5dc4066de4 Merge pull request #1130 from trevorbernard/master 
Add Docker support
 2014-07-12 08:58:51 +02:00
Trevor Bernard
a62e6f473d Add Docker support 2014-07-11 22:42:55 -03:00
Pieter Hintjens
d846fbf107 Merge pull request #1127 from twhittock/utils-eol 
Ensure EOL is present at end of utils file.
 2014-07-10 00:36:35 +02:00
Tom Whittock
6099acd2be Ensure EOL is present at end of utils file. 
MacOS/Clang complain due to presence of -Wnewline-eof in CZMQ.
 2014-07-09 22:45:03 +01:00
Richard Newton
428cf0255c Merge pull request #1125 from hurtonm/master 
Code cleanup
 2014-07-09 13:21:56 +01:00
Martin Hurton
816299f11c Code cleanup 2014-07-09 14:07:32 +02:00
Martin Hurton
bf74c0cfb1 Merge pull request #1124 from ricnewton/master 
Add test for unbinding inproc socket.
 2014-07-09 13:20:01 +02:00
Richard Newton
31cff7ccf9 Add test for unbinding inproc socket. 2014-07-09 10:28:26 +01:00
Richard Newton
3c614074a2 Merge branch 'master' of https://github.com/zeromq/libzmq 2014-07-09 10:03:17 +01:00
Richard Newton
e71ebbb771 Merge pull request #1123 from hurtonm/master 
Resolve issue #949
 2014-07-09 10:01:48 +01:00
Martin Hurton
54e0fde1cc Resolve issue #949 2014-07-09 10:02:53 +02:00
Pieter Hintjens
36d529cba9 Merge pull request #1122 from twhittock/win-errhandle 
Windows: if WSA error number is held, use directly.
 2014-07-07 18:03:53 +02:00
Tom Whittock
993cb32e96 Windows: if WSA error number is held, use directly. 
It must be done this way, as WSAGetLastError returns 0 in these circumstances
 2014-07-07 16:33:53 +01:00
Pieter Hintjens
660bf4311b Merge pull request #1121 from twhittock/master 
vs2012: Add missing socks files
 2014-07-07 15:52:09 +02:00
Tom Whittock
cb2582b09e vs2012: Add missing socks files 2014-07-07 14:47:39 +01:00
Pieter Hintjens
1353d28708 Merge pull request #1120 from hurtonm/master 
Don't delay reception of signal
 2014-07-06 23:00:08 +02:00
Martin Hurton
ccfbaea397 Don't delay reception of signal 
- new code may help undersdtand issue #1108
  (https://github.com/zeromq/libzmq/issues/1108)
- code cleanups
 2014-07-06 22:27:45 +02:00
Pieter Hintjens
3696d0d74f Merge pull request #1119 from mosconi/master 
Fix to build on OpenBSD
 2014-07-03 10:28:40 +02:00
Rodrigo Mosconi
4ae4896978 duplicated type definitions when using CMAKE 2014-07-02 23:24:35 -03:00
Rodrigo Mosconi
3a16b0b108 Merge remote-tracking branch 'upstream/master' 2014-07-02 21:22:51 -03:00
Rodrigo Mosconi
51b3fad8ab Fix to build on OpenBSD 2014-07-02 21:06:33 -03:00
Pieter Hintjens
e6b7c7acd6 Merge pull request #1118 from guidefloripa/master 
Add static compilation on CMake
 2014-07-02 21:59:32 +02:00
Guilherme Steinmann
9c42d28a20 Add static compilation on CMake 2014-07-02 16:51:34 -03:00
Pieter Hintjens
13ed711448 Merge pull request #1117 from jlauenercern/master 
Thread scheduling parameters: Use ZMQ context options instead of environment variables.
 2014-07-02 17:49:40 +02:00
Joel Lauener
219310b4f0 Thread scheduling parameters: Use ZMQ context options instead of 
environment variables.
 2014-07-02 14:41:21 +02:00
Richard Newton
00fe56c4bf Merge pull request #1115 from hurtonm/master 
Code cleanup
 2014-07-01 09:22:28 +01:00
Richard Newton
bbf597196e Merge pull request #1112 from hintjens/master 
Problem: two header files for a single library
 2014-07-01 09:21:33 +01:00
Martin Hurton
079ff8b759 Code cleanup 2014-07-01 09:17:19 +02:00
Pieter Hintjens
fa3ae97480 Merge pull request #1114 from PalmStoneGames/master 
Add missing socks files
 2014-06-29 17:35:50 +02:00
Diego Duclos
a9cb9022fd Add missing socks files 2014-06-29 15:14:54 +02:00
Pieter Hintjens
1b9f67cac6 Merge pull request #1113 from fichtner/socks_include 
socks: fix build on FreeBSD
 2014-06-27 20:35:59 +02:00
Franco Fichtner
f1207e6af1 socks: fix build on FreeBSD 
The fix should be sane on all UNIX-like systems, so there's
no ZMQ_HAVE_FREEBSD involved.  It's likely that other BSDs
stumble across this problem too.
 2014-06-27 20:15:08 +02:00
Pieter Hintjens
39f2e8f273 Problem: missing stdlib.h include in curve_keygen.cpp 
Solution: fixed this. Also minor code cleanups.
 2014-06-27 16:41:27 +02:00
Pieter Hintjens
a087ce55ea Problem: two header files for a single library 
Users who need e.g. zmq_curve_keypair() have to remember to include
zmq_utils.h, which is counter-intuitive. The whole library should be
represented by a single include file.

Solution: merge all contents of zmq_utils.h into zmq.h, and deprecate
zmq_utils.h. Existing apps can continue unchanged. New apps can ignore
zmq_utils.h completely.
 2014-06-27 15:58:18 +02:00
Richard Newton
7e8dd46631 Merge pull request #1111 from hintjens/master 
Problem: zmq_msg_gets did not set errno on unknown properties
 2014-06-25 16:38:43 +01:00
Pieter Hintjens
dd05a64462 Problem: zmq_msg_gets did not set errno on unknown properties 
Solution: set errno to EINVAL when a property does not exist.

Also fixed test_metadata.cpp to test this case.
 2014-06-25 17:28:36 +02:00
Richard Newton
3b505f1f6a Merge pull request #1110 from hintjens/master 
Reverted removal of [ ] support
 2014-06-25 15:10:07 +01:00
Pieter Hintjens
6e91330a0c Added clarifying comment 2014-06-25 14:37:54 +02:00
Pieter Hintjens
58c067ff0e Revert "Problem: tcp_address.cpp allowed [ and ] around address" 
This reverts commit 78a7b469a1993b681031f513d0c750c3a8454bb8.
 2014-06-25 14:36:55 +02:00
Richard Newton
47c796276f Merge pull request #1109 from hintjens/master 
Set EINVAL on invalid tcp:// endpoint in zmq_connect
 2014-06-25 12:41:37 +01:00
Pieter Hintjens
ce8fbb26cb Problem: zmq_connect doesn't return EINVAL on invalid endpoint 
Solution: set errno to EINVAL when tcp:// endpoint is invalid (was just
leaving errno to previous value).
 2014-06-25 12:48:26 +02:00
Pieter Hintjens
2524e26893 Code cleanups 2014-06-25 12:47:39 +02:00
Pieter Hintjens
859b43f1eb Merge pull request #1107 from jlauenercern/master 
Allow change of pthread priority
 2014-06-25 11:29:07 +02:00
Joel Lauener
112ef6f172 Allow change of pthread priority 
Rationale: In a real-time environment it is sometime mandatory to tune
threads priority and scheduling policy. This is required by our users
who mixes real-time and server threads within
the same process. It's not planned to support this on non-pthread
platforms (e.g. Windows).
 2014-06-25 09:51:10 +02:00