generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-29 12:18:04 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1616 from somdoron/ZMQ_POLLER

Browse Source 
problem: ZMQ_POLLER doesn't support polling on out
This commit is contained in:
Richard Newton
2015-10-21 12:42:44 +01:00
parent a7ea57fb68 24fc0d4e89
commit 0650b59b10
5 changed files with 125 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/socket_poller.cpp
View File

@@ -71,7 +71,7 @@ bool zmq::socket_poller_t::check_tag ()
return tag == 0xCAFEBABE;
}
int zmq::socket_poller_t::add_socket (void *socket_, void* user_data_)
int zmq::socket_poller_t::add (void *socket_, void* user_data_, short events_)
{
for (events_t::iterator it = events.begin (); it != events.end (); ++it) {
if (it->socket == socket_) {
@@ -91,7 +91,7 @@ int zmq::socket_poller_t::add_socket (void *socket_, void* user_data_)
return -1;
}
event_t event = {socket_, 0, user_data_};
event_t event = {socket_, 0, user_data_, events_};
events.push_back (event);
need_rebuild = true;
@@ -99,9 +99,9 @@ int zmq::socket_poller_t::add_socket (void *socket_, void* user_data_)
}
#if defined _WIN32
int zmq::socket_poller_t::add_fd (SOCKET fd_, void *user_data_)
int zmq::socket_poller_t::add_fd (SOCKET fd_, void *user_data_, short events_)
#else
int zmq::socket_poller_t::add_fd (int fd_, void *user_data_)
int zmq::socket_poller_t::add_fd (int fd_, void *user_data_, short events_)
#endif
{
for (events_t::iterator it = events.begin (); it != events.end (); ++it) {
@@ -111,14 +111,60 @@ int zmq::socket_poller_t::add_fd (int fd_, void *user_data_)
}
}
event_t event = {NULL, fd_, user_data_};
event_t event = {NULL, fd_, user_data_, events_};
events.push_back (event);
need_rebuild = true;
return 0;
}
int zmq::socket_poller_t::remove_socket (void* socket_)
int zmq::socket_poller_t::modify (void *socket_, short events_)
{
events_t::iterator it;
for (it = events.begin (); it != events.end (); ++it) {
if (it->socket == socket_)
break;
}
if (it == events.end()) {
errno = EINVAL;
return -1;
}
it->events = events_;
need_rebuild = true;
return 0;
}
#if defined _WIN32
int zmq::socket_poller_t::modify_fd (SOCKET fd_, short events_)
#else
int zmq::socket_poller_t::modify_fd (int fd_, short events_)
#endif
{
events_t::iterator it;
for (it = events.begin (); it != events.end (); ++it) {
if (!it->socket && it->fd == fd_)
break;
}
if (it == events.end()) {
errno = EINVAL;
return -1;
}
it->events = events_;
need_rebuild = true;
return 0;
}
int zmq::socket_poller_t::remove (void* socket_)
{
events_t::iterator it;
@@ -185,13 +231,14 @@ int zmq::socket_poller_t::wait (zmq::socket_poller_t::event_t *event_, long time
}
if (rc == 0) {
errno = EAGAIN;
errno = ETIMEDOUT;
return -1;
}
for (int i = 0; i < poll_size; i++) {
if (poll_set [i].revents & ZMQ_POLLIN) {
*event_ = poll_events[i];
if ((poll_set [i].revents & poll_events [i].events) != 0) {
*event_ = poll_events[i];
event_->events = poll_set [i].revents & poll_events [i].events;
break;
}
@@ -226,7 +273,7 @@ void zmq::socket_poller_t::rebuild ()
if (!it->socket)
poll_set [event_nbr].fd = it->fd;
poll_set [event_nbr].events = ZMQ_POLLIN;
poll_set [event_nbr].events = it->events;
poll_events [event_nbr] = *it;
}

12
src/socket_poller.hpp
View File

@@ -53,15 +53,19 @@ namespace zmq
int fd;
#endif
void *user_data;
short events;
} event_t;
int add_socket (void *socket, void *user_data);
int remove_socket (void *socket);
int add (void *socket, void *user_data, short events);
int modify (void *socket, short events);
int remove (void *socket);
#if defined _WIN32
int add_fd (SOCKET fd, void *user_data);
int add_fd (SOCKET fd, void *user_data, short events);
int modify_fd (SOCKET fd, short events);
int remove_fd (SOCKET fd);
#else
int add_fd (int fd, void *user_data);
int add_fd (int fd, void *user_data, short events);
int modify_fd (int fd, short events);
int remove_fd (int fd);
#endif

42
src/zmq.cpp
View File

@@ -1579,20 +1579,20 @@ int zmq_poller_close (void *poller_)
return 0;
}
int zmq_poller_add_socket (void *poller_, void *socket_, void *user_data_)
int zmq_poller_add (void *poller_, void *socket_, void *user_data_, short events_)
{
if (!poller_ || !((zmq::socket_poller_t*)poller_)->check_tag ()) {
errno = EFAULT;
return -1;
}
return ((zmq::socket_poller_t*)poller_)->add_socket (socket_, user_data_);
return ((zmq::socket_poller_t*)poller_)->add (socket_, user_data_, events_);
}
#if defined _WIN32
int zmq_poller_add_fd (void *poller_, SOCKET fd_, void *user_data_)
int zmq_poller_add_fd (void *poller_, SOCKET fd_, void *user_data_, short events_)
#else
int zmq_poller_add_fd (void *poller_, int fd_, void *user_data_)
int zmq_poller_add_fd (void *poller_, int fd_, void *user_data_, short events_)
#endif
{
if (!poller_ || !((zmq::socket_poller_t*)poller_)->check_tag ()) {
@@ -1600,17 +1600,44 @@ int zmq_poller_add_fd (void *poller_, int fd_, void *user_data_)
return -1;
}
return ((zmq::socket_poller_t*)poller_)->add_fd (fd_, user_data_);
return ((zmq::socket_poller_t*)poller_)->add_fd (fd_, user_data_, events_);
}
int zmq_poller_remove_socket (void *poller_, void *socket)
int zmq_poller_modify (void *poller_, void *socket_, short events_)
{
if (!poller_ || !((zmq::socket_poller_t*)poller_)->check_tag ()) {
errno = EFAULT;
return -1;
}
return ((zmq::socket_poller_t*)poller_)->modify (socket_, events_);
}
#if defined _WIN32
int zmq_poller_modify_fd (void *poller_, SOCKET fd_, short events_)
#else
int zmq_poller_modify_fd (void *poller_, int fd_, short events_)
#endif
{
if (!poller_ || !((zmq::socket_poller_t*)poller_)->check_tag ()) {
errno = EFAULT;
return -1;
}
return ((zmq::socket_poller_t*)poller_)->modify_fd (fd_, events_);
}
int zmq_poller_remove (void *poller_, void *socket)
{
if (!poller_ || !((zmq::socket_poller_t*)poller_)->check_tag ()) {
errno = EFAULT;
return -1;
}
return ((zmq::socket_poller_t*)poller_)->remove_socket (socket);
return ((zmq::socket_poller_t*)poller_)->remove (socket);
}
#if defined _WIN32
@@ -1642,6 +1669,7 @@ int zmq_poller_wait (void *poller_, zmq_poller_event_t *event, long timeout_)
event->socket = e.socket;
event->fd = e.fd;
event->user_data = e.user_data;
event->events = e.events;
return rc;
}