MAJOR: fd: replace all EV_FD_* macros with new fd_*_* inline calls
These functions have a more explicity meaning and will offer provisions
for explicit polling.
EV_FD_ISSET() has been left for now as it is still in use in checks.
diff --git a/src/checks.c b/src/checks.c
index f63edef..ac79030 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -820,7 +820,7 @@
t->expire = tick_add_ifset(now_ms, s->proxy->timeout.check);
task_queue(t);
}
- EV_FD_SET(fd, DIR_RD); /* prepare for reading reply */
+ fd_want_recv(fd); /* prepare for reading reply */
goto out_nowake;
}
else if (ret == 0 || errno == EAGAIN)
@@ -878,7 +878,7 @@
out_wakeup:
task_wakeup(t, TASK_WOKEN_IO);
out_nowake:
- EV_FD_CLR(fd, DIR_WR); /* nothing more to write */
+ fd_stop_send(fd); /* nothing more to write */
fdtab[fd].ev &= ~FD_POLL_OUT;
return 1;
out_poll:
@@ -1239,7 +1239,7 @@
/* Close the connection... */
shutdown(fd, SHUT_RDWR);
- EV_FD_CLR(fd, DIR_RD);
+ fd_stop_recv(fd);
task_wakeup(t, TASK_WOKEN_IO);
fdtab[fd].ev &= ~FD_POLL_IN;
return 1;
@@ -1484,7 +1484,7 @@
fdtab[fd].owner = t;
fdtab[fd].iocb = &check_iocb;
fdtab[fd].flags = FD_FL_TCP | FD_FL_TCP_NODELAY;
- EV_FD_SET(fd, DIR_WR); /* for connect status */
+ fd_want_send(fd); /* for connect status */
#ifdef DEBUG_FULL
assert (!EV_FD_ISSET(fd, DIR_RD));
#endif