generic-library/cppzmq
1
0
Fork 0
mirror of https://github.com/zeromq/cppzmq.git synced 2025-05-02 15:41:40 +02:00
Code Issues Projects Releases Wiki Activity

syntax & bug fixing

Browse Source 
modified monitor_t interface
This commit is contained in:
H. Eduardo Montoya Sánchez 2013-01-30 17:30:05 +01:00
parent bcdf163fa8
commit f30f92b392
1 changed files with 73 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
zmq.hpp
View File

@ -279,16 +279,16 @@ namespace zmq
class monitor_t
{
public:
virtual void on_event_connected() = 0;
virtual void on_event_connect_delayed() = 0;
virtual void on_event_connect_retried() = 0;
virtual void on_event_listening() = 0;
virtual void on_event_bind_failed() = 0;
virtual void on_event_accepted() = 0;
virtual void on_event_accept_failed() = 0;
virtual void on_event_closed() = 0;
virtual void on_event_close_failed() = 0;
virtual void on_event_disconnected() = 0;
virtual void on_event_connected(const char *addr_) = 0;
virtual void on_event_connect_delayed(const char *addr_) = 0;
virtual void on_event_connect_retried(const char *addr_) = 0;
virtual void on_event_listening(const char *addr_) = 0;
virtual void on_event_bind_failed(const char *addr_) = 0;
virtual void on_event_accepted(const char *addr_) = 0;
virtual void on_event_accept_failed(const char *addr_) = 0;
virtual void on_event_closed(const char *addr_) = 0;
virtual void on_event_close_failed(const char *addr_) = 0;
virtual void on_event_disconnected(const char *addr_) = 0;
virtual void on_event_unknown(int event) = 0;
};
@ -296,15 +296,16 @@ namespace zmq
{
public:
inline socket_t (context_t &context_, int type_) : is_monitored(false)
inline socket_t (context_t &context_, int type_)
{
ctxptr = context_.ptr;
ptr = zmq_socket (context_.ptr, type_);
if (ptr == NULL)
throw error_t ();
}
#ifdef ZMQ_HAS_RVALUE_REFS
inline socket_t(socket_t&& rhs) : ptr(rhs.ptr), is_monitored(false)
inline socket_t(socket_t&& rhs) : ptr(rhs.ptr)
{
rhs.ptr = NULL;
}
@ -351,13 +352,12 @@ namespace zmq
throw error_t ();
}
inlinde void init_monitor(const char *addr_)
inline void init_monitor(const char *addr_, int events)
{
std::string myaddr = std::string(addr_);
std::string monaddr = "inproc://monitor/" + myaddr;
rc = zmq_socket_monitor (ptr, monaddr.c_str(), ZMQ_EVENT_ALL);
int rc = zmq_socket_monitor(ptr, addr_, events);
if (rc != 0)
throw error_t ();
monaddr = std::string(addr_);
}
inline void bind (const char *addr_)
@ -365,10 +365,6 @@ namespace zmq
int rc = zmq_bind (ptr, addr_);
if (rc != 0)
throw error_t ();
if (is_monitored)
{
init_monitor()
}
}
inline void connect (const char *addr_)
@ -376,10 +372,6 @@ namespace zmq
int rc = zmq_connect (ptr, addr_);
if (rc != 0)
throw error_t ();
if (is_monitored)
{
init_monitor()
}
}
inline bool connected()
@ -387,18 +379,16 @@ namespace zmq
return(ptr != NULL);
}
inline void monitor (void* ctx, monitor_t* mon)
inline void monitor (monitor_t* mon)
{
zmq_event_t event;
int rc;
assert(mon);
void *s = zmq_socket (ctx, ZMQ_PAIR);
void *s = zmq_socket (ctxptr, ZMQ_PAIR);
assert (s);
const char* addr = myaddr.c_str();
rc = zmq_connect (s, monaddr.c_str());
assert (rc == 0);
while (true) {
@ -411,34 +401,34 @@ namespace zmq
switch (event.event) {
case ZMQ_EVENT_CONNECTED:
mon->on_event_connected(event.connected.addr);
mon->on_event_connected(event.data.connected.addr);
break;
case ZMQ_EVENT_CONNECT_DELAYED:
mon->on_event_connect_delayed();
mon->on_event_connect_delayed(event.data.connect_delayed.addr);
break;
case ZMQ_EVENT_CONNECT_RETRIED:
mon->on_event_connect_retried();
mon->on_event_connect_retried(event.data.connect_retried.addr);
break;
case ZMQ_EVENT_LISTENING:
mon->on_event_listening();
mon->on_event_listening(event.data.listening.addr);
break;
case ZMQ_EVENT_BIND_FAILED:
mon->on_event_bind_failed();
mon->on_event_bind_failed(event.data.bind_failed.addr);
break;
case ZMQ_EVENT_ACCEPTED:
mon->on_event_accepted();
mon->on_event_accepted(event.data.accepted.addr);
break;
case ZMQ_EVENT_ACCEPT_FAILED:
mon->on_event_accept_failed();
mon->on_event_accept_failed(event.data.accept_failed.addr);
break;
case ZMQ_EVENT_CLOSED:
mon->on_event_closed();
mon->on_event_closed(event.data.closed.addr);
break;
case ZMQ_EVENT_CLOSE_FAILED:
mon->on_event_close_failed();
mon->on_event_close_failed(event.data.close_failed.addr);
break;
case ZMQ_EVENT_DISCONNECTED:
mon->on_event_disconnected();
mon->on_event_disconnected(event.data.disconnected.addr);
break;
default:
mon->on_event_unknown(event.event);
@ -447,8 +437,6 @@ namespace zmq
zmq_msg_close (&msg);
}
zmq_close (s);
if (rc != 0)
throw error_t ();
}
inline size_t send (const void *buf_, size_t len_, int flags_ = 0)
@ -491,17 +479,10 @@ namespace zmq
throw error_t ();
}
inline void enable_monitoring()
{
is_monitored = true;
}
private:
bool is_monitored;
void *ptr;
monitor_t *mon;
std::string monaddr;
std::string myaddr;
void *ptr;
void *ctxptr;
socket_t (const socket_t&) ZMQ_DELETED_FUNCTION;
void operator = (const socket_t&) ZMQ_DELETED_FUNCTION;