commit 4e6049e55360e642fceba7829b59f3a262b2df9a
author Willy Tarreau <wtarreau@exceliance.fr> Fri Jul 06 10:53:51 2012 +0200
committer Willy Tarreau <w@1wt.eu> Sun Sep 02 21:51:27 2012 +0200
tree 0f6cdb5f867143bab4b5d3e3270a9d5e2e1e63a3
parent 505e34a36d40a131c4d5cd8f63eac90dd305c8cb

MINOR: fd: add a new I/O handler to fdtab

This one will eventually replace both cb[] handlers. At the moment it
is not used yet.

include/types/fd.h

diff --git a/include/types/fd.h b/include/types/fd.h
index 3b00994..c4133a9 100644
--- a/include/types/fd.h
+++ b/include/types/fd.h
@@ -51,6 +51,11 @@
 #define FD_POLL_DATA    (FD_POLL_IN  | FD_POLL_OUT)
 #define FD_POLL_STICKY  (FD_POLL_ERR | FD_POLL_HUP)
 
+/* flags that an I/O callback may return */
+#define FD_WAIT_READ    0x01
+#define FD_WAIT_WRITE   0x02
+#define FD_WAIT_BOTH    (FD_WAIT_READ|FD_WAIT_WRITE)
+
 /* bit values for fdtab[fd]->flags. Most of them are used to hold a value
  * consecutive to a behaviour change.
  */
@@ -60,6 +65,7 @@
 
 /* info about one given fd */
 struct fdtab {
+	int (*iocb)(int fd);                 /* I/O handler, returns FD_WAIT_* */
 	struct {
 		int (*f)(int fd);            /* read/write function */
 	} cb[DIR_SIZE];

src/checks.c

diff --git a/src/checks.c b/src/checks.c
index 2c2ee7e..f24e1fa 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -1465,6 +1465,7 @@
 						fdtab[fd].owner = t;
 						fdtab[fd].cb[DIR_RD].f = &event_srv_chk_r;
 						fdtab[fd].cb[DIR_WR].f = &event_srv_chk_w;
+						fdtab[fd].iocb = NULL;
 						fdtab[fd].flags = FD_FL_TCP | FD_FL_TCP_NODELAY;
 						EV_FD_SET(fd, DIR_WR);  /* for connect status */
 #ifdef DEBUG_FULL

src/proto_tcp.c

diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index ddc8269..41a31b8 100644
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -476,10 +476,12 @@
 	if ((si->ob->flags & BF_OUT_EMPTY) || si->send_proxy_ofs) {
 		fdtab[fd].cb[DIR_RD].f = tcp_connect_read;
 		fdtab[fd].cb[DIR_WR].f = tcp_connect_write;
+		fdtab[fd].iocb = NULL;
 	}
 	else {
 		fdtab[fd].cb[DIR_RD].f = si_data(si)->read;
 		fdtab[fd].cb[DIR_WR].f = si_data(si)->write;
+		fdtab[fd].iocb = NULL;
 	}
 
 	fd_insert(fd);
@@ -821,6 +823,7 @@
 	fdtab[fd].flags = FD_FL_TCP | ((listener->options & LI_O_NOLINGER) ? FD_FL_TCP_NOLING : 0);
 	fdtab[fd].cb[DIR_RD].f = listener->proto->accept;
 	fdtab[fd].cb[DIR_WR].f = NULL; /* never called */
+	fdtab[fd].iocb = NULL;
 	fd_insert(fd);
 
  tcp_return:

src/proto_uxst.c

diff --git a/src/proto_uxst.c b/src/proto_uxst.c
index f637601..2dc5613 100644
--- a/src/proto_uxst.c
+++ b/src/proto_uxst.c
@@ -264,6 +264,7 @@
 	fd_insert(fd);
 	fdtab[fd].cb[DIR_RD].f = listener->proto->accept;
 	fdtab[fd].cb[DIR_WR].f = NULL; /* never called */
+	fdtab[fd].iocb = NULL;
 	fdtab[fd].owner = listener; /* reference the listener instead of a task */
 	return ERR_NONE;
  err_rename:

src/session.c

diff --git a/src/session.c b/src/session.c
index c67d85e..0b0c3da 100644
--- a/src/session.c
+++ b/src/session.c
@@ -284,6 +284,7 @@
 	fdtab[cfd].flags = 0;
 	fdtab[cfd].cb[DIR_RD].f = si_data(&s->si[0])->read;
 	fdtab[cfd].cb[DIR_WR].f = si_data(&s->si[0])->write;
+	fdtab[cfd].iocb = NULL;
 	EV_FD_SET(cfd, DIR_RD);
 
 	if (p->accept && (ret = p->accept(s)) <= 0) {