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/sock_raw.c b/src/sock_raw.c
index 4b81ae0..eb2bfbd 100644
--- a/src/sock_raw.c
+++ b/src/sock_raw.c
@@ -102,7 +102,7 @@
* place and ask the consumer to hurry.
*/
si->flags |= SI_FL_WAIT_ROOM;
- EV_FD_CLR(fd, DIR_RD);
+ fd_stop_recv(fd);
b->rex = TICK_ETERNITY;
si_chk_snd(b->cons);
return 1;
@@ -467,7 +467,7 @@
*/
conn->flags |= CO_FL_ERROR;
- EV_FD_REM(fd);
+ fd_stop_both(fd);
retval = 1;
goto out_wakeup;
}
@@ -660,7 +660,7 @@
*/
conn->flags |= CO_FL_ERROR;
- EV_FD_REM(fd);
+ fd_stop_both(fd);
return 1;
}
@@ -700,7 +700,7 @@
}
/* otherwise that's just a normal read shutdown */
- EV_FD_CLR(si_fd(si), DIR_RD);
+ fd_stop_recv(si_fd(si));
return;
do_close:
@@ -741,7 +741,7 @@
if (!(si->flags & SI_FL_WAIT_ROOM)) {
if ((ib->flags & (BF_FULL|BF_HIJACK|BF_DONT_READ)) == BF_FULL)
si->flags |= SI_FL_WAIT_ROOM;
- EV_FD_CLR(fd, DIR_RD);
+ fd_stop_recv(fd);
ib->rex = TICK_ETERNITY;
}
}
@@ -752,7 +752,7 @@
* have updated it if there has been a completed I/O.
*/
si->flags &= ~SI_FL_WAIT_ROOM;
- EV_FD_SET(fd, DIR_RD);
+ fd_want_recv(fd);
if (!(ib->flags & (BF_READ_NOEXP|BF_DONT_READ)) && !tick_isset(ib->rex))
ib->rex = tick_add_ifset(now_ms, ib->rto);
}
@@ -766,7 +766,7 @@
if (!(si->flags & SI_FL_WAIT_DATA)) {
if ((ob->flags & (BF_FULL|BF_HIJACK|BF_SHUTW_NOW)) == 0)
si->flags |= SI_FL_WAIT_DATA;
- EV_FD_CLR(fd, DIR_WR);
+ fd_stop_send(fd);
ob->wex = TICK_ETERNITY;
}
}
@@ -777,7 +777,7 @@
* have updated it if there has been a completed I/O.
*/
si->flags &= ~SI_FL_WAIT_DATA;
- EV_FD_SET(fd, DIR_WR);
+ fd_want_send(fd);
if (!tick_isset(ob->wex)) {
ob->wex = tick_add_ifset(now_ms, ob->wto);
if (tick_isset(ib->rex) && !(si->flags & SI_FL_INDEP_STR)) {
@@ -818,12 +818,12 @@
/* stop reading */
if ((ib->flags & (BF_FULL|BF_HIJACK|BF_DONT_READ)) == BF_FULL)
si->flags |= SI_FL_WAIT_ROOM;
- EV_FD_CLR(si_fd(si), DIR_RD);
+ fd_stop_recv(si_fd(si));
}
else {
/* (re)start reading */
si->flags &= ~SI_FL_WAIT_ROOM;
- EV_FD_SET(si_fd(si), DIR_RD);
+ fd_want_recv(si_fd(si));
}
}
@@ -869,7 +869,7 @@
*/
si->conn.flags |= CO_FL_ERROR;
fdtab[si_fd(si)].ev &= ~FD_POLL_STICKY;
- EV_FD_REM(si_fd(si));
+ fd_stop_both(si_fd(si));
si->flags |= SI_FL_ERR;
goto out_wakeup;
}
@@ -899,7 +899,7 @@
/* Otherwise there are remaining data to be sent in the buffer,
* which means we have to poll before doing so.
*/
- EV_FD_SET(si_fd(si), DIR_WR);
+ fd_want_send(si_fd(si));
si->flags &= ~SI_FL_WAIT_DATA;
if (!tick_isset(ob->wex))
ob->wex = tick_add_ifset(now_ms, ob->wto);