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

2785 Commits

Author SHA1 Message Date
Simon Giesecke
a1d55d0506 Problem: race conditions for options.linger (#2910) 
* Problem: race conditions for options.linger

Solution: make options.linger atomic
 2018-02-08 22:10:45 +00:00
Simon Giesecke
de0c669323 Problem: std::atomic not used on Visual C++ although it is available (#2930) 
* Problem: std::atomic not used on Visual C++ although it is available

Solution: change conditional compilation to recognize _MSC_VER
 2018-02-08 22:01:02 +00:00
Luca Boccassi
cdfc6bb8b3
Merge pull request #2924 from sigiesec/tcp-cleanup 
Problem: duplicated code, redundant member handle_valid, asymmetry between tcp_connecter and tcp_listener
 2018-02-08 21:57:46 +00:00
Luca Boccassi
9fbd125b41
Merge pull request #2917 from ZMQers/thread-safe-simplification 
Problem: code duplication and unnecessary nesting around ZMQ_THREAD_SAFE querying
 2018-02-08 21:57:06 +00:00
sigiesec
147fe9ed77 Problem: code duplication and unnecessary nesting around ZMQ_THREAD_SAFE 
querying

Solution: remove code duplication and rearrange conditions
 2018-02-08 22:54:30 +01:00
Luca Boccassi
cb9ccfa154
Merge pull request #2921 from sigiesec/mechanism-cleanup 
Problem: code style issues in mechanism_t and socket_base_t
 2018-02-08 21:53:14 +00:00
Luca Boccassi
2e849a4d60
Merge pull request #2913 from ZMQers/add-const 
Problem: several fields are non-const without need
 2018-02-08 21:47:21 +00:00
Simon Giesecke
2c2ea82789 Problem: duplicated code, redundant member handle_valid, asymmetry between 
tcp_connecter and tcp_listener

Solution: remove duplication and redundant member, align handling of
handle in tcp_connecter and tcp_listener
 2018-02-08 22:20:01 +01:00
sigiesec
06d805ff82 Problem: unnecessary complex operations in socket_base_t::term_endpoint 
Solution: use simpler operations, construct std::string only once
 2018-02-08 22:19:54 +01:00
sigiesec
9a6993adce Problem: several code style issues in mechanism_t: code and data duplication, 
unnecessary construction of temporary std::string

Solution: removed duplication, removed construction of std::string
 2018-02-08 22:19:54 +01:00
sigiesec
368eff9ecb Problem: several fields are non-const without need 
Solution: add const where easily possible
 2018-02-08 22:17:03 +01:00
sigiesec
5b510656d0 Problem: unreachable code around socket_base_t::add/remove_signaler 
Solution: replaced by assertion
 2018-02-08 22:16:30 +01:00
sigiesec
41f459e1dc Problem: formatting inconsistent 
Solution: applied clang-format
 2018-02-02 15:47:43 +01:00
Pontus Sköldström
542fe67f25 Problem: ZMQ_DISH triggers assert when hitting the watermark(?) 
Solves issue #2907 by checking whether the msg already has a group
 2018-02-02 14:01:45 +01:00
sigiesec
206c832167 Problem: in case of exhausted resources on creation of a context, assertions are triggered 
Solution: signal error to caller, and apply appropriate cleanup
 2018-01-31 20:53:06 +01:00
Simon Giesecke
7488be61c2 Problem: add_fd might be called with fd_ == retired_fd 
Solution: add assertion
 2018-01-25 16:03:43 +01:00
Bill Torpey
ec05166545 prevent duplicate connections from PUB sockets also (see https://github.com/zeromq/libzmq/issues/788) 2017-12-29 14:36:59 -05:00
evoskuil
9622984241 Problem: vc++ 11.0 (vs 2012) compile fails on move semantics. 2017-12-14 14:58:02 -08:00
evoskuil
8d78e08f71 Problem: fn pointers are not bool (vc++ warning C4550). 2017-12-14 12:47:38 -08:00
Jasper Lievisse Adriaanse
22b57f6f28 Problem: Build is broken on OpenBSD 
Solution: re-instate block for OpenBSD erroneously removed in 9622a830
 2017-12-14 09:47:49 +01:00
Luca Boccassi
ac552ba448 Problem: accept4 not available on all platforms 
Solution: check for availability in CMake and autoconf before using it
 2017-11-18 11:33:53 +00:00
ccpaging
e8ad51e62f Clean code for Visual Studio 2008 compiler 2017-11-16 14:09:13 +08:00
Rolf Timmermans
c8592dfbc3 Problem: REQ socket with ZMQ_REQ_RELAXED does not report ZMQ_POLLOUT when queried for events after first message. 
Solution: Check for strictness before returning false if no reply has been received.
 2017-11-08 09:55:14 +01:00
Anton Bärwald
630f6d6ae7 Problem: On OSX usleep() changes the errno value 
Solution: Update errno value after calling usleep()
 2017-11-02 16:01:11 +01:00
sigiesec
f9d7eea6f9 Problem: code duplication 
Solution: unified Windows & non-Windows code further
 2017-10-26 11:05:39 +02:00
sigiesec
e7817ad38d Problem: code duplication 
Solution: reduced code duplication by introducing local variables and
new function trigger_events
 2017-10-26 10:47:05 +02:00
sigiesec
37914d1be2 Problem: get_fd_family call is expensive and called frequently for the 
same fds

Solution: cache results of get_fd_family
 2017-10-26 09:46:11 +02:00
sigiesec
cd32603c0e Problem: wsa_events are initialized/destroyed within every loop 
iteration even if not used

Solution: Move wsa_events closer to usage
 2017-10-25 18:30:03 +02:00
f18m
2aa0e6fd4d Change ZMQ_THREAD_AFFINITY to ZMQ_THREAD_AFFINITY_CPU_ADD/ZMQ_THREAD_AFFINITY_CPU_REMOVE. Avoid prefix thread names when no prefix was set. 2017-10-25 09:55:47 +02:00
Yann Diorcet
81327af557 Partial Windows XP support 2017-10-24 13:12:34 +02:00
Simon Giesecke
7ec58b279a Problem: one missed optimization opportunity for blob_t map lookup 
Solution: create referencing blob_t
 2017-10-23 11:12:15 +02:00
Simon Giesecke
a4aceb272b Problem: use of std::map::insert is inefficient 
Solution: use std::map::emplace instead, where available
 2017-10-22 17:15:00 +02:00
Simon Giesecke
0897b3e07b Problem: excessive memory allocations around blob_t (#2796) 
* Problem: excessive memory allocations around blob_t

Solution: redefine blob_t as a custom type, and use reference/move
semantics where possible
 2017-10-21 12:19:51 +01:00
sigiesec
cfb2129557 Problem: comment before sndtimeo/rcvtimeo does not specify dimension 
Solution: add "milliseconds"
 2017-10-18 15:04:54 +02:00
f18m
f25cd6e7be Background thread names (#2784) 
* Add ZMQ_THREAD_NAME_PREFIX ctx option
 2017-10-17 12:06:50 +01:00
f18m
bfbb4ff2e9 Background threads enhancements (#2778) 
* Background thread scheduling 

- add ZMQ_THREAD_AFFINITY ctx option; set all thread scheduling options
from the context of the secondary thread instead of using the main
process thread context!
- change ZMQ_THREAD_PRIORITY to support setting NICE of the background
thread when using SCHED_OTHER
 2017-10-16 12:29:03 +01:00
Luca Boccassi
b6aee51691 Problem: strict ZAP protocol adherence is backward incompatible 
Solution: add ZMQ_ZAP_ENFORCE_DOMAIN to hide backward incompatible
change and make it disabled by default.
In a future release that breaks API compatibility we can then switch
the default to enabled in order to achieve full RFC compatibility.

Fixes #2762
 2017-10-09 17:48:33 +01:00
Luca Boccassi
50bddbaac9 Problem: dead code in options.hpp 
Solution: remove unused zap_ipc_creds boolean variable
 2017-10-09 13:52:56 +01:00
Luca Boccassi
e3ee55b191 Problem: missing indentation for UDP branch 
Solution: fix it
 2017-10-09 13:52:56 +01:00
Luca Boccassi
c8f3f8a5da Problem: ambiguos bitwise ANDs in if statements 
Solution: wrap bitwise ANDs in brackets as the static analyzer suggests
 2017-10-09 13:52:56 +01:00
Luca Boccassi
7ad06f1449 Problem: IPC event_closed logs -1 as the FD 
Solution: take a copy of the file descriptor before setting it to
retired_fd.
 2017-10-06 09:53:59 +01:00
Luca Boccassi
9be8cebd21 Merge pull request #2765 from GreatFruitOmsk/issue-2764 
Problem: Race condition in IPC sockets
 2017-10-06 09:25:33 +01:00
Ilya Kulakov
656cdb959a Problem: Race condition in IPC sockets 
Solution: Don't unlink file on close

File may not belong to the socket at that point.
 2017-10-05 14:57:10 -07:00
Christopher Hall
997825bdf1 add __FreeBSD__ to ifdefs 
On FreeBSD the sysmbol __FreeBSD_kernel__ is only defines if a
specific param.h file is included, unlike Debian/kFreeBSD where this
symbol is always defined.  So also compile the FreeBSD specific code
if __FreeBSD__ is defined for FreeBSD 11 & 12 compatibility.

Signed-off-by: Christopher Hall <hsw@ms2.hinet.net>
 2017-10-03 15:30:42 +08:00
Luca Boccassi
44f96a3652 Merge pull request #2745 from sigiesec/rename-identity 
Problem: term "identity" is confusing
 2017-09-20 10:08:45 +02:00
sigiesec
2c8a7223b8 Problem: remaining use of "identity" 
Solution: replaced by "routing id"
 2017-09-19 17:55:00 +02:00
sigiesec
7e3f4b1d32 Problem: ZMTP protocol broken w.r.t. Identity property 
Solution: differentiate propertly between ZMTP property names and ZeroMQ API property names
 2017-09-19 17:55:00 +02:00
sigiesec
a5e3a65ae2 Problem: inconsistency between zmq.h and zmq_draft.h 
Solution: fix zmq_draft.h
 2017-09-19 17:55:00 +02:00
sigiesec
4b821d8f84 Problem: remaining uses of "identity" 
Solution: replaced by "routing id"
 2017-09-19 17:54:59 +02:00
sigiesec
fab57634b4 Problem: Message metadata properties still refer to "identity" 
Solution: Renamed, but support querying the property by its old name
 2017-09-19 17:53:53 +02:00
sigiesec
27c7e52a5a Problem: Usage of "rid" in server_t 
Solution: Replaced by "routing_id"
 2017-09-19 17:53:53 +02:00
sigiesec
41bae55af7 Problem: inconsistent naming related to routing ids 
Solution: renamed routing_id fields in pipe_t, renamed ZMQ_CONNECT_RID to ZMQ_CONNECT_ROUTING_ID
 2017-09-19 17:53:53 +02:00
sigiesec
9e7507b38b Problem: term "identity" is confusing 
Solution: replace by "routing id"
 2017-09-19 17:53:44 +02:00
Luca Boccassi
edb4ca1023 Problem: zmq_connect fails after disconnect due to RECONNECT_IVL == -1 
Solution: when a connection breaks and ZMQ_RECONNECT_IVL is set to -1,
which means a reconnection will not be attempted, send a message from
the I/O thread to the application thread to make the socket call
term_endpoint, which is the equivalent of manually calling
zmq_disconnect.
This way subsequent zmq_connect call to the same endpoint will attempt
again to do a connection.
Otherwise, for some socket types like SUBs, those new connects will
fail as the endpoint is recorded, despite the connection having been
permanently closed.

Add test cases to exercise this corner case with TCP and IPC.
 2017-09-19 14:05:43 +01:00
sigiesec
e546f9296e Problem: duplicated code & inconsistent behaviour between 
mechanisms

Solution: uniformly require a ZAP domain to be set to activate ZAP
handling, clarify comment on Stonehouse pattern
 2017-09-18 17:01:38 +02:00
sigiesec
a5f94cb610 Problem: tests without ZAP handler are failing 
Solution: emit events as expected by tests, and refuse connections when
ZAP is required but no handler started

Addresses #2711 partially
 2017-09-18 12:58:09 +02:00
Luca Boccassi
5de2a82be8 Merge pull request #2744 from msune/refactor_poller_wait 
Problem: duplicated socket_poller::wait() code
 2017-09-13 00:48:26 +02:00
Marc Sune
5b92989540 Problem: duplicated socket_poller::wait() code 
zmq::socket_poller_t::wait() had an important set of common lines
between POLL and SELECT variant.

Solution: refactor zmq::socket_poller_t::wait() and add the
following methods:

zmq::socket_poller_t::zero_trail_events()
zmq::socket_poller_t::check_events()
zmq::socket_poller_t::adjust_timeout()

Signed-off-by: Marc Sune <mardevel@gmail.com>
 2017-09-12 21:47:57 +02:00
Doron Somech
af03241dcb Revert "Problem: term "identity" is confusing" 2017-09-07 15:47:43 +03:00
sigiesec
deae59dca9 Problem: Message metadata properties still refer to "identity" 
Solution: Renamed, but support querying the property by its old name
 2017-09-07 10:33:25 +02:00
sigiesec
ae2ea1a655 Problem: Usage of "rid" in server_t 
Solution: Replaced by "routing_id"
 2017-09-07 10:33:25 +02:00
sigiesec
e00131dd43 Problem: inconsistent naming related to routing ids 
Solution: renamed routing_id fields in pipe_t, renamed ZMQ_CONNECT_RID to ZMQ_CONNECT_ROUTING_ID
 2017-09-07 10:33:13 +02:00
sigiesec
1daf83079a Problem: term "identity" is confusing 
Solution: replace by "routing id"
 2017-09-06 17:45:56 +02:00
Luca Boccassi
4fac78ec31 Problem: proxy stat 5th multipart message treated as 1st 
Solution: fix it
 2017-09-06 08:27:29 +01:00
Luca Boccassi
d7da31ed25 Problem: typo in comment in proxy.cpp 
Solution: fix it
 2017-09-06 08:27:17 +01:00
Luca Boccassi
b8695a47b5 Problem: proxy_steerable STATISTICS returns conflated buffers 
Solution: split each stat into its own frame, to make it simpler and
easier to use it, especially from high level bindings
 2017-09-06 01:28:28 +01:00
Luca Boccassi
78c4d33600 Problem: new STATISTICS proxy_steerable not behind DRAFT 
Solution: ifdef it until it's declared stable
 2017-09-05 17:37:52 +01:00
f18m
4be9513443 Add "STATISTICS" command to zmq_proxy_steerable() (#2737) 
* Issue #2736: Add STATISTICS command to zmq_proxy_steerable()
 2017-09-05 17:05:04 +01:00
Luca Boccassi
f4b32aa792 Merge pull request #2734 from pavel-pimenov/fix-v1001 
Variable is assigned but is not used until the end of the function
 2017-09-04 15:25:43 +01:00
pavel.pimenov
0e8bf3520c V728 An excessive check 'options.mechanism == 0' can be simplified. 
The '||' operator is surrounded by opposite expressions. session_base.cpp 377
 2017-09-04 15:25:31 +03:00
pavel.pimenov
51ac7d28c5 V1001 The 'ptr' variable is assigned but is not used until the end of the function. 2017-09-04 15:15:35 +03:00
Luca Boccassi
8feed48bb9 Problem: switch statements without breaks 
Solution: add /* FALLTHROUGH */ comments so that nagging compilers
don't nag
 2017-09-01 20:01:15 +01:00
Luca Boccassi
31089326fb Problem: unused variables warnings in get_peer_state 
Solution: wrap arguments with LIBZMQ_UNUSED
 2017-09-01 19:57:00 +01:00
Luca Boccassi
31e3977ab9 Merge pull request #2731 from sigiesec/fix-issue-2723 
Problem: assertion in src\select.cpp:111 on Windows or hang on zmq_ctx_destroy
 2017-09-01 19:51:39 +01:00
sigiesec
79e28af4ce Problem: new function zmq_socket_get_peer_state not in zmq_draft.h 
Solution: added function to zmq_draft.h
 2017-09-01 17:15:23 +02:00
sigiesec
48a1e637b6 Problem: zmq_socket_get_peer_state is not implemented 
Solution: add initial implementation
 2017-09-01 16:28:58 +02:00
sigiesec
f4d139bd16 Problem: duplicated code in socket-related functions 
Solution: extract as_socket_base_t function
 2017-09-01 16:28:58 +02:00
sigiesec
efa86fe629 Problem: no test case using the proposed zmq_socket_get_peer_state function 
Solution: added test case (with dummy implementation of zmq_socket_get_peer_state)
 2017-09-01 16:28:58 +02:00
sigiesec
23e018f37a Problem: termination is requested from a session's owner when already in 
pending termination while processing an error

Solution: terminate pipe instead

Fixes #2723
 2017-09-01 11:55:31 +02:00
sigiesec
eb8105cde1 Problem: assertion failure in select.cpp:111 under Windows 
Solution: handle case when get_fd_family fails
 2017-09-01 11:55:31 +02:00
bjovke
91e0d689bb Problem: Inconsistent size_t/int usage. Solution: types corrected. 2017-08-28 15:03:46 +02:00
Jim Klimov
40a3b0746f Problem: cosmetic setThreadName() can be fatal 
Solution: do not assert() the values returned; if we failed to set the thread name - we just have harder debugging, not flawed production conditions.
Closes github issue #2679

Signed-off-by: Jim Klimov <EvgenyKlimov@eaton.com>
 2017-08-25 15:30:03 +02:00
sigiesec
6147e45a07 Problem: missing tests for zmq_timers_* corner cases, missing handling of such corner cases, code duplication, missing assertions in test code 
Solution: add tests, add checks to timers_t, add match_by_id functor, add assertions
 2017-08-23 09:41:34 +02:00
sigiesec
f685a3ffd2 Solution: unreachable code paths in socket_poller_t 
Problem: replaced by assertions resp. removed
 2017-08-22 21:23:09 +02:00
sigiesec
a71f7b0405 Problem: zmq_poller_* uses ETIMEDOUT (instead of the usual EAGAIN) to indicate timeouts 
Solution: replace ETIMEDOUT within socket_poller_t and all client code by EAGAIN

Fixes #2713
 2017-08-22 20:00:29 +02:00
sigiesec
6a3c053a3e Problem: EFAULT is returned for bad file descriptors passed to zmq_poller_*_fd 
Solution: Return EBADF instead
 2017-08-22 19:43:56 +02:00
sigiesec
74303b08e6 Problem: calling zmq_poller_wait* with NULL events causes an assertion, as opposed to other NULL arguments, which return an error 
Solution: return EFAULT when such an operation is attempted
 2017-08-22 19:43:56 +02:00
sigiesec
c1a4cfdd9f Problem: waiting on an empty poller with infinite timeout waits forever 
Solution: return EFAULT when such an operation is attempted
 2017-08-22 19:43:56 +02:00
sigiesec
2e4fc4faf0 Problem: zmq_poller_*_fd functions do not check for invalid fd 
Solution: add checks, added test cases
 2017-08-22 19:28:07 +02:00
sigiesec
c3c2515542 Problem: code duplication within zmq::select_t::rm_fd 
Solution: extract find_fd_entry_by_handle from rm_fd
 2017-08-21 14:36:50 +02:00
sigiesec
bd0675b93f Problem: no tests for client-side events for successful handshake and authentication failure in handshake 
Solution: added tests for CURVE, add emitting of client-side event in curve_client_t; add ZAP code 300/500 tests for all mechanisms; suppress sending an error message for ZAP code 300
 2017-08-20 22:45:14 +02:00
Luca Boccassi
f6ce019fff Problem: incompatible parameter passed to send_zap_request 
Solution: cast from void* to uint8_t* to match new definition
 2017-08-19 17:40:15 +01:00
Luca Boccassi
7c85bf2f88 Problem: uninitialised variables in gssapi_server constructor 
Solution: initialise session and peer_address
 2017-08-19 17:40:15 +01:00
Luca Boccassi
2ba0149ee4 Problem: gssapi_mechanism_base_t initialisation misses one param 
Solution: pass the session as well as the options
 2017-08-19 17:40:15 +01:00
Luca Boccassi
83c9c0b55f Problem: gssapi_client does not have a peer_address param 
Solution: remove it from the gssapi_mechanism_base initialiser
 2017-08-19 17:40:15 +01:00
Luca Boccassi
24b2f61b1b Problem: gssapi_server out of date with zap_client 
Solution: remove local unused zap_client variable
 2017-08-19 17:40:15 +01:00
Luca Boccassi
c8097af884 Problem: DRAFT GSSAPI socket options in wrong section cause duplication 
Solution: move them together with the other DRAFT socket options, and
change value of DRAFT ZMQ_BINDTODEVICE from 90 to 92 to avoid clash
 2017-08-19 17:40:15 +01:00
Luca Boccassi
6f49e40e36 Problem: gssapi_mechanism_base does not include mechanism_base 
Solution: include mechanism_base.hpp instead of mechanism.hpp
 2017-08-19 17:40:15 +01:00
Luca Boccassi
e2ffa2a77b Problem: produce_ready in gssapi_mechanism_base not deduped 
Solution: call make_command_with_basic_properties
 2017-08-19 17:40:15 +01:00
Luca Boccassi
90b6c102bb Problem: various unused variables warnings 
Solution: use LIBZMQ_UNUSED where necessary
 2017-08-19 12:18:51 +01:00