Commit Graph

1654 Commits

Author SHA1 Message Date
Lourens Naudé
5c6f72c17c ZMQ_MONITOR socket option registers a callback / event sink for changes in socket state 2012-05-04 02:32:46 +01:00
Pieter Hintjens
16ec2868c5 Merge pull request #329 from ianbarber/master
Tweak FD sockopt text
2012-04-27 11:06:14 -07:00
Ian Barber
b7c9fc0750 Slight tweak to text for readability 2012-04-27 11:22:17 +01:00
Ian Barber
7c5d79ddd3 Merge pull request #328 from tailhook/patch-1
Added refinement for ZMQ_FD option
2012-04-27 03:04:42 -07:00
Paul Colomiets
138def0b99 Added refinement for ZMQ_FD option 2012-04-27 12:55:17 +03:00
Ian Barber
29000d3b02 Merge pull request #326 from hurtonm/pipe_code_cleanup
pipe: code cleanup
2012-04-26 04:59:11 -07:00
Ian Barber
41c82bdda1 Merge pull request #327 from hurtonm/fq_drop_unused_parameter
fq: remove unused parameter
2012-04-26 04:57:45 -07:00
Martin Hurton
2cbf7993dc fq: remove unused parameter
The recv function accepted flags parameter but this was unused.
2012-04-26 13:21:25 +02:00
Martin Hurton
1788fd396b pipe: code cleanup 2012-04-26 10:01:20 +02:00
Ian Barber
648e31994d Merge pull request #325 from hurtonm/update_comment_in_device_plus_whitespace_fixes
Mention limitation of the device implementation
2012-04-25 01:52:06 -07:00
Martin Hurton
a2c3772531 Mention limitation of the device implementation
+ fix whitespace errors
+ drop some unnecessary parens
2012-04-25 10:45:40 +02:00
Pieter Hintjens
e8b701cb92 Merge pull request #324 from hurtonm/rename_xrep_xreq_in_tests
Rename XREP/XREQ to ROUTER/DEALER in tests
2012-04-25 00:27:51 -07:00
Pieter Hintjens
9d02b3dafb Merge pull request #323 from hurtonm/xsub_fix_message_initialisation
xsub: fix memory leak
2012-04-25 00:27:19 -07:00
Martin Hurton
873abdd24c Rename XREP/XREQ to ROUTER/DEALER in tests 2012-04-25 01:05:38 +02:00
Martin Hurton
df5344bba0 xsub: fix memory leak
The implementation of the send call for XSUB socket failed
to release and initialise empty message when duplicate
subscription was detected.
2012-04-25 00:41:51 +02:00
Ian Barber
016df8e89c Merge pull request #322 from tranthamp/master
Atomic operations for armv7a
2012-04-24 11:18:50 -07:00
Patrick Trantham
135fdab0ec Implement atomic operations for armv7a
This commit implements atomic operations for the armv7a architecture
using gcc inline assembly.  This offers higher performance compared to
pthread mutexes.

Tested on an am3517 evm, clocked at 600MHz:

./inproc_thr 200 1000000
------------------------
53-60K messages / sec, pthread mutexes
73-90K messages / sec, assembly atomic ops

./inproc_lat 200 1000000
------------------------
average latency: 42.234 [us], pthread mutexes
average latency: 35.496 [us], assembly atomic ops
2012-04-24 11:55:57 -05:00
Pieter Hintjens
c120f02dc9 Merge pull request #321 from shripchenko/master
add process_commands() to the beginning of zmq_connect() and zmq_bind()
2012-04-21 16:06:06 -07:00
Sergey KHripchenko
f858321c1c add process_commands() to the beginning of zmq_connect() and zmq_bind()
I believe there was a conception that zmq_connect() and zmq_bind() will be called
only at the socket creation time and therefore don't need it.
Now it is not true anymore.
2012-04-22 01:39:48 +04:00
Pieter Hintjens
b9fb919877 Merge pull request #320 from shripchenko/master
ZMQ BUG FOUND + fixes for zmq_unbind() / zmq_disconnect() usage corner cases
2012-04-21 09:52:46 -07:00
Sergey KHripchenko
057fab09a8 fixes for zmq_unbind() / zmq_disconnect() usage corner cases
1. when we call zmq_bind()/zmq_connect() to create endpoint
we send ourselfs(through launch_child()) command to process_own(endpoint)
(and add it to own_t::owned)
in the application thread we could call zmq_unbind() / zmq_disconnect() _BEFORE_
we run process_own() in ZMQ thread and in this situation we will be unable to find it in
own_t::owned. in other words own_t::owned.find(endpoint) will not be deleted but it will be deleted from
socket_base_t::endpoints.

2. when you zmq_unbind() the lisnening TCP/IPC socket was terminated only in destructor...
so the whole ZMQ_LINGER time listening TCP/IPC socket was able to accept() new connections
but unable to handle them.

this all geting even worse since unfortunately zmq has a bug and '*_listener_t' object not terminated
untill the socket's zmq_close().
AT LEAST FOR PUSH SOCKETS.
Everything is ok for SUB sockets.

Easy to reproduce without my fix:

zmq_socket(PUSH)
zmq_bind(tcp);
// connect to  it from PULL socket
zmq_unbind(tcp);

sleep(forever)

// netstat -anp | grep 'tcp listening socket'

With my fix you could see that after zmq_unbind(tcp) all previously connected tcp sessions
will not be finished untill the zmq_close(socket) regardless of ZMQ_LINGER value.

(*_listener_t terminates all owned session_base_t(connect=false) and they call pipe_t::terminate()
which in turn should call session_base_t::terminated() but this never happens)
2012-04-21 18:56:10 +04:00
Sergey KHripchenko
4f668ad60a added zmq_unbind() / zmq_disconnect() test script.
it works but rises very serious questions.

Please add license header by your choice.
This file for 99% resemble crossroads-io/tests/shutdown.cpp
2012-04-21 18:39:19 +04:00
Sergey KHripchenko
74ae19ac1f spaces deleted 2012-04-21 18:36:20 +04:00
Pieter Hintjens
952127dfd6 Merge pull request #319 from shripchenko/master
fix for: [zeromq-dev] head builds again but two failing tests
2012-04-21 06:03:00 -07:00
Sergey KHripchenko
06b2eae87d small wording change 2012-04-21 08:12:59 +04:00
Sergey KHripchenko
2faa4c487f stupid bug. I feel ashamed ^) 2012-04-21 07:55:54 +04:00
Pieter Hintjens
653e5854ed Merge pull request #318 from shripchenko/master
2nd try wuth sock->unbind() and sock->disconnect(). now with const char*'s argument
2012-04-20 09:11:56 -07:00
Sergey KHripchenko
2eb6b32ef7 fixes for
make[2]: Entering directory `/home/laotse/src/abs/zeromq-git/src/libzmq-build/src'
  CXX    libzmq_la-address.lo
address.cpp: In destructor 'zmq::address_t::~address_t()':
address.cpp:41:29: error: deleting object of polymorphic class type 'zmq::tcp_address_t' which has non-virtual destructor might cause undefined behaviour [-Werror=delete-non-virtual-dtor]
cc1plus: all warnings being treated as errors
2012-04-20 19:16:26 +04:00
Sergey KHripchenko
489481857a 2nd try wuth sock->unbind() and sock->disconnect(). now with blackjack and const char*'s 2012-04-20 18:59:08 +04:00
Ian Barber
d56b75219f Merge pull request #316 from pieterh/master
Fixed issue #358
2012-04-19 01:35:08 -07:00
Pieter Hintjens
8837852546 Merge pull request #317 from shripchenko/master
implement zmq_unbind(),zmq_disconnect(), zmq->sock->getsockopt(ZMQ_LAST_ENDPOINT_ID)
2012-04-18 13:58:45 -07:00
Sergey KHripchenko
7b8e728e43 implement zmq_unbind(),zmq_disconnect(), zmq->sock->getsockopt(ZMQ_LAST_ENDPOINT_ID) 2012-04-18 23:42:11 +04:00
Pieter Hintjens
318d55fd10 Fixed issue LIBZMQ-358 2012-04-18 13:14:07 -05:00
Ian Barber
36e9c4ac84 Merge pull request #315 from shripchenko/master
fix bug in zmq::tcp_address_t::resolve_interface() where resolved interface ip overwrited by 0.0.0.0
2012-04-18 04:10:29 -07:00
Sergey KHripchenko
b89a53ee7a fix bug in zmq::tcp_address_t::resolve_interface() where all resolved interface ip's overwrited by 0.0.0.0 2012-04-18 14:06:39 +04:00
Pieter Hintjens
334f99fb01 Merge pull request #314 from ianbarber/master
Small patch to instantiate clock_t once
2012-04-17 03:49:43 -07:00
Ian Barber
5b3008957d port of patch by Martin Sustrik to libxs: This patch instantiate a clock_t instance for each XS
socket. Thus, it is shared between subsequent calls
to xs_recv (and xs_send). That in turn significantly
limits the number of invocations of  getimeofday (or similar)
when timeouts are used and recv/send is called in a
tight loop.
2012-04-17 10:10:22 +01:00
Pieter Hintjens
f663ad935b Merge pull request #313 from ianbarber/master
Update socket docs
2012-04-16 09:09:00 -07:00
Ian Barber
206d80b5ff Make docs reflect socket mappings better 2012-04-16 14:08:15 +01:00
Ian Barber
084c1824c4 Merge pull request #312 from shripchenko/master
some spaces cleanups + delete unused anymore zmq::max_sockets + some minor code chages
2012-04-13 03:44:07 -07:00
Sergey KHripchenko
c77dc98b5c some spaces cleanups + delete unused anymore zmq::max_sockets + some minor code chages 2012-04-13 13:26:57 +04:00
Pieter Hintjens
525be51812 Merge pull request #311 from shripchenko/master
Implement ZMQ_TCP_ACCEPT_FILTER setsockopt() for listening TCP sockets.
2012-04-12 09:34:53 -07:00
Sergey KHripchenko
acba6bdd6c Implement ZMQ_TCP_ACCEPT_FILTER setsockopt() for listening TCP sockets.
Assign arbitrary number of filters that will be applied for each new TCP transport
connection on a listening socket.
If no filters applied, then TCP transport allows connections from any ip.
If at least one filter is applied then new connection source ip should be matched.
To clear all filters call zmq_setsockopt(socket, ZMQ_TCP_ACCEPT_FILTER, NULL, 0).
Filter is a null-terminated string with ipv6 or ipv4 CIDR.

For example:
localhost
127.0.0.1
mail.ru/24
::1
::1/128
3ffe:1::
3ffe:1::/56

Returns -1 if the filter couldn't be assigned(format error or ipv6 filter with ZMQ_IPV4ONLY set)

P.S.
The only thing that worries me is that I had to re-enable 'default assign by reference constructor/operator'
for 'tcp_address_t' (and for my inherited class tcp_address_mask_t) to store it in std::vector in 'options_t'...
2012-04-12 18:37:14 +04:00
Pieter Hintjens
e276df2bdf Merge pull request #309 from hurtonm/fix_issue_335
Fix issue #335
2012-04-11 04:38:12 -07:00
Martin Hurton
cfa6f4bf51 Fix issue #335
The CreateEvent function requests EVENT_ALL_ACCESS access rights
when the event object already exists. This causes problems
when the event object is created from a service.
The solution is to call OpenEvent function when the CreateEvent
failed due to access control.
The proper solution would be to use CreateEventEx function, but
this one is not available on Windows XP.
2012-04-11 11:41:10 +02:00
Pieter Hintjens
899778dcb3 Merge pull request #308 from jdc8/master
C++ style comments result in compile errors with non-c99 C compiler
2012-04-10 06:07:08 -07:00
jdc8
177264d941 c++ style comments result in compile errors with non-c99 C compiler 2012-04-10 06:33:15 -04:00
Pieter Hintjens
f6330f3d8d Merge pull request #307 from mkoppanen/master
Handle ETIMEDOUT
2012-04-09 18:20:02 -07:00
Mikko Koppanen
70cf2d41ba ETIMEDOUT is a valid error code here. Fixes intermittent assertion failure on laggy networks 2012-04-10 09:55:10 +09:00
Pieter Hintjens
3cd0b1b647 Merge pull request #306 from shripchenko/master
Implement ZMQ_TCP_KEEPALIVE* family of options to adjust TCP keepalives
2012-04-09 10:14:35 -07:00