diff --git a/src/ev_select.c b/src/ev_select.c index 2a62ba92c..9b6e2d0df 100644 --- a/src/ev_select.c +++ b/src/ev_select.c @@ -26,15 +26,15 @@ /* private data */ static int maxfd; /* # of the highest fd + 1 */ -static fd_set *fd_evts[2]; +static unsigned int *fd_evts[2]; static THREAD_LOCAL fd_set *tmp_evts[2]; /* Immediately remove the entry upon close() */ REGPRM1 static void __fd_clo(int fd) { HA_SPIN_LOCK(POLL_LOCK, &poll_lock); - FD_CLR(fd, fd_evts[DIR_RD]); - FD_CLR(fd, fd_evts[DIR_WR]); + hap_fd_clr(fd, fd_evts[DIR_RD]); + hap_fd_clr(fd, fd_evts[DIR_WR]); HA_SPIN_UNLOCK(POLL_LOCK, &poll_lock); } @@ -75,21 +75,20 @@ REGPRM2 static void _do_poll(struct poller *p, int exp) /* poll status changed, update the lists */ HA_SPIN_LOCK(POLL_LOCK, &poll_lock); if ((eo & ~en) & FD_EV_POLLED_R) - FD_CLR(fd, fd_evts[DIR_RD]); + hap_fd_clr(fd, fd_evts[DIR_RD]); else if ((en & ~eo) & FD_EV_POLLED_R) { - FD_SET(fd, fd_evts[DIR_RD]); + hap_fd_set(fd, fd_evts[DIR_RD]); if (fd > max_add_fd) max_add_fd = fd; } if ((eo & ~en) & FD_EV_POLLED_W) - FD_CLR(fd, fd_evts[DIR_WR]); + hap_fd_clr(fd, fd_evts[DIR_WR]); else if ((en & ~eo) & FD_EV_POLLED_W) { - FD_SET(fd, fd_evts[DIR_WR]); + hap_fd_set(fd, fd_evts[DIR_WR]); if (fd > max_add_fd) max_add_fd = fd; } - HA_SPIN_UNLOCK(POLL_LOCK, &poll_lock); } } @@ -123,16 +122,6 @@ REGPRM2 static void _do_poll(struct poller *p, int exp) writenotnull |= (*(((int*)tmp_evts[DIR_WR])+i) = *(((int*)fd_evts[DIR_WR])+i)) != 0; } -#if 0 - /* just a verification code, needs to be removed for performance */ - for (i=0; i