3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-09 23:36:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

ZMQII-21: Problem with fd_signaler_t::poll on socket close

Browse Source
This commit is contained in:
Martin Sustrik 2009-10-22 13:21:27 +02:00
parent 55acf365ea
commit 7cbdcc9542
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/fd_signaler.cpp
View File

@ -67,20 +67,37 @@ void zmq::fd_signaler_t::signal (int signal_)
uint64_t zmq::fd_signaler_t::poll () uint64_t zmq::fd_signaler_t::poll ()
{ {
// TODO: Can we do a blocking read on non-blocking eventfd? // Set to blocking mode.
// It's not needed as for now, so let it stay unimplemented. int flags = fcntl (fd, F_GETFL, 0);
zmq_assert (false); if (flags == -1)
return 0; 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 == 0 || (errno != EAGAIN && errno != EINTR))
break;
}
errno_assert (sz != -1);
// Set to non-blocking mode.
rc = fcntl (fd, F_SETFL, flags | O_NONBLOCK);
errno_assert (rc != -1);
return signals;
} }
uint64_t zmq::fd_signaler_t::check () uint64_t zmq::fd_signaler_t::check ()
{ {
uint64_t val; uint64_t signals;
ssize_t sz = read (fd, &val, sizeof (uint64_t)); ssize_t sz = read (fd, &signals, sizeof (uint64_t));
if (sz == -1 && (errno == EAGAIN || errno == EINTR)) if (sz == -1 && (errno == EAGAIN || errno == EINTR))
return 0; return 0;
errno_assert (sz != -1); errno_assert (sz != -1);
return val; return signals;
} }
zmq::fd_t zmq::fd_signaler_t::get_fd () zmq::fd_t zmq::fd_signaler_t::get_fd ()