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

Merge pull request #1534 from somdoron/master

Browse Source 
problem: new poller field in zmq_pollitem_t is changing the api
This commit is contained in:
Constantin Rack
2015-08-17 13:40:26 +02:00
parent 7d42aac0c5 d83b045347
commit a96f16e3fa
3 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/zmq.cpp
View File

@@ -562,9 +562,9 @@ int zmq_recviov (void *s_, iovec *a_, size_t *count_, int flags_)
return nread;
}
// Add/remove poller from a socket
// Add/remove pollfd from a socket
int zmq_add_poller (void *s_, void *p_)
int zmq_add_pollfd (void *s_, void *p_)
{
if (!s_ || !((zmq::socket_base_t*) s_)->check_tag ()) {
errno = ENOTSOCK;
@@ -576,7 +576,7 @@ int zmq_add_poller (void *s_, void *p_)
return s->add_signaler(p);
}
int zmq_remove_poller (void *s_, void *p_)
int zmq_remove_pollfd (void *s_, void *p_)
{
if (!s_ || !((zmq::socket_base_t*) s_)->check_tag ()) {
errno = ENOTSOCK;
@@ -709,16 +709,16 @@ const char *zmq_msg_gets (zmq_msg_t *msg_, const char *property_)
}
}
// Create poller
// Create pollfd
void *zmq_poller_new ()
void *zmq_pollfd_new ()
{
return new zmq::signaler_t ();
}
// Close poller
// Close pollfd
int zmq_poller_close (void* p)
int zmq_pollfd_close (void* p)
{
zmq::signaler_t *s = (zmq::signaler_t*)p;
LIBZMQ_DELETE(s);
@@ -727,8 +727,11 @@ int zmq_poller_close (void* p)
}
// Get poller fd
zmq::fd_t zmq_poller_get_fd (void *p)
#if defined _WIN32
SOCKET zmq_pollfd_fd (void *p)
#else
int zmq_pollfd_fd (void *p)
#endif
{
zmq::signaler_t *s = (zmq::signaler_t*)p;
return s->get_fd ();
@@ -790,14 +793,14 @@ int zmq_poll (zmq_pollitem_t *items_, int nitems_, long timeout_)
}
if (thread_safe) {
if (!items_ [i].poller) {
if (!items_ [i].fd) {
if (pollfds != spollfds)
free (pollfds);
errno = EINVAL;
return -1;
}
pollfds [i].fd = zmq_poller_get_fd (items_ [i].poller);
pollfds [i].fd = items_ [i].fd;
}
else {
size_t zmq_fd_size = sizeof (zmq::fd_t);
@@ -974,12 +977,12 @@ int zmq_poll (zmq_pollitem_t *items_, int nitems_, long timeout_)
zmq::fd_t notify_fd;
if (thread_safe) {
if (!items_ [i].poller) {
if (!items_ [i].fd) {
errno = EINVAL;
return -1;
}
notify_fd = zmq_poller_get_fd (items_ [i].poller);
notify_fd = items_ [i].fd;
}
else {
size_t zmq_fd_size = sizeof (zmq::fd_t);