mirror of
https://github.com/zeromq/libzmq.git
synced 2025-10-29 20:59:47 +01:00
eventfd-style signaling removed
This commit is contained in:
@@ -32,83 +32,7 @@
|
||||
#include <fcntl.h>
|
||||
#endif
|
||||
|
||||
#if defined ZMQ_HAVE_EVENTFD
|
||||
|
||||
#include <sys/eventfd.h>
|
||||
|
||||
zmq::signaler_t::signaler_t ()
|
||||
{
|
||||
// Create eventfd object.
|
||||
fd = eventfd (0, 0);
|
||||
errno_assert (fd != -1);
|
||||
|
||||
// Set to non-blocking mode.
|
||||
int flags = fcntl (fd, F_GETFL, 0);
|
||||
if (flags == -1)
|
||||
flags = 0;
|
||||
int rc = fcntl (fd, F_SETFL, flags | O_NONBLOCK);
|
||||
errno_assert (rc != -1);
|
||||
}
|
||||
|
||||
zmq::signaler_t::~signaler_t ()
|
||||
{
|
||||
int rc = close (fd);
|
||||
errno_assert (rc != -1);
|
||||
}
|
||||
|
||||
void zmq::signaler_t::signal (int signal_)
|
||||
{
|
||||
zmq_assert (signal_ >= 0 && signal_ < 64);
|
||||
uint64_t inc = 1;
|
||||
inc <<= signal_;
|
||||
ssize_t sz = write (fd, &inc, sizeof (uint64_t));
|
||||
errno_assert (sz == sizeof (uint64_t));
|
||||
}
|
||||
|
||||
uint64_t zmq::signaler_t::poll ()
|
||||
{
|
||||
// Set to blocking mode.
|
||||
int flags = fcntl (fd, F_GETFL, 0);
|
||||
if (flags == -1)
|
||||
flags = 0;
|
||||
int rc = fcntl (fd, F_SETFL, flags & ~O_NONBLOCK);
|
||||
errno_assert (rc != -1);
|
||||
|
||||
uint64_t signals;
|
||||
ssize_t sz;
|
||||
while (true) {
|
||||
sz = read (fd, &signals, sizeof (uint64_t));
|
||||
if (sz == -1) {
|
||||
if (errno == EAGAIN || errno == EINTR)
|
||||
continue;
|
||||
errno_assert (false);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
// Set to non-blocking mode.
|
||||
rc = fcntl (fd, F_SETFL, flags | O_NONBLOCK);
|
||||
errno_assert (rc != -1);
|
||||
|
||||
return signals;
|
||||
}
|
||||
|
||||
uint64_t zmq::signaler_t::check ()
|
||||
{
|
||||
uint64_t signals;
|
||||
ssize_t sz = read (fd, &signals, sizeof (uint64_t));
|
||||
if (sz == -1 && (errno == EAGAIN || errno == EINTR))
|
||||
return 0;
|
||||
errno_assert (sz != -1);
|
||||
return signals;
|
||||
}
|
||||
|
||||
zmq::fd_t zmq::signaler_t::get_fd ()
|
||||
{
|
||||
return fd;
|
||||
}
|
||||
|
||||
#elif defined ZMQ_HAVE_WINDOWS
|
||||
#if defined ZMQ_HAVE_WINDOWS
|
||||
|
||||
zmq::signaler_t::signaler_t ()
|
||||
{
|
||||
|
||||
@@ -58,17 +58,11 @@ namespace zmq
|
||||
// meantime, we'll create the socket pair manually.
|
||||
static int socketpair (int domain_, int type_, int protocol_,
|
||||
int sv_ [2]);
|
||||
|
||||
#endif
|
||||
|
||||
#if defined ZMQ_HAVE_EVENTFD
|
||||
// Eventfd descriptor.
|
||||
fd_t fd;
|
||||
#else
|
||||
// Write & read end of the socketpair.
|
||||
fd_t w;
|
||||
fd_t r;
|
||||
#endif
|
||||
|
||||
// Disable copying of fd_signeler object.
|
||||
signaler_t (const signaler_t&);
|
||||
|
||||
Reference in New Issue
Block a user