1774 Commits

Author SHA1 Message Date
Ian Barber
c7af07cc77 Merge pull request #336 from mauri-melato/master
Fix #366 - On Windows, preventing sockets to be inherited by child processes.
2012-05-08 06:42:12 -07:00
Ian Barber
d087548286 Merge pull request #338 from hurtonm/code_cleanup
Simplify encoder's loop
2012-05-08 06:41:22 -07:00
Martin Hurton
641943944d Simplify encoder's loop 2012-05-08 14:23:05 +02:00
Ian Barber
80e8baaff4 Merge pull request #337 from hurtonm/issue_268
Fix issue #268
2012-05-08 02:25:16 -07:00
Martin Hurton
3d93c1af5b Fix issue #268
This patch fixes a bug in the message encoder which was
responsible for computing incorrect message offset.
The bug affected PGM receiver making it unable to
decode inital messages.
2012-05-08 09:44:45 +02:00
unknown
5fe6ddfda3 On Windows, preventing sockets to be inherited by child processes. 2012-05-07 15:46:55 +02:00
Pieter Hintjens
5dc44a63d6 Merge pull request #335 from jdc8/master
Fix for issue 355 and fix for compile error with Visual C++ 2008
2012-05-06 03:07:35 -07:00
Jos Decoster
37e4a38eb5 Fix compile error with Visual C++ 2008
File decoder.cpp does not compile with Visual C++ 2008:

1>c:\tmp\libzmq\src\decoder.cpp(117) : warning C4003: not enough actual parameters for macro 'max'
1>c:\tmp\libzmq\src\decoder.cpp(117) : error C2589: '(' : illegal token on right side of '::'
1>c:\tmp\libzmq\src\decoder.cpp(117) : error C2059: syntax error : '::'
1>c:\tmp\libzmq\src\decoder.cpp(117) : error C2143: syntax error : missing ';' before '{'

This error is caused by the precense of a macro 'max' when including
'windows.h'. To solve this problem, the preprocessor macro /DNOMINMAX must
be specified.
2012-05-05 23:56:49 +02:00
Jos Decoster
68c1be8bf6 Fix for issue 355. Added missing source files dealer.cpp, device,cpp and router.cpp. Removed source files no longer present: xrep.cpp and xreq.cpp 2012-05-05 23:37:14 +02:00
Lourens Naudé
c38aecdc50 Merge branch 'master' into events 2012-05-04 02:35:22 +01:00
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
47dbd4aa96 Merge pull request #334 from ianbarber/master
Async connect error handling
2012-05-03 06:08:02 -07:00
Ian Barber
1075005b50 Patch from Mato that fixes a subtle connect bug: EAGAIN was being used as a translation value for EINPROGRESS, thus
shadowing a real EAGAIN return value from the OS.  This caused later
assertions of "Invalid argument" in stream_engine.cpp when it attempted to
use a socket which was not connected.

I also add EINTR to mean EINPROGRESS, as per the POSIX and FreeBSD
documentation which specifies that a connect() call interrupted due to a
signal will complete asynchronously.

Signed-off-by: Martin Lucina <martin@lucina.net>
2012-05-03 13:24:12 +01:00
Pieter Hintjens
f497aae8df Merge pull request #333 from hurtonm/fix_decoder_to_properly_handle_large_messages
Fix decoder to properly handle large messages
2012-04-29 22:33:31 -07:00
Pieter Hintjens
36bfaaabe6 Merge pull request #332 from hurtonm/fix_issue_264
Fix issue #264
2012-04-29 22:33:16 -07:00
Pieter Hintjens
9098f4d655 Merge pull request #331 from hurtonm/code_cleanup
socket_base: process_unplug () is not used, remove it
2012-04-29 22:32:57 -07:00
Pieter Hintjens
dd3eb08d33 Merge pull request #330 from hurtonm/pair_socket_rejects_additional_connections
Do not crash when multiple peers connect to PAIR socket
2012-04-29 22:32:39 -07:00
Martin Hurton
d84709497e Do not crash when multiple peers connect to PAIR socket
When more then one peer connected to a ZMQ_PAIR socket,
an application aborted due to assertion failure.
This patch changes the ZMQ_PAIR socket behaviour so that
it rejects any further connection requests.
2012-04-30 01:08:23 +02:00
Martin Hurton
5227f676f4 Fix decoder to properly handle large messages
The decoder did not properly decode large messages
on systems where sizeof (size_t) < sizeof (uint64_t).
2012-04-29 18:07:03 +02:00
Martin Hurton
776563fcff Fix issue #264
Before this patch, the stream engine terminated itself
whenever it had detected an IO error. If this happened
when sending a message, the engine lost all
in-flight messages, messages waiting to be decoded,
and the last decoded message that had not been accepted,
if there was one.

The new behaviour is to terminate the engine only after
the input error has been detected and the last decoded
2012-04-29 17:40:59 +02:00
Martin Hurton
394a248579 socket_base: process_unplug () is not used, remove it 2012-04-28 16:28:12 +02: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