mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-10 09:07:02 +02:00
Code Issues Projects Releases Wiki Activity

CLEANUP: connection: use conn_ctrl_ready() instead of checking the flag

Browse Source 
It's easier and safer to rely on conn_ctrl_ready() everywhere than to
check the flag itself. It will also simplify adding extra checks later
if needed. Some useless controls for !ctrl have been removed, as the
CTRL_READY flag itself guarantees ctrl is set.
This commit is contained in:
Willy Tarreau 2014-01-23 13:50:42 +01:00
parent d8375891fc
commit 3c72872da1
7 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/proto/connection.h
View File

@ -50,7 +50,7 @@ static inline int conn_xprt_ready(struct connection *conn)
} }
/* returns true is the control layer is ready */ /* returns true is the control layer is ready */
static inline int conn_ctrl_ready(struct connection *conn) static inline int conn_ctrl_ready(const struct connection *conn)
{ {
return (conn->flags & CO_FL_CTRL_READY); return (conn->flags & CO_FL_CTRL_READY);
} }
@ -88,11 +88,12 @@ static inline void conn_xprt_close(struct connection *conn)
/* Initializes the connection's control layer which essentially consists in /* Initializes the connection's control layer which essentially consists in
* registering the file descriptor for polling and setting the CO_FL_CTRL_READY * registering the file descriptor for polling and setting the CO_FL_CTRL_READY
* flag. * flag. The caller is responsible for ensuring that the control layer is
* already assigned to the connection prior to the call.
*/ */
static inline void conn_ctrl_init(struct connection *conn) static inline void conn_ctrl_init(struct connection *conn)
{ {
if (!(conn->flags & CO_FL_CTRL_READY)) { if (!conn_ctrl_ready(conn)) {
int fd = conn->t.sock.fd; int fd = conn->t.sock.fd;
fd_insert(fd); fd_insert(fd);
@ -137,7 +138,7 @@ static inline void conn_force_close(struct connection *conn)
if ((conn->flags & CO_FL_XPRT_READY) && conn->xprt && conn->xprt->close) if ((conn->flags & CO_FL_XPRT_READY) && conn->xprt && conn->xprt->close)
conn->xprt->close(conn); conn->xprt->close(conn);
if (conn->flags & CO_FL_CTRL_READY) if (conn_ctrl_ready(conn))
fd_delete(conn->t.sock.fd); fd_delete(conn->t.sock.fd);
conn->flags &= ~(CO_FL_XPRT_READY|CO_FL_CTRL_READY); conn->flags &= ~(CO_FL_XPRT_READY|CO_FL_CTRL_READY);
@ -166,7 +167,7 @@ static inline void conn_refresh_polling_flags(struct connection *conn)
{ {
conn->flags &= ~(CO_FL_WAIT_ROOM | CO_FL_WAIT_DATA); conn->flags &= ~(CO_FL_WAIT_ROOM | CO_FL_WAIT_DATA);
if ((conn->flags & CO_FL_CTRL_READY) && conn->ctrl) { if (conn_ctrl_ready(conn)) {
unsigned int flags = conn->flags & ~(CO_FL_CURR_RD_ENA | CO_FL_CURR_WR_ENA); unsigned int flags = conn->flags & ~(CO_FL_CURR_RD_ENA | CO_FL_CURR_WR_ENA);
if (fd_recv_active(conn->t.sock.fd)) if (fd_recv_active(conn->t.sock.fd))
@ -395,7 +396,7 @@ static inline void conn_sock_read0(struct connection *c)
/* we don't risk keeping ports unusable if we found the /* we don't risk keeping ports unusable if we found the
* zero from the other side. * zero from the other side.
*/ */
if (c->flags & CO_FL_CTRL_READY) if (conn_ctrl_ready(c))
fdtab[c->t.sock.fd].linger_risk = 0; fdtab[c->t.sock.fd].linger_risk = 0;
} }
@ -484,7 +485,7 @@ static inline void conn_get_from_addr(struct connection *conn)
if (conn->flags & CO_FL_ADDR_FROM_SET) if (conn->flags & CO_FL_ADDR_FROM_SET)
return; return;
if (!(conn->flags & CO_FL_CTRL_READY) || !conn->ctrl || !conn->ctrl->get_src) if (!conn_ctrl_ready(conn) || !conn->ctrl->get_src)
return; return;
if (conn->ctrl->get_src(conn->t.sock.fd, (struct sockaddr *)&conn->addr.from, if (conn->ctrl->get_src(conn->t.sock.fd, (struct sockaddr *)&conn->addr.from,
@ -500,7 +501,7 @@ static inline void conn_get_to_addr(struct connection *conn)
if (conn->flags & CO_FL_ADDR_TO_SET) if (conn->flags & CO_FL_ADDR_TO_SET)
return; return;
if (!(conn->flags & CO_FL_CTRL_READY) || !conn->ctrl || !conn->ctrl->get_dst) if (!conn_ctrl_ready(conn) || !conn->ctrl->get_dst)
return; return;
if (conn->ctrl->get_dst(conn->t.sock.fd, (struct sockaddr *)&conn->addr.to, if (conn->ctrl->get_dst(conn->t.sock.fd, (struct sockaddr *)&conn->addr.to,

2
src/checks.c
View File

@ -800,7 +800,7 @@ static int retrieve_errno_from_socket(struct connection *conn)
if (conn->flags & CO_FL_ERROR && ((errno && errno != EAGAIN) || !conn->ctrl)) if (conn->flags & CO_FL_ERROR && ((errno && errno != EAGAIN) || !conn->ctrl))
return 1; return 1;
if (!(conn->flags & CO_FL_CTRL_READY) || !conn->ctrl) if (!conn_ctrl_ready(conn))
return 0; return 0;
if (getsockopt(conn->t.sock.fd, SOL_SOCKET, SO_ERROR, &skerr, &lskerr) == 0) if (getsockopt(conn->t.sock.fd, SOL_SOCKET, SO_ERROR, &skerr, &lskerr) == 0)

6
src/connection.c
View File

@ -157,7 +157,7 @@ void conn_update_data_polling(struct connection *c)
{ {
unsigned int f = c->flags; unsigned int f = c->flags;
if (!(c->flags & CO_FL_CTRL_READY)) if (!conn_ctrl_ready(c))
return; return;
/* update read status if needed */ /* update read status if needed */
@ -192,7 +192,7 @@ void conn_update_sock_polling(struct connection *c)
{ {
unsigned int f = c->flags; unsigned int f = c->flags;
if (!(c->flags & CO_FL_CTRL_READY)) if (!conn_ctrl_ready(c))
return; return;
/* update read status if needed */ /* update read status if needed */
@ -248,7 +248,7 @@ int conn_recv_proxy(struct connection *conn, int flag)
if (conn->flags & CO_FL_SOCK_RD_SH) if (conn->flags & CO_FL_SOCK_RD_SH)
goto fail; goto fail;
if (!(conn->flags & CO_FL_CTRL_READY)) if (!conn_ctrl_ready(conn))
goto fail; goto fail;
if (!fd_recv_ready(conn->t.sock.fd)) if (!fd_recv_ready(conn->t.sock.fd))

2
src/dumpstats.c
View File

@ -4286,7 +4286,7 @@ static void http_stats_io_handler(struct stream_interface *si)
static inline const char *get_conn_ctrl_name(const struct connection *conn) static inline const char *get_conn_ctrl_name(const struct connection *conn)
{ {
if (!(conn->flags & CO_FL_CTRL_READY) || !conn->ctrl) if (!conn_ctrl_ready(conn))
return "NONE"; return "NONE";
return conn->ctrl->name; return conn->ctrl->name;
} }

12
src/proto_http.c
View File

@ -2502,7 +2502,7 @@ int http_wait_for_request(struct session *s, struct channel *req, int an_bit)
req->flags |= CF_READ_DONTWAIT; /* try to get back here ASAP */ req->flags |= CF_READ_DONTWAIT; /* try to get back here ASAP */
s->rep->flags &= ~CF_EXPECT_MORE; /* speed up sending a previous response */ s->rep->flags &= ~CF_EXPECT_MORE; /* speed up sending a previous response */
#ifdef TCP_QUICKACK #ifdef TCP_QUICKACK
if (s->listener->options & LI_O_NOQUICKACK && req->buf->i && objt_conn(s->req->prod->end) && (__objt_conn(s->req->prod->end)->flags & CO_FL_CTRL_READY)) { if (s->listener->options & LI_O_NOQUICKACK && req->buf->i && objt_conn(s->req->prod->end) && conn_ctrl_ready(__objt_conn(s->req->prod->end))) {
/* We need more data, we have to re-enable quick-ack in case we /* We need more data, we have to re-enable quick-ack in case we
* previously disabled it, otherwise we might cause the client * previously disabled it, otherwise we might cause the client
* to delay next data. * to delay next data.
@ -3031,13 +3031,13 @@ http_req_get_intercept_rule(struct proxy *px, struct list *rules, struct session
break; break;
case HTTP_REQ_ACT_SET_TOS: case HTTP_REQ_ACT_SET_TOS:
if ((cli_conn = objt_conn(s->req->prod->end)) && (cli_conn->flags & CO_FL_CTRL_READY)) if ((cli_conn = objt_conn(s->req->prod->end)) && conn_ctrl_ready(cli_conn))
inet_set_tos(cli_conn->t.sock.fd, cli_conn->addr.from, rule->arg.tos); inet_set_tos(cli_conn->t.sock.fd, cli_conn->addr.from, rule->arg.tos);
break; break;
case HTTP_REQ_ACT_SET_MARK: case HTTP_REQ_ACT_SET_MARK:
#ifdef SO_MARK #ifdef SO_MARK
if ((cli_conn = objt_conn(s->req->prod->end)) && (cli_conn->flags & CO_FL_CTRL_READY)) if ((cli_conn = objt_conn(s->req->prod->end)) && conn_ctrl_ready(cli_conn))
setsockopt(cli_conn->t.sock.fd, SOL_SOCKET, SO_MARK, &rule->arg.mark, sizeof(rule->arg.mark)); setsockopt(cli_conn->t.sock.fd, SOL_SOCKET, SO_MARK, &rule->arg.mark, sizeof(rule->arg.mark));
#endif #endif
break; break;
@ -3117,13 +3117,13 @@ http_res_get_intercept_rule(struct proxy *px, struct list *rules, struct session
break; break;
case HTTP_RES_ACT_SET_TOS: case HTTP_RES_ACT_SET_TOS:
if ((cli_conn = objt_conn(s->req->prod->end)) && (cli_conn->flags & CO_FL_CTRL_READY)) if ((cli_conn = objt_conn(s->req->prod->end)) && conn_ctrl_ready(cli_conn))
inet_set_tos(cli_conn->t.sock.fd, cli_conn->addr.from, rule->arg.tos); inet_set_tos(cli_conn->t.sock.fd, cli_conn->addr.from, rule->arg.tos);
break; break;
case HTTP_RES_ACT_SET_MARK: case HTTP_RES_ACT_SET_MARK:
#ifdef SO_MARK #ifdef SO_MARK
if ((cli_conn = objt_conn(s->req->prod->end)) && (cli_conn->flags & CO_FL_CTRL_READY)) if ((cli_conn = objt_conn(s->req->prod->end)) && conn_ctrl_ready(cli_conn))
setsockopt(cli_conn->t.sock.fd, SOL_SOCKET, SO_MARK, &rule->arg.mark, sizeof(rule->arg.mark)); setsockopt(cli_conn->t.sock.fd, SOL_SOCKET, SO_MARK, &rule->arg.mark, sizeof(rule->arg.mark));
#endif #endif
break; break;
@ -4004,7 +4004,7 @@ int http_process_request(struct session *s, struct channel *req, int an_bit)
* the client to delay further data. * the client to delay further data.
*/ */
if ((s->listener->options & LI_O_NOQUICKACK) && if ((s->listener->options & LI_O_NOQUICKACK) &&
cli_conn && (cli_conn->flags & CO_FL_CTRL_READY) && cli_conn && conn_ctrl_ready(cli_conn) &&
((msg->flags & HTTP_MSGF_TE_CHNK) || ((msg->flags & HTTP_MSGF_TE_CHNK) ||
(msg->body_len > req->buf->i - txn->req.eoh - 2))) (msg->body_len > req->buf->i - txn->req.eoh - 2)))
setsockopt(cli_conn->t.sock.fd, IPPROTO_TCP, TCP_QUICKACK, &one, sizeof(one)); setsockopt(cli_conn->t.sock.fd, IPPROTO_TCP, TCP_QUICKACK, &one, sizeof(one));

2
src/proto_tcp.c
View File

@ -626,7 +626,7 @@ int tcp_connect_probe(struct connection *conn)
if (conn->flags & CO_FL_ERROR) if (conn->flags & CO_FL_ERROR)
return 0; return 0;
if (!(conn->flags & CO_FL_CTRL_READY)) if (!conn_ctrl_ready(conn))
return 0; return 0;
if (!(conn->flags & CO_FL_WAIT_L4_CONN)) if (!(conn->flags & CO_FL_WAIT_L4_CONN))

4
src/ssl_sock.c
View File

@ -1097,7 +1097,7 @@ static int ssl_sock_init(struct connection *conn)
if (conn->xprt_ctx) if (conn->xprt_ctx)
return 0; return 0;
if (!(conn->flags & CO_FL_CTRL_READY)) if (!conn_ctrl_ready(conn))
return 0; return 0;
if (global.maxsslconn && sslconns >= global.maxsslconn) { if (global.maxsslconn && sslconns >= global.maxsslconn) {
@ -1169,7 +1169,7 @@ int ssl_sock_handshake(struct connection *conn, unsigned int flag)
{ {
int ret; int ret;
if (!(conn->flags & CO_FL_CTRL_READY)) if (!conn_ctrl_ready(conn))
return 0; return 0;
if (!conn->xprt_ctx) if (!conn->xprt_ctx)