mirror of
https://github.com/zeromq/libzmq.git
synced 2025-11-01 21:13:13 +01:00
Significantly reworked the monitoring infrastructure with a more granular per socket API and to play well with monitoring endpoints in application threads
This commit is contained in:
Lourens Naudé
@@ -21,89 +21,226 @@
|
||||
|
||||
#include "../include/zmq.h"
|
||||
#include "../include/zmq_utils.h"
|
||||
#include <pthread.h>
|
||||
#include <string.h>
|
||||
#include "testutil.hpp"
|
||||
|
||||
static int events;
|
||||
// REQ socket events handled
|
||||
static int req_socket_events;
|
||||
// 2nd REQ socket events handled
|
||||
static int req2_socket_events;
|
||||
// REP socket events handled
|
||||
static int rep_socket_events;
|
||||
|
||||
typedef void *ZmqSocket;
|
||||
ZmqSocket rep, req;
|
||||
const char *addr;
|
||||
|
||||
void socket_monitor (ZmqSocket s, int event_, zmq_event_data_t *data_)
|
||||
extern "C"
|
||||
{
|
||||
assert(s == rep || s == req);
|
||||
// REQ socket monitor thread
|
||||
static void *req_socket_monitor (void *ctx)
|
||||
{
|
||||
zmq_event_t event;
|
||||
int rc;
|
||||
|
||||
const char *addr = "tcp://127.0.0.1:5560";
|
||||
// Only some of the exceptional events could fire
|
||||
switch (event_) {
|
||||
// listener specific
|
||||
case ZMQ_EVENT_LISTENING:
|
||||
assert (s == rep);
|
||||
assert (data_->listening.fd > 0);
|
||||
assert (!strcmp (data_->listening.addr, addr));
|
||||
events |= ZMQ_EVENT_LISTENING;
|
||||
break;
|
||||
case ZMQ_EVENT_ACCEPTED:
|
||||
assert (s == rep);
|
||||
assert (data_->accepted.fd > 0);
|
||||
assert (!strcmp (data_->accepted.addr, addr));
|
||||
events |= ZMQ_EVENT_ACCEPTED;
|
||||
break;
|
||||
// connecter specific
|
||||
case ZMQ_EVENT_CONNECTED:
|
||||
assert (s == req);
|
||||
assert (data_->connected.fd > 0);
|
||||
assert (!strcmp (data_->connected.addr, addr));
|
||||
events |= ZMQ_EVENT_CONNECTED;
|
||||
break;
|
||||
case ZMQ_EVENT_CONNECT_DELAYED:
|
||||
assert (s == req);
|
||||
assert (data_->connect_delayed.err != 0);
|
||||
assert (!strcmp (data_->connect_delayed.addr, addr));
|
||||
events |= ZMQ_EVENT_CONNECT_DELAYED;
|
||||
break;
|
||||
// generic - either end of the socket
|
||||
case ZMQ_EVENT_CLOSE_FAILED:
|
||||
assert (data_->close_failed.err != 0);
|
||||
assert (!strcmp (data_->close_failed.addr, addr));
|
||||
events |= ZMQ_EVENT_CLOSE_FAILED;
|
||||
break;
|
||||
case ZMQ_EVENT_CLOSED:
|
||||
assert (data_->closed.fd != 0);
|
||||
assert (!strcmp (data_->closed.addr, addr));
|
||||
events |= ZMQ_EVENT_CLOSED;
|
||||
break;
|
||||
case ZMQ_EVENT_DISCONNECTED:
|
||||
assert (data_->disconnected.fd != 0);
|
||||
assert (!strcmp (data_->disconnected.addr, addr));
|
||||
events |= ZMQ_EVENT_DISCONNECTED;
|
||||
break;
|
||||
default:
|
||||
// out of band / unexpected event
|
||||
assert (0);
|
||||
void *s = zmq_socket (ctx, ZMQ_PAIR);
|
||||
assert (s);
|
||||
|
||||
rc = zmq_connect (s, "inproc://monitor.req");
|
||||
assert (rc == 0);
|
||||
while (true) {
|
||||
zmq_msg_t msg;
|
||||
zmq_msg_init (&msg);
|
||||
rc = zmq_recvmsg (s, &msg, 0);
|
||||
if (rc == -1 && zmq_errno() == ETERM) break;
|
||||
assert (rc != -1);
|
||||
memcpy (&event, zmq_msg_data (&msg), sizeof (event));
|
||||
switch (event.event) {
|
||||
case ZMQ_EVENT_CONNECTED:
|
||||
assert (event.data.connected.fd > 0);
|
||||
assert (!strcmp (event.data.connected.addr, addr));
|
||||
req_socket_events |= ZMQ_EVENT_CONNECTED;
|
||||
req2_socket_events |= ZMQ_EVENT_CONNECTED;
|
||||
break;
|
||||
case ZMQ_EVENT_CONNECT_DELAYED:
|
||||
assert (event.data.connect_delayed.err != 0);
|
||||
assert (!strcmp (event.data.connect_delayed.addr, addr));
|
||||
req_socket_events |= ZMQ_EVENT_CONNECT_DELAYED;
|
||||
break;
|
||||
case ZMQ_EVENT_CLOSE_FAILED:
|
||||
assert (event.data.close_failed.err != 0);
|
||||
assert (!strcmp (event.data.close_failed.addr, addr));
|
||||
req_socket_events |= ZMQ_EVENT_CLOSE_FAILED;
|
||||
break;
|
||||
case ZMQ_EVENT_CLOSED:
|
||||
assert (event.data.closed.fd != 0);
|
||||
assert (!strcmp (event.data.closed.addr, addr));
|
||||
req_socket_events |= ZMQ_EVENT_CLOSED;
|
||||
break;
|
||||
case ZMQ_EVENT_DISCONNECTED:
|
||||
assert (event.data.disconnected.fd != 0);
|
||||
assert (!strcmp (event.data.disconnected.addr, addr));
|
||||
req_socket_events |= ZMQ_EVENT_DISCONNECTED;
|
||||
break;
|
||||
}
|
||||
}
|
||||
zmq_close (s);
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
extern "C"
|
||||
{
|
||||
// 2nd REQ socket monitor thread
|
||||
static void *req2_socket_monitor (void *ctx)
|
||||
{
|
||||
zmq_event_t event;
|
||||
int rc;
|
||||
|
||||
void *s = zmq_socket (ctx, ZMQ_PAIR);
|
||||
assert (s);
|
||||
|
||||
rc = zmq_connect (s, "inproc://monitor.req2");
|
||||
assert (rc == 0);
|
||||
while (true) {
|
||||
zmq_msg_t msg;
|
||||
zmq_msg_init (&msg);
|
||||
rc = zmq_recvmsg (s, &msg, 0);
|
||||
if (rc == -1 && zmq_errno() == ETERM) break;
|
||||
assert (rc != -1);
|
||||
memcpy (&event, zmq_msg_data (&msg), sizeof (event));
|
||||
switch (event.event) {
|
||||
case ZMQ_EVENT_CONNECTED:
|
||||
assert (event.data.connected.fd > 0);
|
||||
assert (!strcmp (event.data.connected.addr, addr));
|
||||
req2_socket_events |= ZMQ_EVENT_CONNECTED;
|
||||
break;
|
||||
case ZMQ_EVENT_CLOSED:
|
||||
assert (event.data.closed.fd != 0);
|
||||
assert (!strcmp (event.data.closed.addr, addr));
|
||||
req2_socket_events |= ZMQ_EVENT_CLOSED;
|
||||
break;
|
||||
}
|
||||
}
|
||||
zmq_close (s);
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
extern "C"
|
||||
{
|
||||
// REP socket monitor thread
|
||||
static void *rep_socket_monitor (void *ctx)
|
||||
{
|
||||
zmq_event_t event;
|
||||
int rc;
|
||||
|
||||
void *s = zmq_socket (ctx, ZMQ_PAIR);
|
||||
assert (s);
|
||||
|
||||
rc = zmq_connect (s, "inproc://monitor.rep");
|
||||
assert (rc == 0);
|
||||
while (true) {
|
||||
zmq_msg_t msg;
|
||||
zmq_msg_init (&msg);
|
||||
rc = zmq_recvmsg (s, &msg, 0);
|
||||
if (rc == -1 && zmq_errno() == ETERM) break;
|
||||
assert (rc != -1);
|
||||
memcpy (&event, zmq_msg_data (&msg), sizeof (event));
|
||||
switch (event.event) {
|
||||
case ZMQ_EVENT_LISTENING:
|
||||
assert (event.data.listening.fd > 0);
|
||||
assert (!strcmp (event.data.listening.addr, addr));
|
||||
rep_socket_events |= ZMQ_EVENT_LISTENING;
|
||||
break;
|
||||
case ZMQ_EVENT_ACCEPTED:
|
||||
assert (event.data.accepted.fd > 0);
|
||||
assert (!strcmp (event.data.accepted.addr, addr));
|
||||
rep_socket_events |= ZMQ_EVENT_ACCEPTED;
|
||||
break;
|
||||
case ZMQ_EVENT_CLOSE_FAILED:
|
||||
assert (event.data.close_failed.err != 0);
|
||||
assert (!strcmp (event.data.close_failed.addr, addr));
|
||||
rep_socket_events |= ZMQ_EVENT_CLOSE_FAILED;
|
||||
break;
|
||||
case ZMQ_EVENT_CLOSED:
|
||||
assert (event.data.closed.fd != 0);
|
||||
assert (!strcmp (event.data.closed.addr, addr));
|
||||
rep_socket_events |= ZMQ_EVENT_CLOSED;
|
||||
break;
|
||||
case ZMQ_EVENT_DISCONNECTED:
|
||||
assert (event.data.disconnected.fd != 0);
|
||||
assert (!strcmp (event.data.disconnected.addr, addr));
|
||||
rep_socket_events |= ZMQ_EVENT_DISCONNECTED;
|
||||
break;
|
||||
}
|
||||
zmq_msg_close (&msg);
|
||||
}
|
||||
zmq_close (s);
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
int main (void)
|
||||
{
|
||||
int rc;
|
||||
void *req;
|
||||
void *req2;
|
||||
void *rep;
|
||||
pthread_t threads [3];
|
||||
|
||||
addr = "tcp://127.0.0.1:5560";
|
||||
|
||||
// Create the infrastructure
|
||||
void *ctx = zmq_init (1);
|
||||
assert (ctx);
|
||||
// set socket monitor
|
||||
rc = zmq_ctx_set_monitor (ctx, socket_monitor);
|
||||
assert (rc == 0);
|
||||
|
||||
// REP socket
|
||||
rep = zmq_socket (ctx, ZMQ_REP);
|
||||
assert (rep);
|
||||
|
||||
rc = zmq_bind (rep, "tcp://127.0.0.1:5560");
|
||||
// Assert supported protocols
|
||||
rc = zmq_socket_monitor (rep, addr, 0);
|
||||
assert (rc == -1);
|
||||
assert (zmq_errno() == EPROTONOSUPPORT);
|
||||
|
||||
// Deregister monitor
|
||||
rc = zmq_socket_monitor (rep, NULL, 0);
|
||||
assert (rc == 0);
|
||||
|
||||
// REP socket monitor, all events
|
||||
rc = zmq_socket_monitor (rep, "inproc://monitor.rep", ZMQ_EVENT_ALL);
|
||||
assert (rc == 0);
|
||||
rc = pthread_create (&threads [0], NULL, rep_socket_monitor, ctx);
|
||||
assert (rc == 0);
|
||||
|
||||
rc = zmq_bind (rep, addr);
|
||||
assert (rc == 0);
|
||||
|
||||
// REQ socket
|
||||
req = zmq_socket (ctx, ZMQ_REQ);
|
||||
assert (req);
|
||||
|
||||
rc = zmq_connect (req, "tcp://127.0.0.1:5560");
|
||||
// REQ socket monitor, all events
|
||||
rc = zmq_socket_monitor (req, "inproc://monitor.req", ZMQ_EVENT_ALL);
|
||||
assert (rc == 0);
|
||||
rc = pthread_create (&threads [1], NULL, req_socket_monitor, ctx);
|
||||
assert (rc == 0);
|
||||
|
||||
rc = zmq_connect (req, addr);
|
||||
assert (rc == 0);
|
||||
|
||||
// 2nd REQ socket
|
||||
req2 = zmq_socket (ctx, ZMQ_REQ);
|
||||
assert (req2);
|
||||
|
||||
// 2nd REQ socket monitor, connected event only
|
||||
rc = zmq_socket_monitor (req2, "inproc://monitor.req2", ZMQ_EVENT_CONNECTED);
|
||||
assert (rc == 0);
|
||||
rc = pthread_create (&threads [2], NULL, req2_socket_monitor, ctx);
|
||||
assert (rc == 0);
|
||||
|
||||
rc = zmq_connect (req2, addr);
|
||||
assert (rc == 0);
|
||||
|
||||
bounce (rep, req);
|
||||
@@ -111,26 +248,41 @@ int main (void)
|
||||
// Allow a window for socket events as connect can be async
|
||||
zmq_sleep (1);
|
||||
|
||||
// Deallocate the infrastructure.
|
||||
// Close the REP socket
|
||||
rc = zmq_close (rep);
|
||||
assert (rc == 0);
|
||||
|
||||
// Allow some time for detecting error states
|
||||
zmq_sleep (1);
|
||||
|
||||
// Close the REQ socket
|
||||
rc = zmq_close (req);
|
||||
assert (rc == 0);
|
||||
|
||||
// Close the 2nd REQ socket
|
||||
rc = zmq_close (req2);
|
||||
assert (rc == 0);
|
||||
|
||||
// Allow for closed or disconnected events to bubble up
|
||||
zmq_sleep (1);
|
||||
|
||||
rc = zmq_close (rep);
|
||||
assert (rc == 0);
|
||||
|
||||
zmq_sleep (1);
|
||||
|
||||
zmq_term (ctx);
|
||||
|
||||
// We expect to at least observe these events
|
||||
assert (events & ZMQ_EVENT_LISTENING);
|
||||
assert (events & ZMQ_EVENT_ACCEPTED);
|
||||
assert (events & ZMQ_EVENT_CONNECTED);
|
||||
assert (events & ZMQ_EVENT_CLOSED);
|
||||
assert (events & ZMQ_EVENT_DISCONNECTED);
|
||||
// Expected REP socket events
|
||||
assert (rep_socket_events & ZMQ_EVENT_LISTENING);
|
||||
assert (rep_socket_events & ZMQ_EVENT_ACCEPTED);
|
||||
assert (rep_socket_events & ZMQ_EVENT_CLOSED);
|
||||
|
||||
// Expected REQ socket events
|
||||
assert (req_socket_events & ZMQ_EVENT_CONNECTED);
|
||||
assert (req_socket_events & ZMQ_EVENT_DISCONNECTED);
|
||||
assert (req_socket_events & ZMQ_EVENT_CLOSED);
|
||||
|
||||
// Expected 2nd REQ socket events
|
||||
assert (req2_socket_events & ZMQ_EVENT_CONNECTED);
|
||||
assert (!(req2_socket_events & ZMQ_EVENT_CLOSED));
|
||||
|
||||
pthread_exit (NULL);
|
||||
|
||||
return 0 ;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user