Commit ed1009b3 authored by Constantin Rack's avatar Constantin Rack

Merge pull request #1584 from ymax/master

fixed zmq assertion in signaler.cpp under ubuntu
parents 2452c598 e9e03f5a
...@@ -289,6 +289,10 @@ void zmq::signaler_t::recv () ...@@ -289,6 +289,10 @@ void zmq::signaler_t::recv ()
#if defined ZMQ_HAVE_EVENTFD #if defined ZMQ_HAVE_EVENTFD
uint64_t dummy; uint64_t dummy;
ssize_t sz = read (r, &dummy, sizeof (dummy)); ssize_t sz = read (r, &dummy, sizeof (dummy));
if (sz == -1) {
errno_assert (errno == EAGAIN);
}
else {
errno_assert (sz == sizeof (dummy)); errno_assert (sz == sizeof (dummy));
// If we accidentally grabbed the next signal(s) along with the current // If we accidentally grabbed the next signal(s) along with the current
...@@ -301,6 +305,7 @@ void zmq::signaler_t::recv () ...@@ -301,6 +305,7 @@ void zmq::signaler_t::recv ()
} }
zmq_assert (dummy == 1); zmq_assert (dummy == 1);
}
#else #else
unsigned char dummy; unsigned char dummy;
#if defined ZMQ_HAVE_WINDOWS #if defined ZMQ_HAVE_WINDOWS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment