Commit Graph

1858 Commits

Author SHA1 Message Date
Pieter Hintjens
1ff5af098a Merge pull request #392 from hurtonm/master
mtrie clenaup
2012-07-02 06:54:26 -07:00
Martin Hurton
1b0e6ef8b4 mtrie: Code simplification 2012-07-02 08:32:23 +02:00
Martin Hurton
692648de96 mtrie: Do not throw exception on allocation failure 2012-07-02 06:11:29 +02:00
Chuck Remes
e471e5b401 Merge pull request #391 from methodmissing/monitor-manual-format
Let docs for zmq_ctx_set_monitor() respect a 80 char wide column width
2012-06-26 11:39:35 -07:00
Lourens Naudé
9ccbeb84fa Let docs for zmq_ctx_set_monitor() respect a 80 char wide column width 2012-06-26 19:35:59 +01:00
Pieter Hintjens
6a1bd3e1e7 Merge pull request #390 from hurtonm/master
Small code simplification
2012-06-25 18:03:07 -07:00
Martin Hurton
26e14d3064 Small code simplification 2012-06-26 02:05:52 +02:00
Pieter Hintjens
6f1229be6f Merge pull request #389 from hurtonm/master
Fix a bug in trie implementation
2012-06-25 05:09:00 -07:00
Martin Hurton
f8293df4c5 Fix a bug in trie implementation
When removing keys for a specified value, make sure we drop
empty node table. Failing to do this can lead to asserion failure.

Refs: http://lists.zeromq.org/pipermail/zeromq-dev/2012-June/017589.html
2012-06-25 13:39:12 +02:00
Pieter Hintjens
c251d940b3 Merge pull request #388 from minrk/forward-iovec
declare struct iovec
2012-06-23 18:40:58 -07:00
MinRK
a178817141 forward-declare struct iovec
avoids warnings of the form:

warning: 'struct iovec' declared inside parameter list
warning: its scope is only this definition or declaration, which is probably not what you want

when building downstream projects
2012-06-23 12:51:38 -07:00
Pieter Hintjens
b57b7debaa Merge pull request #386 from steve-o/err-handler
Fix missing ENETRESET for Jira #LIBZMQ-329.
2012-06-20 02:34:40 -07:00
Steven McCoy
fc335c59ea Fix missing ENETRESET for Jira #LIBZMQ-329. 2012-06-19 14:15:48 -04:00
Ian Barber
c60b0f579d Merge pull request #385 from jdc8/master
Missing semi-colon makes Windows compilation fail, Missing files in WIndows solution file
2012-06-19 08:46:49 -07:00
Jos Decoster
85c19f1269 added missing files to MSVC10 solution file: tcp.cpp, tcp.hpp 2012-06-19 17:05:15 +02:00
jdc8
98ee759dad Added missing semi-colon. 2012-06-19 09:37:06 -04:00
Pieter Hintjens
eb16f6b88e Merge pull request #384 from steve-o/err-handler
Add errno fallback values for MSVC2008.
2012-06-18 22:34:40 -07:00
Steven McCoy
5b3d0c633d Add errno fallback values for MSVC2008. 2012-06-18 17:13:17 -04:00
Ian Barber
7bbccdeac9 Merge pull request #383 from Kobolog/master
Reworked ZMQ_FAIL_UNROUTABLE to actually work as it was intended.
2012-06-17 00:36:58 -07:00
Kobolog
08749c8e7b Removed an unneeded include in tests 2012-06-17 02:38:15 +04:00
Kobolog
6da48aed3a Fixed tests 2012-06-17 02:36:08 +04:00
Kobolog
829d0003be Verbose ROUTER socket behavior patch 2012-06-17 02:33:43 +04:00
Pieter Hintjens
21eb8c8fa5 Merge pull request #382 from hurtonm/master
Fix open_socket to return -1 (INVALID_SOCKET on Windows) on error
2012-06-16 12:53:11 -07:00
Martin Hurton
7d99129411 Fix open_socket to return -1 (INVALID_SOCKET on Windows) on error 2012-06-16 21:46:20 +02:00
Pieter Hintjens
7753379eab Merge pull request #381 from hurtonm/connecter_cleanups
Connecter cleanups
2012-06-14 23:09:59 -07:00
Martin Hurton
919bd9628d {tcp|ipc}_connecter: check whether socket is valid before closing it
Calling close () when the underlying socket is invalid
triggers an assertion failure.
2012-06-15 02:38:47 +02:00
Martin Hurton
ec9f8994a7 Simplify {tcp|ipc}_connecter
Make start_connecting () to have singe exit point.
2012-06-15 02:03:20 +02:00
Martin Hurton
e0fed9d29a Simplify {tcp|ipc}_connecter
The patch is meant to make the code easier to understand.
The 'wait' attribute is replaced by 'delayed_start'
and 'timer_started' attributes. The former is constant and
is initialized in the constructor. The latter is a flag
reflecting whether a timer has been started and changes during
the lifetime of the object.
2012-06-15 01:55:13 +02:00
Pieter Hintjens
c8d0d68471 Merge pull request #380 from jlopex/master
current libzmq not compiling with android NDK
2012-06-14 12:17:51 -07:00
Javier Lopez
eb6c668c2a libzmq3.x not compiling on Android crosscompiler
- Android crosscompiler shows a warning about two signed/unsigned checks
  on compilation, this patch adds casts to avoid this, so zmq3.x can
  compile on it.
2012-06-14 12:14:55 -07:00
Ian Barber
67ab3390ec Merge pull request #379 from hitenp/doc-changes
Correct typo: add missing single quote.
2012-06-14 02:55:32 -07:00
Hiten P
a96dcfb29a Correct typo: add missing single quote. 2012-06-14 10:52:44 +01:00
Pieter Hintjens
426ea71697 Merge pull request #378 from steve-o/err-handler
Fix #LIBZMQ-329 assertion on WSAEACCES
2012-06-13 16:45:48 -07:00
Steven McCoy
acbb99383f Add additional Windows Sockets Error Codes. 2012-06-13 19:42:11 -04:00
Pieter Hintjens
f35bed0edc Merge pull request #377 from hurtonm/master
{tcp|ipc}_listener: close socket when set_address () fails
2012-06-13 06:09:42 -07:00
Martin Hurton
75d67286cc {tcp|ipc}_listener: close socket when set_address () fails 2012-06-13 14:49:43 +02:00
Pieter Hintjens
a9507cc267 Merge pull request #376 from ianbarber/master
Add unistd header to test
2012-06-13 04:20:04 -07:00
Ian Barber
c7c834a945 Add unistd header to test_connect_delay header
For sleep and usleep
2012-06-13 12:18:22 +01:00
Pieter Hintjens
dc9749fc67 Merge pull request #375 from ianbarber/master
Add newline to end of new test file
2012-06-13 00:04:13 -07:00
Ian Barber
35c55a2cde Add newline to end of test_connect_delay file 2012-06-13 07:47:18 +01:00
Pieter Hintjens
9e1e68ef16 Merge pull request #374 from steve-o/branding
Add ZeroMQ branding.
2012-06-12 23:15:11 -07:00
Steven McCoy
b2e56c5e4f Add ZeroMQ branding. 2012-06-12 21:30:24 -04:00
Pieter Hintjens
076e081de2 Merge pull request #373 from ianbarber/master
Add ZMQ_DELAY_ATTACH_ON_CONNECT sockopt
2012-06-12 14:18:51 -07:00
Pieter Hintjens
e1cc2d4a41 Merge pull request #372 from ianbarber/manfix
Update bind and connect documentation for clarity
2012-06-12 12:26:20 -07:00
Ian Barber
bc9ae715c3 Add asserts and rename pipe set
Rename the pipeset to terminating_pipes, as suggested by Martin H. Adds
asserts to test the pipe is contained in the terminating set where
appropriate.
2012-06-12 17:56:39 +01:00
Ian Barber
704b952274 Add reference to the inproc documentation
The previous note in connect introduced but did not elaborate on the
requirement to bind before connect in inproc. As that discussion is in
detail in the inproc docs link to there.
2012-06-12 15:49:18 +01:00
Ian Barber
7b78ed9d60 Update bind and connect documentation for clarity
Based on discussion with Steve O on the list, make the difference
between bind and connect usage more clear, and add a note reflecting the
fact that inproc must have bind before connect to reinforce the
information in zmq_inproc.
2012-06-12 15:46:26 +01:00
Ian Barber
e5904e63ce Allow blocking while connect() is completing
This patch, salvaged from a trainwreck accidental merge earlier, adds a
new sockopt, ZMQ_DELAY_ATTACH_ON_CONNECT which prevents a end point
being available to push messages to until it has fully connected, making
connect work more like bind. This also applies to reconnecting sockets,
which may cause message loss of in-queue messages, so it is sensible to
use this in conjunction with a low HWM and potentially an alternative
acknowledgement path.

Notes on most of the individual commits can be found the repository log.
2012-06-12 15:34:48 +01:00
Ian Barber
409d5e8fff Allow blocking while connect() is completing
This patch, salvaged from a trainwreck accidental merge earlier, adds a
new sockopt, ZMQ_DELAY_ATTACH_ON_CONNECT which prevents a end point
being available to push messages to until it has fully connected, making
connect work more like bind. This also applies to reconnecting sockets,
which may cause message loss of in-queue messages, so it is sensible to
use this in conjunction with a low HWM and potentially an alternative
acknowledgement path.

Notes on most of the individual commits can be found the repository log.
2012-06-12 15:31:23 +01:00
Ian Barber
95cbad3841 Revert "After speaking with Ben Gray and the discussion on the mailing list, this is an attempt to create a sockopt to allow connecting pipes to not immediately be available for traffic. The problem is in a PUSH to many PULL situation, where there is a connect to a PULL which is not there. This connect will immediately create a pipe (unlike bind), and traffic will be load balanced to that pipe. This means if there is a persistently unavailable end point then the traffic will queue until HWM is hit, and older messages will be lost."
This reverts commit fe3fb419fe.
2012-06-12 14:53:57 +01:00