Martin Hurton
24b79c7e0b
Prefer errno_assert/alloc_assert to zmq_assert
2012-05-28 23:17:03 +02:00
Martin Hurton
013967681d
fq: code cleanup
2012-05-28 22:01:37 +02:00
Pieter Hintjens
8152502f69
Merge pull request #350 from hurtonm/issue_369
...
Fix issue #369
2012-05-28 08:39:20 -07:00
Martin Hurton
130dfc5b5f
Fix issue #369
...
The bug was that after reconnect, the session did not
handle identity messages properly.
2012-05-28 17:08:27 +02:00
Ian Barber
e30e48c23e
Merge pull request #349 from hintjens/master
...
Fixed zmq_poll.txt manpage for issue #361
2012-05-28 02:16:29 -07:00
Pieter Hintjens
2ab12efe11
Fixing issue #361
2012-05-28 11:01:21 +02:00
Pieter Hintjens
3a76d246a8
Merge pull request #348 from hurtonm/code_cleanup
...
Code cleanup
2012-05-28 00:47:26 -07:00
Martin Hurton
d0b9005ef0
Don't assume SOCKET_ERROR is -1 on Windows
2012-05-27 23:38:33 +02:00
Martin Hurton
ac53f1a728
Remove unnecessary casts
2012-05-27 23:38:16 +02:00
Martin Hurton
e0534643fa
Simplify error handling in tcp_connecter
2012-05-27 23:38:16 +02:00
Martin Hurton
13ef1e4f26
Make wsa_error_to_errno pure function
2012-05-27 16:10:19 +02:00
Martin Hurton
a8f9a0d891
Use zmq_assert rather then assert
2012-05-27 15:31:59 +02:00
Martin Hurton
52ed4cdccf
Remove dead code
2012-05-27 15:18:38 +02:00
Martin Hurton
7cfd03ba72
Remove unplug from i_engine interface
2012-05-27 15:18:38 +02:00
Pieter Hintjens
5db30fe991
Merge pull request #347 from methodmissing/monitor-doc-fails
...
Fix too long underline in zmq_ctx_set_monitor() docs
2012-05-24 06:45:27 -07:00
Lourens Naudé
b85ff17822
Fix too long underline in monitor docs
2012-05-24 09:39:48 +01:00
Pieter Hintjens
74af2f9402
Merge pull request #346 from methodmissing/monitor-regressions
...
Rename monitor documentation source file to match zmq_ctx_set_monitor() API
2012-05-23 07:21:41 -07:00
Lourens Naudé
400f6f3863
Rename monitor documentation source file to match zmq_ctx_set_monitor() API
2012-05-23 01:35:22 +01:00
Pieter Hintjens
22b4388e29
Merge pull request #345 from methodmissing/monitor-regressions
...
Moves the monitoring infrastructure to a global zmq_ctx_set_monitor () API to avoid strict aliasing issues with function pointers and socket options.
2012-05-22 16:18:54 -07:00
Lourens Naudé
1e92ee0a0e
Oust last remaning ZMQ_MONITOR reference from NEWS as well
2012-05-22 23:45:15 +01:00
Lourens Naudé
adf7a7ade1
Merge branch 'master' into monitor-regressions
2012-05-22 23:35:30 +01:00
Lourens Naudé
991b7fcc04
Rename zmq_monitor to zmq_ctx_set_monitor for compat with existing context specific APIs
2012-05-22 20:15:18 +01:00
Lourens Naudé
04f0e7f26e
Documentation for zmq_monitor
2012-05-22 20:08:02 +01:00
Ian Barber
20152a6e3e
Merge pull request #344 from hintjens/master
...
Fixed bogus reference to zmq_ctx_put
2012-05-22 07:31:28 -07:00
Pieter Hintjens
604456a8b0
Man page for zmq_ctx_new had error, fixed
2012-05-21 15:59:55 -05:00
Lourens Naudé
f27c02d01e
Change context monitor_event prototype to accept a va_list instead
2012-05-21 21:22:16 +01:00
Lourens Naudé
4767159f39
Initial stab at a context level monitor callback and registration API
2012-05-21 20:47:11 +01:00
Pieter Hintjens
7cb19fbf1c
Merge pull request #343 from jimenezrick/master
...
Doc improvement: document interface omission in zmq_pgm.txt
2012-05-21 06:00:02 -07:00
Pieter Hintjens
65b6351e4a
Merge pull request #342 from ipechorin/master
...
Solaris/SunCC build fix: could not find a match for std::multimap<...>::insert(std::pair<...,...>)
2012-05-21 05:59:32 -07:00
Ricardo Catalinas Jiménez
0e053e3478
Doc improvement: document interface omission in zmq_pgm.txt
...
The PGM transport supports the omission of the network interface to
select the default one like:
announce.connect("epgm://eth0;239.255.128.46:64646"); // Use eth0
announce.connect("epgm://239.255.128.46:64646"); // Use the default
Also, mention C++ in the additional community bindings of 0MQ in
zmq.txt.
2012-05-21 14:06:34 +02:00
Lourens Naudé
e13b3723b8
Rename type zmq_monitor_fn -> zmq_monitor for a more natural callback definition API (zmq_monitor type, monitor.function callback)
2012-05-20 18:27:59 +01:00
Lourens Naudé
06cce15479
Change zmq_monitor_fn type to cast between pointer-to-object and pointer-to-function in a more standards compliant way
2012-05-20 18:22:13 +01:00
Ivan Pechorin
d25dce9df9
Solaris/SunCC build fix: could not find a match for std::multimap<...>::insert(std::pair<...,...>)
2012-05-20 13:34:08 +02:00
Pieter Hintjens
5ef63318f8
Merge pull request #341 from kennytm/master
...
Allow the ZMQ_MONITOR code compilable on gcc 4.7 on Linux.
2012-05-13 06:39:16 -07:00
KennyTM~
c995de6584
Allow the ZMQ_MONITOR code compilable on gcc 4.7 on Linux.
...
The current ZMQ_MONITOR code does not compile in gcc 4.7, as -pedantic
and -Werror are enabled, and ISO C++ doesn't allow casting between
normal pointers (void*) and function pointers, as pedantically their
size could be different. This caused the library not compilable. This
commit workaround the problem by introducing one more indirection, i.e.
instead of calling
(void *)listener
which is an error, we have to use
*(void **)&listener
which is an undefined behavior :) but works on most platforms
Also, `optval_ = monitor` will not set the parameter in getsockopt(),
and the extra casting caused the LHS to be an rvalue which again makes
the code not compilable. The proper way is to pass a pointer of function
pointer and assign with indirection, i.e. `*optval_ = monitor`.
Also, fixed an asciidoc error in zmq_getsockopt.txt because the `~~~~`
is too long.
2012-05-13 20:49:05 +08:00
Pieter Hintjens
89d5054e59
Merge pull request #340 from methodmissing/events
...
Expose a ZMQ_MONITOR socket option to register a callback for notification of state changes in socket state ( stream engine, tcp and ipc transport only )
2012-05-11 15:18:50 -07:00
Lourens Naudé
d0461752ff
Merge branch 'master' into events
2012-05-11 22:08:17 +01:00
Pieter Hintjens
70b067ecc6
Merge pull request #339 from ianbarber/master
...
Add disconnect and unbind documentation
2012-05-11 06:23:58 -07:00
Ian Barber
e65d228f4f
gitignore endpoint test and add docs for unbind and disconnect
2012-05-11 14:17:45 +01:00
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