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] removed all res_* and RES_*

Browse Source 
The read-, write-, end- and error- status are now stored in the buffer.
This commit is contained in:
Willy Tarreau 2006-07-29 17:39:25 +02:00
parent 5446940e37
commit 0f9f5056f9
6 changed files with 51 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/types/buffers.h
View File

@ -34,12 +34,20 @@
#define BF_SHUTR_DONE 2 #define BF_SHUTR_DONE 2
#define BF_SHUTW_PENDING 4 #define BF_SHUTW_PENDING 4
#define BF_SHUTW_DONE 8 #define BF_SHUTW_DONE 8
#define BF_PARTIAL_READ 16 #define BF_PARTIAL_READ 16
#define BF_COMPLETE_READ 32 #define BF_COMPLETE_READ 32
#define BF_READ_ERROR 64 #define BF_READ_ERROR 64
#define BF_PARTIAL_WRITE 128 #define BF_READ_NULL 128
#define BF_COMPLETE_WRITE 256 #define BF_READ_STATUS (BF_PARTIAL_READ|BF_COMPLETE_READ|BF_READ_ERROR|BF_READ_NULL)
#define BF_WRITE_ERROR 512 #define BF_CLEAR_READ (~BF_READ_STATUS)
#define BF_PARTIAL_WRITE 256
#define BF_COMPLETE_WRITE 512
#define BF_WRITE_ERROR 1024
#define BF_WRITE_NULL 2048
#define BF_WRITE_STATUS (BF_PARTIAL_WRITE|BF_COMPLETE_WRITE|BF_WRITE_ERROR|BF_WRITE_NULL)
#define BF_CLEAR_WRITE (~BF_WRITE_STATUS)
@ -50,7 +58,7 @@ struct chunk {
}; };
struct buffer { struct buffer {
u_int32_t flags; u_int32_t flags; /* BF_* */
unsigned int l; /* data length */ unsigned int l; /* data length */
char *r, *w, *h, *lr; /* read ptr, write ptr, last header ptr, last read */ char *r, *w, *h, *lr; /* read ptr, write ptr, last header ptr, last read */
char *rlim; /* read limit, used for header rewriting */ char *rlim; /* read limit, used for header rewriting */

6
include/types/polling.h
View File

@ -53,12 +53,6 @@
#define POLL_USE_POLL (1<<1) #define POLL_USE_POLL (1<<1)
#define POLL_USE_EPOLL (1<<2) #define POLL_USE_EPOLL (1<<2)
/* result of an I/O event */
#define RES_SILENT 0 /* didn't happen */
#define RES_DATA 1 /* data were sent or received */
#define RES_NULL 2 /* result is 0 (read == 0), or connect without need for writing */
#define RES_ERROR 3 /* result -1 or error on the socket (eg: connect()) */
/* fd states */ /* fd states */
extern fd_set *StaticReadEvent, *StaticWriteEvent; extern fd_set *StaticReadEvent, *StaticWriteEvent;
extern int cfg_polling_mechanism; /* POLL_USE_{SELECT|POLL|EPOLL} */ extern int cfg_polling_mechanism; /* POLL_USE_{SELECT|POLL|EPOLL} */

1
include/types/session.h
View File

@ -106,7 +106,6 @@ struct session {
struct timeval srexpire; /* expiration date for a server read */ struct timeval srexpire; /* expiration date for a server read */
struct timeval swexpire; /* expiration date for a server write */ struct timeval swexpire; /* expiration date for a server write */
struct timeval cnexpire; /* expiration date for a connect */ struct timeval cnexpire; /* expiration date for a connect */
char res_cr, res_cw, res_sr, res_sw; /* results of some events */
struct proxy *proxy; /* the proxy this socket belongs to */ struct proxy *proxy; /* the proxy this socket belongs to */
int cli_fd; /* the client side fd */ int cli_fd; /* the client side fd */
int srv_fd; /* the server side fd */ int srv_fd; /* the server side fd */

1
src/client.c
View File

@ -161,7 +161,6 @@ int event_accept(int fd) {
s->srv_state = SV_STIDLE; s->srv_state = SV_STIDLE;
s->req = s->rep = NULL; /* will be allocated later */ s->req = s->rep = NULL; /* will be allocated later */
s->res_cr = s->res_cw = s->res_sr = s->res_sw = RES_SILENT;
s->cli_fd = cfd; s->cli_fd = cfd;
s->srv_fd = -1; s->srv_fd = -1;
s->req_line.len = -1; s->req_line.len = -1;

35
src/proto_http.c
View File

@ -154,7 +154,8 @@ int process_session(struct task *t)
if (s->cli_state != CL_STCLOSE || s->srv_state != SV_STCLOSE) { if (s->cli_state != CL_STCLOSE || s->srv_state != SV_STCLOSE) {
struct timeval min1, min2; struct timeval min1, min2;
s->res_cw = s->res_cr = s->res_sw = s->res_sr = RES_SILENT; s->req->flags &= BF_CLEAR_READ & BF_CLEAR_WRITE;
s->rep->flags &= BF_CLEAR_READ & BF_CLEAR_WRITE;
tv_min(&min1, &s->crexpire, &s->cwexpire); tv_min(&min1, &s->crexpire, &s->cwexpire);
tv_min(&min2, &s->srexpire, &s->swexpire); tv_min(&min2, &s->srexpire, &s->swexpire);
@ -987,7 +988,7 @@ int process_cli(struct session *t)
t->flags |= SN_FINST_R; t->flags |= SN_FINST_R;
return 1; return 1;
} }
else if (t->res_cr == RES_ERROR || t->res_cr == RES_NULL) { else if (req->flags & (BF_READ_ERROR | BF_READ_NULL)) {
/* read error, or last read : give up. */ /* read error, or last read : give up. */
tv_eternity(&t->crexpire); tv_eternity(&t->crexpire);
fd_delete(t->cli_fd); fd_delete(t->cli_fd);
@ -1021,7 +1022,7 @@ int process_cli(struct session *t)
* we're waiting for the server to connect. * we're waiting for the server to connect.
*/ */
/* read or write error */ /* read or write error */
if (t->res_cw == RES_ERROR || t->res_cr == RES_ERROR) { if (rep->flags & BF_WRITE_ERROR || req->flags & BF_READ_ERROR) {
tv_eternity(&t->crexpire); tv_eternity(&t->crexpire);
tv_eternity(&t->cwexpire); tv_eternity(&t->cwexpire);
fd_delete(t->cli_fd); fd_delete(t->cli_fd);
@ -1039,7 +1040,7 @@ int process_cli(struct session *t)
return 1; return 1;
} }
/* last read, or end of server write */ /* last read, or end of server write */
else if (t->res_cr == RES_NULL || s == SV_STSHUTW || s == SV_STCLOSE) { else if (req->flags & BF_READ_NULL || s == SV_STSHUTW || s == SV_STCLOSE) {
FD_CLR(t->cli_fd, StaticReadEvent); FD_CLR(t->cli_fd, StaticReadEvent);
tv_eternity(&t->crexpire); tv_eternity(&t->crexpire);
shutdown(t->cli_fd, SHUT_RD); shutdown(t->cli_fd, SHUT_RD);
@ -1150,7 +1151,7 @@ int process_cli(struct session *t)
return 0; /* other cases change nothing */ return 0; /* other cases change nothing */
} }
else if (c == CL_STSHUTR) { else if (c == CL_STSHUTR) {
if (t->res_cw == RES_ERROR) { if (rep->flags & BF_WRITE_ERROR) {
tv_eternity(&t->cwexpire); tv_eternity(&t->cwexpire);
fd_delete(t->cli_fd); fd_delete(t->cli_fd);
t->cli_state = CL_STCLOSE; t->cli_state = CL_STCLOSE;
@ -1223,7 +1224,7 @@ int process_cli(struct session *t)
return 0; return 0;
} }
else if (c == CL_STSHUTW) { else if (c == CL_STSHUTW) {
if (t->res_cr == RES_ERROR) { if (req->flags & BF_READ_ERROR) {
tv_eternity(&t->crexpire); tv_eternity(&t->crexpire);
fd_delete(t->cli_fd); fd_delete(t->cli_fd);
t->cli_state = CL_STCLOSE; t->cli_state = CL_STCLOSE;
@ -1239,7 +1240,7 @@ int process_cli(struct session *t)
} }
return 1; return 1;
} }
else if (t->res_cr == RES_NULL || s == SV_STSHUTW || s == SV_STCLOSE) { else if (req->flags & BF_READ_NULL || s == SV_STSHUTW || s == SV_STCLOSE) {
tv_eternity(&t->crexpire); tv_eternity(&t->crexpire);
fd_delete(t->cli_fd); fd_delete(t->cli_fd);
t->cli_state = CL_STCLOSE; t->cli_state = CL_STCLOSE;
@ -1389,11 +1390,11 @@ int process_srv(struct session *t)
srv_close_with_err(t, SN_ERR_CLICL, SN_FINST_C, 0, 0, NULL); srv_close_with_err(t, SN_ERR_CLICL, SN_FINST_C, 0, 0, NULL);
return 1; return 1;
} }
if (t->res_sw == RES_SILENT && tv_cmp2_ms(&t->cnexpire, &now) > 0) { if (!(req->flags & BF_WRITE_STATUS) && tv_cmp2_ms(&t->cnexpire, &now) > 0) {
//fprintf(stderr,"1: c=%d, s=%d, now=%d.%06d, exp=%d.%06d\n", c, s, now.tv_sec, now.tv_usec, t->cnexpire.tv_sec, t->cnexpire.tv_usec); //fprintf(stderr,"1: c=%d, s=%d, now=%d.%06d, exp=%d.%06d\n", c, s, now.tv_sec, now.tv_usec, t->cnexpire.tv_sec, t->cnexpire.tv_usec);
return 0; /* nothing changed */ return 0; /* nothing changed */
} }
else if (t->res_sw == RES_SILENT || t->res_sw == RES_ERROR) { else if (!(req->flags & BF_WRITE_STATUS) || (req->flags & BF_WRITE_ERROR)) {
/* timeout, asynchronous connect error or first write error */ /* timeout, asynchronous connect error or first write error */
//fprintf(stderr,"2: c=%d, s=%d\n", c, s); //fprintf(stderr,"2: c=%d, s=%d\n", c, s);
@ -1401,7 +1402,7 @@ int process_srv(struct session *t)
if (t->srv) if (t->srv)
t->srv->cur_sess--; t->srv->cur_sess--;
if (t->res_sw == RES_SILENT) if (!(req->flags & BF_WRITE_STATUS))
conn_err = SN_ERR_SRVTO; // it was a connect timeout. conn_err = SN_ERR_SRVTO; // it was a connect timeout.
else else
conn_err = SN_ERR_SRVCL; // it was an asynchronous connect error. conn_err = SN_ERR_SRVCL; // it was an asynchronous connect error.
@ -1974,7 +1975,7 @@ int process_srv(struct session *t)
} }
/* read error, write error */ /* read error, write error */
if (t->res_sw == RES_ERROR || t->res_sr == RES_ERROR) { if (req->flags & BF_WRITE_ERROR || rep->flags & BF_READ_ERROR) {
tv_eternity(&t->srexpire); tv_eternity(&t->srexpire);
tv_eternity(&t->swexpire); tv_eternity(&t->swexpire);
fd_delete(t->srv_fd); fd_delete(t->srv_fd);
@ -2003,7 +2004,7 @@ int process_srv(struct session *t)
* since we are in header mode, if there's no space left for headers, we * since we are in header mode, if there's no space left for headers, we
* won't be able to free more later, so the session will never terminate. * won't be able to free more later, so the session will never terminate.
*/ */
else if (t->res_sr == RES_NULL || c == CL_STSHUTW || c == CL_STCLOSE || rep->l >= rep->rlim - rep->data) { else if (rep->flags & BF_READ_NULL || c == CL_STSHUTW || c == CL_STCLOSE || rep->l >= rep->rlim - rep->data) {
FD_CLR(t->srv_fd, StaticReadEvent); FD_CLR(t->srv_fd, StaticReadEvent);
tv_eternity(&t->srexpire); tv_eternity(&t->srexpire);
shutdown(t->srv_fd, SHUT_RD); shutdown(t->srv_fd, SHUT_RD);
@ -2118,7 +2119,7 @@ int process_srv(struct session *t)
} }
else if (s == SV_STDATA) { else if (s == SV_STDATA) {
/* read or write error */ /* read or write error */
if (t->res_sw == RES_ERROR || t->res_sr == RES_ERROR) { if (req->flags & BF_WRITE_ERROR || rep->flags & BF_READ_ERROR) {
tv_eternity(&t->srexpire); tv_eternity(&t->srexpire);
tv_eternity(&t->swexpire); tv_eternity(&t->swexpire);
fd_delete(t->srv_fd); fd_delete(t->srv_fd);
@ -2141,7 +2142,7 @@ int process_srv(struct session *t)
return 1; return 1;
} }
/* last read, or end of client write */ /* last read, or end of client write */
else if (t->res_sr == RES_NULL || c == CL_STSHUTW || c == CL_STCLOSE) { else if (rep->flags & BF_READ_NULL || c == CL_STSHUTW || c == CL_STCLOSE) {
FD_CLR(t->srv_fd, StaticReadEvent); FD_CLR(t->srv_fd, StaticReadEvent);
tv_eternity(&t->srexpire); tv_eternity(&t->srexpire);
shutdown(t->srv_fd, SHUT_RD); shutdown(t->srv_fd, SHUT_RD);
@ -2234,7 +2235,7 @@ int process_srv(struct session *t)
return 0; /* other cases change nothing */ return 0; /* other cases change nothing */
} }
else if (s == SV_STSHUTR) { else if (s == SV_STSHUTR) {
if (t->res_sw == RES_ERROR) { if (req->flags & BF_WRITE_ERROR) {
//FD_CLR(t->srv_fd, StaticWriteEvent); //FD_CLR(t->srv_fd, StaticWriteEvent);
tv_eternity(&t->swexpire); tv_eternity(&t->swexpire);
fd_delete(t->srv_fd); fd_delete(t->srv_fd);
@ -2315,7 +2316,7 @@ int process_srv(struct session *t)
return 0; return 0;
} }
else if (s == SV_STSHUTW) { else if (s == SV_STSHUTW) {
if (t->res_sr == RES_ERROR) { if (rep->flags & BF_READ_ERROR) {
//FD_CLR(t->srv_fd, StaticReadEvent); //FD_CLR(t->srv_fd, StaticReadEvent);
tv_eternity(&t->srexpire); tv_eternity(&t->srexpire);
fd_delete(t->srv_fd); fd_delete(t->srv_fd);
@ -2338,7 +2339,7 @@ int process_srv(struct session *t)
return 1; return 1;
} }
else if (t->res_sr == RES_NULL || c == CL_STSHUTW || c == CL_STCLOSE) { else if (rep->flags & BF_READ_NULL || c == CL_STSHUTW || c == CL_STCLOSE) {
//FD_CLR(t->srv_fd, StaticReadEvent); //FD_CLR(t->srv_fd, StaticReadEvent);
tv_eternity(&t->srexpire); tv_eternity(&t->srexpire);
fd_delete(t->srv_fd); fd_delete(t->srv_fd);

42
src/stream_sock.c
View File

@ -100,7 +100,7 @@ int event_cli_read(int fd) {
if (ret > 0) { if (ret > 0) {
b->r += ret; b->r += ret;
b->l += ret; b->l += ret;
s->res_cr = RES_DATA; b->flags |= BF_PARTIAL_READ;
if (b->r == b->data + BUFSIZE) { if (b->r == b->data + BUFSIZE) {
b->r = b->data; /* wrap around the buffer */ b->r = b->data; /* wrap around the buffer */
@ -111,14 +111,14 @@ int event_cli_read(int fd) {
continue; continue;
} }
else if (ret == 0) { else if (ret == 0) {
s->res_cr = RES_NULL; b->flags |= BF_READ_NULL;
break; break;
} }
else if (errno == EAGAIN) {/* ignore EAGAIN */ else if (errno == EAGAIN) {/* ignore EAGAIN */
break; break;
} }
else { else {
s->res_cr = RES_ERROR; b->flags |= BF_READ_ERROR;
fdtab[fd].state = FD_STERROR; fdtab[fd].state = FD_STERROR;
break; break;
} }
@ -128,11 +128,11 @@ int event_cli_read(int fd) {
#endif #endif
} }
else { else {
s->res_cr = RES_ERROR; b->flags |= BF_READ_ERROR;
fdtab[fd].state = FD_STERROR; fdtab[fd].state = FD_STERROR;
} }
if (s->res_cr != RES_SILENT) { if (b->flags & BF_READ_STATUS) {
if (s->proxy->clitimeout && FD_ISSET(fd, StaticReadEvent)) if (s->proxy->clitimeout && FD_ISSET(fd, StaticReadEvent))
tv_delayfrom(&s->crexpire, &now, s->proxy->clitimeout); tv_delayfrom(&s->crexpire, &now, s->proxy->clitimeout);
else else
@ -172,7 +172,7 @@ int event_cli_write(int fd) {
if (fdtab[fd].state != FD_STERROR) { if (fdtab[fd].state != FD_STERROR) {
if (max == 0) { if (max == 0) {
s->res_cw = RES_NULL; b->flags |= BF_WRITE_NULL;
task_wakeup(&rq, t); task_wakeup(&rq, t);
tv_eternity(&s->cwexpire); tv_eternity(&s->cwexpire);
FD_CLR(fd, StaticWriteEvent); FD_CLR(fd, StaticWriteEvent);
@ -198,7 +198,7 @@ int event_cli_write(int fd) {
b->l -= ret; b->l -= ret;
b->w += ret; b->w += ret;
s->res_cw = RES_DATA; b->flags |= BF_PARTIAL_WRITE;
if (b->w == b->data + BUFSIZE) { if (b->w == b->data + BUFSIZE) {
b->w = b->data; /* wrap around the buffer */ b->w = b->data; /* wrap around the buffer */
@ -206,18 +206,18 @@ int event_cli_write(int fd) {
} }
else if (ret == 0) { else if (ret == 0) {
/* nothing written, just make as if we were never called */ /* nothing written, just make as if we were never called */
// s->res_cw = RES_NULL; // b->flags |= BF_WRITE_NULL;
return 0; return 0;
} }
else if (errno == EAGAIN) /* ignore EAGAIN */ else if (errno == EAGAIN) /* ignore EAGAIN */
return 0; return 0;
else { else {
s->res_cw = RES_ERROR; b->flags |= BF_WRITE_ERROR;
fdtab[fd].state = FD_STERROR; fdtab[fd].state = FD_STERROR;
} }
} }
else { else {
s->res_cw = RES_ERROR; b->flags |= BF_WRITE_ERROR;
fdtab[fd].state = FD_STERROR; fdtab[fd].state = FD_STERROR;
} }
@ -297,7 +297,7 @@ int event_srv_read(int fd) {
if (ret > 0) { if (ret > 0) {
b->r += ret; b->r += ret;
b->l += ret; b->l += ret;
s->res_sr = RES_DATA; b->flags |= BF_PARTIAL_READ;
if (b->r == b->data + BUFSIZE) { if (b->r == b->data + BUFSIZE) {
b->r = b->data; /* wrap around the buffer */ b->r = b->data; /* wrap around the buffer */
@ -308,14 +308,14 @@ int event_srv_read(int fd) {
continue; continue;
} }
else if (ret == 0) { else if (ret == 0) {
s->res_sr = RES_NULL; b->flags |= BF_READ_NULL;
break; break;
} }
else if (errno == EAGAIN) {/* ignore EAGAIN */ else if (errno == EAGAIN) {/* ignore EAGAIN */
break; break;
} }
else { else {
s->res_sr = RES_ERROR; b->flags |= BF_READ_ERROR;
fdtab[fd].state = FD_STERROR; fdtab[fd].state = FD_STERROR;
break; break;
} }
@ -325,11 +325,11 @@ int event_srv_read(int fd) {
#endif #endif
} }
else { else {
s->res_sr = RES_ERROR; b->flags |= BF_READ_ERROR;
fdtab[fd].state = FD_STERROR; fdtab[fd].state = FD_STERROR;
} }
if (s->res_sr != RES_SILENT) { if (b->flags & BF_READ_STATUS) {
if (s->proxy->srvtimeout && FD_ISSET(fd, StaticReadEvent)) if (s->proxy->srvtimeout && FD_ISSET(fd, StaticReadEvent))
tv_delayfrom(&s->srexpire, &now, s->proxy->srvtimeout); tv_delayfrom(&s->srexpire, &now, s->proxy->srvtimeout);
else else
@ -375,7 +375,7 @@ int event_srv_write(int fd) {
socklen_t lskerr = sizeof(skerr); socklen_t lskerr = sizeof(skerr);
getsockopt(fd, SOL_SOCKET, SO_ERROR, &skerr, &lskerr); getsockopt(fd, SOL_SOCKET, SO_ERROR, &skerr, &lskerr);
if (skerr) { if (skerr) {
s->res_sw = RES_ERROR; b->flags |= BF_WRITE_ERROR;
fdtab[fd].state = FD_STERROR; fdtab[fd].state = FD_STERROR;
task_wakeup(&rq, t); task_wakeup(&rq, t);
tv_eternity(&s->swexpire); tv_eternity(&s->swexpire);
@ -384,7 +384,7 @@ int event_srv_write(int fd) {
} }
} }
s->res_sw = RES_NULL; b->flags |= BF_WRITE_NULL;
task_wakeup(&rq, t); task_wakeup(&rq, t);
fdtab[fd].state = FD_STREADY; fdtab[fd].state = FD_STREADY;
tv_eternity(&s->swexpire); tv_eternity(&s->swexpire);
@ -410,7 +410,7 @@ int event_srv_write(int fd) {
b->l -= ret; b->l -= ret;
b->w += ret; b->w += ret;
s->res_sw = RES_DATA; b->flags |= BF_PARTIAL_WRITE;
if (b->w == b->data + BUFSIZE) { if (b->w == b->data + BUFSIZE) {
b->w = b->data; /* wrap around the buffer */ b->w = b->data; /* wrap around the buffer */
@ -418,18 +418,18 @@ int event_srv_write(int fd) {
} }
else if (ret == 0) { else if (ret == 0) {
/* nothing written, just make as if we were never called */ /* nothing written, just make as if we were never called */
// s->res_sw = RES_NULL; // b->flags |= BF_WRITE_NULL;
return 0; return 0;
} }
else if (errno == EAGAIN) /* ignore EAGAIN */ else if (errno == EAGAIN) /* ignore EAGAIN */
return 0; return 0;
else { else {
s->res_sw = RES_ERROR; b->flags |= BF_WRITE_ERROR;
fdtab[fd].state = FD_STERROR; fdtab[fd].state = FD_STERROR;
} }
} }
else { else {
s->res_sw = RES_ERROR; b->flags |= BF_WRITE_ERROR;
fdtab[fd].state = FD_STERROR; fdtab[fd].state = FD_STERROR;
} }