mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 23:27:04 +02:00
Code Issues Projects Releases Wiki Activity

MEDIUM: checks: don't use FD_WAIT_* anymore

Browse Source 
make use of fd_poll_* instead in preparation for a later adoption by the
connection subsystem.
This commit is contained in:
Willy Tarreau 2012-08-17 23:53:56 +02:00
parent afad0e0f80
commit 3267d36c84
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/checks.c
View File

@ -763,10 +763,8 @@ static int httpchk_build_status_header(struct server *s, char *buffer)
* the connection acknowledgement. If the proxy requires L7 health-checks, * the connection acknowledgement. If the proxy requires L7 health-checks,
* it sends the request. In other cases, it calls set_server_check_status() * it sends the request. In other cases, it calls set_server_check_status()
* to set s->check_status, s->check_duration and s->result. * to set s->check_status, s->check_duration and s->result.
* The function itself returns 0 if it needs some polling before being called
* again, otherwise 1.
*/ */
static int event_srv_chk_w(int fd) static void event_srv_chk_w(int fd)
{ {
__label__ out_wakeup, out_nowake, out_poll, out_error; __label__ out_wakeup, out_nowake, out_poll, out_error;
struct task *t = fdtab[fd].owner; struct task *t = fdtab[fd].owner;
@ -880,12 +878,13 @@ static int event_srv_chk_w(int fd)
out_nowake: out_nowake:
fd_stop_send(fd); /* nothing more to write */ fd_stop_send(fd); /* nothing more to write */
fdtab[fd].ev &= ~FD_POLL_OUT; fdtab[fd].ev &= ~FD_POLL_OUT;
return 1; return;
out_poll: out_poll:
/* The connection is still pending. We'll have to poll it /* The connection is still pending. We'll have to poll it
* before attempting to go further. */ * before attempting to go further. */
fdtab[fd].ev &= ~FD_POLL_OUT; fdtab[fd].ev &= ~FD_POLL_OUT;
return 0; fd_poll_send(fd);
return;
out_error: out_error:
s->check_conn->flags |= CO_FL_ERROR; s->check_conn->flags |= CO_FL_ERROR;
goto out_wakeup; goto out_wakeup;
@ -905,11 +904,8 @@ static int event_srv_chk_w(int fd)
* distinguish between an SSL server and a pure TCP relay). All other cases will * distinguish between an SSL server and a pure TCP relay). All other cases will
* call it with a proper error status like HCHK_STATUS_L7STS, HCHK_STATUS_L6RSP, * call it with a proper error status like HCHK_STATUS_L7STS, HCHK_STATUS_L6RSP,
* etc. * etc.
*
* The function returns 0 if it needs to be called again after some polling,
* otherwise non-zero..
*/ */
static int event_srv_chk_r(int fd) static void event_srv_chk_r(int fd)
{ {
__label__ out_wakeup; __label__ out_wakeup;
int len; int len;
@ -1242,30 +1238,27 @@ static int event_srv_chk_r(int fd)
fd_stop_recv(fd); fd_stop_recv(fd);
task_wakeup(t, TASK_WOKEN_IO); task_wakeup(t, TASK_WOKEN_IO);
fdtab[fd].ev &= ~FD_POLL_IN; fdtab[fd].ev &= ~FD_POLL_IN;
return 1; return;
wait_more_data: wait_more_data:
fdtab[fd].ev &= ~FD_POLL_IN; fdtab[fd].ev &= ~FD_POLL_IN;
return 0; fd_poll_recv(fd);
} }
/* I/O call back for the health checks. Returns FD_WAIT_*. */ /* I/O call back for the health checks. Returns 0. */
static int check_iocb(int fd) static int check_iocb(int fd)
{ {
int ret = 0;
int e; int e;
if (!fdtab[fd].owner) if (!fdtab[fd].owner)
return ret; return 0;
e = fdtab[fd].ev; e = fdtab[fd].ev;
if (e & (FD_POLL_IN | FD_POLL_HUP | FD_POLL_ERR)) if (e & (FD_POLL_IN | FD_POLL_HUP | FD_POLL_ERR))
if (!event_srv_chk_r(fd)) event_srv_chk_r(fd);
ret |= FD_WAIT_READ;
if (e & (FD_POLL_OUT | FD_POLL_ERR)) if (e & (FD_POLL_OUT | FD_POLL_ERR))
if (!event_srv_chk_w(fd)) event_srv_chk_w(fd);
ret |= FD_WAIT_WRITE; return 0;
return ret;
} }
/* /*