Commit Graph

910 Commits

Author SHA1 Message Date
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
Mikko Koppanen
b95f11aa0a Don't set pedantic to yes if using ICC
Signed-off-by: Mikko Koppanen <mkoppanen@php.net>
2010-10-16 01:05:15 +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
ae5a3c8a99 Merge branch 'maint'
* maint:
  Version number increased.

Conflicts:
	include/zmq.h

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-10-16 00:49:01 +02:00
Martin Sustrik
710615cdab Version number increased.
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-10-16 00:47:31 +02:00
Martin Sustrik
18d46c8104 Merge branch 'maint' 2010-10-15 19:38:52 +02:00
Martin Sustrik
53d1677c8b Update NEWS for 2.0.10 release
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-10-15 19:37:41 +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 Lucina
2e9871ce34 Merge branch 'maint'
Conflicts:
	configure.in

Signed-off-by: Martin Lucina <mato@kotelna.sk>
2010-10-15 17:30:03 +02:00
Martin Lucina
5b44025602 maint: Upgrade OpenPGM to 2.1.28~dfsg
Upgrade OpenPGM to version 2.1.28 for ZeroMQ 2.0.x. Now we also use the
DFSG-compliant upstream release tarball.

Signed-off-by: Martin Lucina <mato@kotelna.sk>
2010-10-15 17:27:10 +02:00
Martin Sustrik
eeb8e7c8be Merge branch 'maint'
* maint:
  Makefile.am: Add missing files to distribution, improve maintainer-clean
  configure.in: Extract API version from zmq.h
  Added bin directory to ignore list.

Conflicts:
	configure.in
	include/zmq.h
2010-10-15 17:13:36 +02:00
Martin Lucina
3cf01bf56e Makefile.am: Add missing files to distribution, improve maintainer-clean
Add missing files needed for regenerating configure to the distribution;
add MAINTAINERS; improve maintainer-clean to produce a really clean tree.

Signed-off-by: Martin Lucina <mato@kotelna.sk>
2010-10-15 16:53:45 +02:00
Martin Lucina
3b3df731e6 configure.in: Extract API version from zmq.h
* Added a version.sh and relevant changes to configure.in to extract the API
  version from zmq.h at the time autogen.sh is run.
* Moved the version macros to be next to zmq_version in zmq.h and improved
  the comments.
* Modified ZMQ_MAKE_VERSION to use (x) instead of plain x when expanding
  macro parameters.

Signed-off-by: Martin Lucina <mato@kotelna.sk>
2010-10-15 16:53:15 +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
e288f7a347 Fixes build on Linux using Sun Studio compiler
Signed-off-by: Mikko Koppanen <mkoppanen@php.net>
2010-10-15 10:43:22 +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
Martin Pales
03a18c27ac zmq::clock_t : return correct value in rdtsc() on solaris
Function clock_t::rdtsc() now returns correct value when compiled
with sunstudio 12 compiler.

Signed-off-by: Martin Pales <m.pales@gmail.com>
2010-10-14 16:31:58 +02:00
Gonzalo Diethelm
26d7669464 Added bin directory to ignore list. 2010-10-14 08:02:43 -03:00
Martin Sustrik
b7386f5b50 To insert to associateive STL containers value_type used instead of make_pair
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-10-14 12:13:52 +02:00
Martin Pales
f9e6d94be5 zmq::poller_base_t : workaround for sunstudio compiler in add_timer()
A minor workaround to resolve compilation error with sunstudio compiler,
which does not yet support member templates for std::multimap.

Signed-off-by: Martin Pales <m.pales@gmail.com>
2010-10-14 12:02:05 +02:00
Martin Sustrik
cafcdbbe2b Safety measure in zmq_msg_close implemented
zmq_msg_close now empties the message on zmq_msg_close, thus not
leaving random data in the structure, that may be mistaken for
a valid message.

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-10-14 09:34:09 +02:00
Martin Sustrik
b174ad2c45 zmq_poll man page fixed to reflect the precise timeout semantics.
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-10-14 09:16:49 +02:00
Martin Pales
da73b7c6f6 zmq::devpoll_t : correct a typo in loop()
A minor typo correction to resolve compilation error on Solaris.

Signed-off-by: Martin Pales <m.pales@gmail.com>
2010-10-14 08:38:11 +02:00
Martin Sustrik
e2167cecae Precise timouts in zmq_poll implemented
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-10-13 21:39:20 +02:00
Martin Sustrik
9d96e0037a Clean-up of the code related to attaching/detaching engines to sessions.
Session base class now handles the engine events exclusively. It notifies
derived session types using dedicated "attached" and "detached" events.

Couple of bugs was fixed along the way.

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-10-13 10:09:46 +02:00
Martin Sustrik
5ae878b891 Merge branch 'maint'
* maint:
  Add support for RHEL6 in the spec file
2010-10-13 08:01:13 +02:00
Sebastian Otaegui
2568947a71 Add support for RHEL6 in the spec file
Signed-off-by: Sebastian Otaegui <feniix@gmail.com>
2010-10-13 07:59:50 +02:00
Martin Sustrik
954d7f743d Avoid duplicate creation of pipes for a single session
When a session is being closed down its inbound and outbound
pipe pointers are set to null. If (re) connection happens at
that time, session may try to reinistantiate the pipes which
is wrong. This patch allows session to attach pipes only once
in its lifetime.

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-10-12 17:55:09 +02:00
Steven McCoy
c6d74e0a03 Drop PGM parameters to 100mb friendly range.
Signed-off-by: Steven McCoy <steven.mccoy@miru.hk>
2010-10-12 12:26:21 +02:00
Steven McCoy
5b8af52efc Fix assertion in PGM transports on cancel_timer
Signed-off-by: Steven McCoy <steven.mccoy@miru.hk>
2010-10-11 17:59:58 +02:00
Martin Sustrik
e168173162 Merge branch 'maint'
* maint:
  configure.in: Do not patch libtool rpath handling
  Fixing the Red Hat packaging
2010-10-11 16:42:10 +02:00
Martin Lucina
57428db898 configure.in: Do not patch libtool rpath handling
For historic reasons (mainly compatbility with really old libtool), configure was
patching libtool to not use rpath in binaries. This breaks (among other things)
correct operation of "make check" since the test binaries may not be run with
the correct shared library version.

Current best practice as seen e.g. at http://wiki.debian.org/RpathIssue suggests
that this is no longer an issue, so I'm removing the code that patches libtool.

Signed-off-by: Martin Lucina <mato@kotelna.sk>
2010-10-11 16:39:48 +02:00
Martin Sustrik
6cd0867f02 Fixing the Red Hat packaging
When adding ZMQ_VERSION macros, I incorrectly removed
the PACKAGE_VERSION macro. Adding it back.

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-10-11 16:32:27 +02:00
Martin Sustrik
f22e85f19f Reverting commit 1d431190f5
The patch was supposed to check that pipe writer sends messages
in atomic fashion. However, it prevented the user to read
half of a message and close the socket.

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-10-11 12:23:18 +02:00
Martin Sustrik
73e7ef37c2 When XREP silently drops message, it does not empty it -- fixed
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-10-10 09:23:37 +02:00
Christian Gudrian
f5030a93a5 Execute the timers before pollset initialisation.
Since executing the timers might modify the source pollsets we have
to defer the initialisation until after the timers have executed.

Signed-off-by: Christian Gudrian <christian.gudrian@fluidon.com>
2010-10-09 19:19:50 +02:00
Martin Sustrik
318cdd1f24 Merge branch 'maint'
* maint:
  Version macros added

Conflicts:
	builds/msvc/platform.hpp

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-10-09 08:03:58 +02:00
Martin Sustrik
ef8db789a1 Version macros added
Macro ZMQ_VERSION represents the current version of 0MQ
Macro ZMQ_MAKE_VERSION(major,minor,patch) allows to create
a representation of the specified version.
The versions can be compared using simple <, >, ==, etc.
operators.

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-10-09 07:53:24 +02:00
Martin Lucina
214b56077a Fix missing platform.hpp in zmq_connecter.cpp
Missed testing on Win32

Signed-off-by: Martin Lucina <mato@kotelna.sk>
2010-10-08 22:06:41 +02:00
Martin Sustrik
daf5d3273b More cleanup of session termination process.
Fix in termination of session attached to a REP socket.
Several fixes of session termination in case of disconnection.

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-10-08 21:42:55 +02:00
Martin Lucina
f90c8d957e Scalability improvements for large amounts of connections
Add signaler_sndbuf_size option to config.hpp which allows the user to
increase the size of the send buffer used by the signalling socketpair.

Implement random backoff for reconnection attempts using a primitive
pseudo-random generation to prevent reconnection storms.

Add wait_before_connect option to config.hpp to allow the user to enable
random delay even on initial connect. Default is false for low latency.

Signed-off-by: Martin Lucina <mato@kotelna.sk>
2010-10-08 17:49:40 +02:00
Martin Sustrik
7a685b0f88 Clean-up of session termination process
Specifically, shutdown of child objects is initiated *before* termination
handshake with socket object.

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
2010-10-08 17:23:21 +02:00
Martin Lucina
965fb7755b configure.in: OpenPGM no longer requires pkg-config 2010-10-04 16:22:30 +02:00
Steven McCoy
d62d721f1a configure.in: Add amd64 to OpenPGM supported platforms 2010-10-04 16:14:57 +02:00
Nir Soffer
1d431190f5 make sure that reader does not terminate in the middle of a multipart message 2010-10-02 10:01:18 +02:00