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

Merge pull request #469 from hurtonm/code_cleanup

Browse Source 
Minor code cleanup
This commit is contained in:
Ian Barber 2012-11-13 04:29:44 -08:00
commit 30eaadddc3
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/epoll.cpp
View File

@ -140,9 +140,10 @@ void zmq::epoll_t::loop ()
// Wait for events.
int n = epoll_wait (epoll_fd, &ev_buf [0], max_io_events,
timeout ? timeout : -1);
if (n == -1 && errno == EINTR)
if (n == -1) {
errno_assert (errno == EINTR);
continue;
errno_assert (n != -1);
}
for (int i = 0; i < n; i ++) {
poll_entry_t *pe = ((poll_entry_t*) ev_buf [i].data.ptr);

5
src/kqueue.cpp
View File

@ -163,9 +163,10 @@ void zmq::kqueue_t::loop ()
timespec ts = {timeout / 1000, (timeout % 1000) * 1000000};
int n = kevent (kqueue_fd, NULL, 0, &ev_buf [0], max_io_events,
timeout ? &ts: NULL);
if (n == -1 && errno == EINTR)
if (n == -1) {
errno_assert (errno == EINTR);
continue;
errno_assert (n != -1);
}
for (int i = 0; i < n; i ++) {
poll_entry_t *pe = (poll_entry_t*) ev_buf [i].udata;

6
src/poll.cpp
View File

@ -125,10 +125,10 @@ void zmq::poll_t::loop ()
// Wait for events.
int rc = poll (&pollset [0], pollset.size (), timeout ? timeout : -1);
if (rc == -1 && errno == EINTR)
if (rc == -1) {
errno_assert (errno == EINTR);
continue;
errno_assert (rc != -1);
}
// If there are no events (i.e. it's a timeout) there's no point
// in checking the pollset.

5
src/select.cpp
View File

@ -168,9 +168,10 @@ void zmq::select_t::loop ()
#else
int rc = select (maxfd + 1, &readfds, &writefds, &exceptfds,
timeout ? &tv : NULL);
if (rc == -1 && errno == EINTR)
if (rc == -1) {
errno_assert (errno == EINTR);
continue;
errno_assert (rc != -1);
}
#endif
// If there are no events (i.e. it's a timeout) there's no point