Skip to content

Commit

Permalink
Fixed ref to zmq_socket_monitor
Browse files Browse the repository at this point in the history
  • Loading branch information
hintjens committed Oct 28, 2013
1 parent 9bf10a8 commit b580557
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ Bug Fixes
---------

* Fixed LIBZMQ-569 - Socket server crashes with random client data

* Fixed LIBZMQ-571 - test_stream failing in some cases
* Pulled expected failing test_linger.cpp from release.


0MQ version 4.0.1 stable, released on 2013/10/08
Expand Down
6 changes: 3 additions & 3 deletions doc/zmq.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@ Work with context properties::
Destroy a 0MQ context::
linkzmq:zmq_ctx_term[3]

Monitor a 0MQ context::
linkzmq:zmq_ctx_set_monitor[3]

These deprecated functions let you create and destroy 'contexts':

Initialise 0MQ context::
Expand Down Expand Up @@ -142,6 +139,9 @@ Sending and receiving messages::
linkzmq:zmq_recv[3]
linkzmq:zmq_send_const[3]

Monitoring socket events:
linkzmq:zmq_socket_monitor[3]

.Input/output multiplexing
0MQ provides a mechanism for applications to multiplex input/output events over
a set containing both 0MQ sockets and standard sockets. This mechanism mirrors
Expand Down
3 changes: 0 additions & 3 deletions tests/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ noinst_PROGRAMS = test_system \
test_immediate \
test_last_endpoint \
test_term_endpoint \
test_linger \
test_monitor \
test_router_mandatory \
test_probe_router \
Expand Down Expand Up @@ -58,7 +57,6 @@ test_hwm_SOURCES = test_hwm.cpp
test_reqrep_device_SOURCES = test_reqrep_device.cpp
test_sub_forward_SOURCES = test_sub_forward.cpp
test_invalid_rep_SOURCES = test_invalid_rep.cpp
test_linger_SOURCES = test_linger.cpp
test_msg_flags_SOURCES = test_msg_flags.cpp
test_connect_resolve_SOURCES = test_connect_resolve.cpp
test_immediate_SOURCES = test_immediate.cpp
Expand Down Expand Up @@ -96,7 +94,6 @@ endif

# Run the test cases
TESTS = $(noinst_PROGRAMS)
XFAIL_TESTS = test_linger

if !ON_LINUX
XFAIL_TESTS += test_abstract_ipc
Expand Down

0 comments on commit b580557

Please sign in to comment.