668 Commits

Author SHA1 Message Date
Martin Sustrik
c80e7b80cc XPUB and XSUB socket types added.
These are just placeholders. At the moment XPUB behaves th same
as PUB and XSUB as SUB.

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-12-04 23:14:38 +01:00
Martin Sustrik
17d7e6ede0 Merge branch 'maint'
* maint:
  Remove unnecessary cast in kevent_delete

Conflicts:
	src/kqueue.cpp

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-12-01 10:27:24 +01:00
Martin Lucina
289b1f5ced Remove unnecessary cast in kevent_delete
Fixes the build on NetBSD where the compiler complains about casting NULL
to (int).

Signed-off-by: Martin Lucina <mato@kotelna.sk>
2010-12-01 10:25:31 +01:00
Steven McCoy
28db150aaf Fix thread thunker scope for MSVC.
Signed-off-by: Steven McCoy <steven.mccoy@miru.hk>
2010-11-29 10:52:22 +01:00
Martin Sustrik
325dd2f091 Functions passed to pthread_create are declared as extern "C"
So far these were declared as C++ static functions which
was incorrect and caused warnings with SunStudio.

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-11-27 22:19:43 +01:00
Martin Lucina
c9584096e0 Control symbol exports using -fvisibility
On systems using GCC 4.0 or newer which support symbol visibility in shared
libraries, use -fvisibility=hidden and only export explict API functions
defined in zmq.cpp. We do not enable -fvisibility on MinGW since this uses a
separate mechanism (__declspec).

Signed-off-by: Martin Lucina <mato@kotelna.sk>
2010-11-25 17:12:31 +01:00
Martin Sustrik
734624be76 Typo fixed in a comment.
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-11-25 14:05:43 +01:00
Martin Sustrik
ac40680ea2 Problem with blob_t initialisation fixed.
HP's version of STL doesn't allow for initialisation of basic_string
(blob_t) using NULL pointer, while SGI's implementation is OK with
that. Fixed.

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-11-19 12:35:06 +01:00
Mikko Koppanen
b83d0a1bc0 Remove unnecessary conditional
This conditional is unnecessary as BUILD_PGM can be negated in the test.

Signed-off-by: Mikko Koppanen <mkoppanen@php.net>
2010-11-17 15:07:59 +01:00
Mikko Koppanen
da3327cf87 Build refactoring
Signed-off-by: Mikko Koppanen <mkoppanen@php.net>
2010-11-15 17:02:36 +01:00
Martin Sustrik
f77c8ca47f Merge branch 'maint'
* maint:
  Couple of patches for AIX build
2010-11-13 18:16:13 +01:00
Martin Sustrik
ffcb0baa73 Couple of patches for AIX build
- RAND_bytes function resides in crypto library
- pollfd on AIX used 'reqevents' instead of events and 'retnevents'
  instead of 'revents'

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-11-13 18:08:18 +01:00
Chia-liang Kao
a2500ae348 Fix a bug that zmq_poll's select backend spins when timeout=-1, due to
ptimeout not properly recalculated after first pass.

Signed-off-by: Chia-liang Kao <clkao@clkao.org>
2010-11-12 19:16:00 +01:00
Martin Sustrik
8abe67357a Merge branch 'maint'
* maint:
  Fix socket_t::recv() hang scenario where initial call to process_commands() eats signal

Conflicts:
	src/socket_base.cpp
2010-11-12 14:47:26 +01:00
Marc Rossi
f7123de943 Fix socket_t::recv() hang scenario where initial call to process_commands() eats signal
Added block boolean var to second process_commands() invocation for blocking sockets
instead of always using true.  This prevents the process_commands() call from hanging
when a message is received with an empty queue after the call to xrecv() but
prior to the initial call to process_commands() invoked when ++ticks == inbound_poll_rate.

Signed-off-by: Marc Rossi <mrossi19@gmail.com>
2010-11-12 14:38:25 +01:00
Martin Sustrik
c0217027cc Coding style cleanup in mailbox.cpp
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-11-06 08:02:14 +01:00
Martin Sustrik
9da84a5239 signaler renamed to mailbox
For historical reasons queue to transfer commands between
threads was called 'signaler'. Given that it was used to
pass commands rather than signals it was renamed to 'mailbox',
see Erlang mailboxes.

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-11-05 17:39:51 +01:00
Martin Sustrik
9cfdb441f4 slots renamed to tids
Threads were so far identified by integers called 'slots'.
This patch renames them to more comprehensible 'tid's (thread IDs).

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-11-05 16:38:52 +01:00
Martin Lucina
1b39bcd883 Automatically resize signalling socket buffer if full
If the socketpair used by signaler_t fills up, this can lead to deadlock.
This patch provides partial resolution by attempting to resize SO_SNDBUF on
the writer side, and if that fails we shall at least assert rather than
hang.

I've also refactored the signaler_t code to make the platform-dependent
parts clearer and have tested both the MSG_DONTWAIT and standard POSIX path
in recv.

The Win32 implementation currently does not implement resizing as I'm not
convinced that it's safe, but it will also assert like other platforms if
signaler_t::send() cannot succeed.

The OpenVMS implementation has been carried forward but is untested.

Signed-off-by: Martin Lucina <mato@kotelna.sk>
2010-11-04 17:54:47 +01:00
Martin Sustrik
756f7df8c8 Previous FD_STSIZE patch reverted.
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-11-04 16:11:04 +01:00
Martin Sustrik
2246689c8f FD_SETSIZE for internal polling defaults to 1024
If, when compiling 0MQ you don't set FD_SETSIZE,
it defaults to 1024 rather than to 64.

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-11-04 13:12:40 +01:00
Martin Sustrik
b90e621329 minor typo fixed
Devpoll polling mechanism used ZMQ_HAVE_SOLRIS instead of
ZMQ_HAVE_SOLARIS in one case. Fixed.

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-11-04 10:01:58 +01:00
Martin Sustrik
d4a41067d3 HP-UX has no OPEN_MAX defined
devpoll_t used this constant to determine how many events to
retrieve from the poller in one go. The implementation was
changed not to depend on this constant.

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-11-02 14:27:24 +01:00
Mikael Helbo Kjaer
0ad71f88fe select now uses Erase-Remove idiom for retired fds
Signed-off-by: Mikael Helbo Kjaer <mhk@designtech.dk>
2010-11-01 12:54:58 +01:00
Martin Sustrik
3d8eb071a2 Coding style fixed for pgm_socket
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-10-30 16:17:08 +02:00
Martin Sustrik
b358df9fff Name of "GNU Lesser Public License" corrected.
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-10-30 15:08:28 +02:00
Dhammika Pathirana
9a1d4df0fd fix typo, destroy new engine
Signed-off-by: Dhammika Pathirana <dhammika@gmail.com>
2010-10-27 09:37:32 +02:00
Dhammika Pathirana
465da7b17e drop connection requests with duplicate peer identity
Signed-off-by: Dhammika Pathirana <dhammika@gmail.com>
2010-10-26 16:02:47 +02:00
Martin Sustrik
401986e6bb Build with MSVC2005 fixed
To use __rdtsc() function MSVC2005 requires including intrin.h

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-10-26 15:35:56 +02:00
Dhammika Pathirana
71bef330fc handle decoding malformed messages
Signed-off-by: Dhammika Pathirana <dhammika@gmail.com>
2010-10-23 20:59:54 +02:00
Steven McCoy
8d6979922e Changes for MSVC OpenPGM build.
Signed-off-by: Steven McCoy <steven.mccoy@miru.hk>
2010-10-23 14:35:02 +02:00
Martin Sustrik
da59f8dd7a Merge branch 'maint'
* maint:
  SunStudio fixed.
2010-10-23 13:51:12 +02:00
Martin Sustrik
21b0c0b4f7 SunStudio fixed.
With SunStudio's implementation of STL basic_string constructor
doesn't accept NULL as a parameter even though size of string
is set to zero. Fixed.

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-10-23 13:49:13 +02:00
Martin Sustrik
e73c96ba30 Minor comment improvement.
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-10-18 09:11:36 +02:00
Martin Sustrik
a780833683 ZMQ_BACKLOG socket option added.
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-10-17 10:23:58 +02:00
Martin Sustrik
e8e2944f45 ZMQ_RECONNECT_IVL socket options added.
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-10-17 09:54:12 +02:00
Martin Sustrik
8b8837688a Couple of bugs in zmq_poll fixed.
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-10-16 17:56:25 +02:00
Martin Sustrik
72b15a6dae Implementation of zmq_strerror moved from zmq.cpp to err.cpp
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-10-16 16:05:34 +02:00
Martin Sustrik
61d38fbeed Bug in low precision clock fixed.
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-10-16 14:48:06 +02:00
Martin Sustrik
0a03e86e95 ZMQ_LINGER socket option added.
1. ZMQ_LINGER option can be set/get
    2. options are part of own_t base class rather than being declared
       separately by individual objects
    3. Linger option is propagated with "term" command so that the
       newest value of it is used rather than the stored old one.
    4. Session sets the linger timer if needed and terminates
       as soon as it expires.
    5. Corresponding documentation updated.

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-10-16 10:53:29 +02:00
Toralf Wittner
a1474e3057 Cancel tx_timer_id in pgm_sender_t::out_event().
Signed-off-by: Toralf Wittner <toralf.wittner@gmail.com>
2010-10-16 08:27:57 +02:00
Martin Sustrik
733c6780c5 Minor code clean-up to keep clang compiler happy.
"warning: extra ';' inside a struct or union [-pedantic]"

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-10-16 01:22:18 +02:00
Martin Sustrik
48b0a901b8 Obsolete compile-time option removed.
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-10-16 00:53:50 +02:00
Martin Sustrik
027eed41b8 Merge branch 'maint'
* maint:
  Fix memory leak under Windows
2010-10-15 17:46:21 +02:00
Taras Shpot
6e95205333 Fix memory leak under Windows
The comment about memory ownership in uuid_t::to_string
was misleading as on most platforms the buffer is a field
of the object;
The string allocated in UuidToString() wasn't properly freed
with RpcStringFree()

Signed-off-by: Taras Shpot <taras.shpot@eleks.com>
2010-10-15 17:45:02 +02:00
Martin Sustrik
7b9e39724e Minor fix in devpoll.hpp
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-10-15 11:31:20 +02:00
Martin Sustrik
17b0785744 Destructor of poller_base_t made virtual.
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-10-15 11:29:20 +02:00
Mikko Koppanen
3e74a439c4 Cast execute_timers() result to int
Signed-off-by: Mikko Koppanen <mkoppanen@php.net>
2010-10-15 11:21:56 +02:00
Martin Sustrik
b64b50ae21 Timers correctly canceled by PGM engines on shutdown.
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-10-15 10:58:19 +02:00
Mikko Koppanen
e33e4d7650 ICC related qualifier fix
Signed-off-by: Mikko Koppanen <mkoppanen@php.net>
2010-10-15 10:38:09 +02:00