diff options
author | Søren Sandmann Pedersen <sandmann@redhat.com> | 2009-04-03 04:10:16 -0400 |
---|---|---|
committer | Søren Sandmann Pedersen <sandmann@redhat.com> | 2009-04-03 04:10:16 -0400 |
commit | e68889c95e5d625b5b2e2f67a7e6bb49d3ea6f27 (patch) | |
tree | 7f0275be1a07455a7bb613cef2b194b2f3ddc2be | |
parent | 9cdb80aa2b160511098f7e3765ab7f20f543621c (diff) |
Use enabled instead of disabled in epoll
-rw-r--r-- | epoll.c | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -8,7 +8,7 @@ struct FdInfo gpointer data; unsigned int mask : 16; unsigned int valid : 1; - unsigned int disabled : 1; + unsigned int enabled : 1; }; struct nul_poll_t @@ -47,9 +47,10 @@ nul_poll_add_fd (nul_poll_t *nul_poll, nul_poll->n_fds++; - nul_poll->fd_info[fd].valid = TRUE; nul_poll->fd_info[fd].mask = mask; nul_poll->fd_info[fd].data = data; + nul_poll->fd_info[fd].valid = TRUE; + nul_poll->fd_info[fd].enabled = TRUE; } gboolean @@ -96,7 +97,7 @@ nul_poll_reenable_fd (nul_poll_t *nul_poll, { g_return_if_fail (nul_poll_has_fd (nul_poll, fd)); - nul_poll->fd_info[fd].disabled = FALSE; + nul_poll->fd_info[fd].enabled = TRUE; } nul_poll_event_t * @@ -116,7 +117,7 @@ nul_poll_wait (nul_poll_t *nul_poll, for (i = 0; i < nul_poll->n_fd_infos; ++i) { if (nul_poll->fd_info[i].valid && - !nul_poll->fd_info[i].disabled && + nul_poll->fd_info[i].enabled && nul_poll->fd_info[i].mask != 0) { fds[j].events = 0; @@ -175,7 +176,7 @@ nul_poll_wait (nul_poll_t *nul_poll, events[j].events |= NUL_POLL_PRIORITY; events[j].fd = fds[i].fd; - nul_poll->fd_info[fds[i].fd].disabled = TRUE; + nul_poll->fd_info[fds[i].fd].enabled = FALSE; } } } |