Pieter Hintjens
9be0c7e4b5
Merge pull request #402 from hurtonm/master
...
Small code cleanup
2012-07-17 23:59:59 -07:00
Martin Hurton
92827e45ee
Small code cleanup
2012-07-18 01:53:43 +02:00
Ian Barber
bea0b4817b
Merge pull request #401 from hurtonm/master
...
Fix issue #397
2012-07-13 07:14:27 -07:00
Martin Hurton
62b5b914f5
Always mark socket as retired when closing ipc_listener
...
When closing an ipc listener, the library may try to unlink
the associated file. When this fails, the underlying
socket is not marked as retired and this triggers
assertion failure.
Fixes issue #397
2012-07-13 15:46:05 +02:00
Ian Barber
43ee4396cf
Merge pull request #400 from hurtonm/master
...
Be more conservative about when to generate ZMQ_EVENT_CLOSE_FAILED
2012-07-11 10:17:44 -07:00
Martin Hurton
c84ca01e95
Be more conservative about when to generate ZMQ_EVENT_CLOSE_FAILED
...
This also fixes a bug in tcp_connecter and tcp_listener, which
generated the event not when they failed to close the socket but
when the succeed to close it.
2012-07-11 19:02:31 +02:00
Pieter Hintjens
0533fb1ce1
Merge pull request #399 from hurtonm/master
...
Small cleanup
2012-07-11 08:02:01 -07:00
Martin Hurton
6ac5cf8697
Simplify code for writer activation in Router socket
2012-07-11 15:15:04 +02:00
Ian Barber
f8752bf9fc
Merge pull request #398 from hurtonm/master
...
Rewrite event processing in io_thread
2012-07-06 10:50:00 -07:00
Martin Hurton
e37814eca4
Rewrite event processing in io_thread
2012-07-06 19:17:05 +02:00
Pieter Hintjens
823d14c7fc
Merge pull request #397 from hurtonm/master
...
Code cleanup
2012-07-06 04:02:17 -07:00
Martin Hurtoň
37d1e84467
Merge pull request #396 from hintjens/master
...
Reverting fix for #393
2012-07-06 03:54:55 -07:00
Martin Hurton
86eaa9c8e7
Rewrite process_command's loop
2012-07-06 12:17:36 +02:00
Pieter Hintjens
8d64fc6af8
Reverted fix for #393 , was already fixed
2012-07-06 17:33:41 +09:00
Ian Barber
73f960e739
Merge pull request #395 from hintjens/master
...
Fixed issue #393 - Android build error
2012-07-05 23:02:20 -07:00
Pieter Hintjens
9aa8452b80
Fixed issue #393 , compilation warnings
2012-07-06 12:23:51 +09:00
Martin Hurtoň
77dd0a6fba
Merge pull request #394 from hintjens/master
...
Fixed HWM doc on ZMQ_PULL
2012-07-04 05:20:51 -07:00
Pieter Hintjens
8d96a43975
Fixed documentation of HWM on ZMQ_PULL
2012-07-04 17:46:08 +09:00
Pieter Hintjens
e7f59297d0
Merge pull request #393 from cyrilh/master
...
Making Android&pyzmq friendly version with -avoid-version
2012-07-03 18:30:09 -07:00
Cyril Holweck
01919774dc
Making Android&pyzmq friendly version with avoid-version
2012-07-03 12:20:37 +02:00
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