3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-28 07:58:14 +08:00
Code Issues Projects Releases Wiki Activity

fixed zmq assertion in signaler.cpp under ubuntu

Browse Source
This commit is contained in:
Maxim Yakhontov 2015-09-18 20:48:08 +06:00
parent 2452c598b7
commit e9e03f5ade
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/signaler.cpp
View File

@ -289,18 +289,23 @@ 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));
errno_assert (sz == sizeof (dummy)); if (sz == -1) {
errno_assert (errno == EAGAIN);
// If we accidentally grabbed the next signal(s) along with the current
// one, return it back to the eventfd object.
if (unlikely (dummy > 1)) {
const uint64_t inc = dummy - 1;
ssize_t sz2 = write (w, &inc, sizeof (inc));
errno_assert (sz2 == sizeof (inc));
return;
} }
else {
errno_assert (sz == sizeof (dummy));
zmq_assert (dummy == 1); // If we accidentally grabbed the next signal(s) along with the current
// one, return it back to the eventfd object.
if (unlikely (dummy > 1)) {
const uint64_t inc = dummy - 1;
ssize_t sz2 = write (w, &inc, sizeof (inc));
errno_assert (sz2 == sizeof (inc));
return;
}
zmq_assert (dummy == 1);
}
#else #else
unsigned char dummy; unsigned char dummy;
#if defined ZMQ_HAVE_WINDOWS #if defined ZMQ_HAVE_WINDOWS