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

MINOR: server: Factorize code to deal with connections removed from an idle list

Browse Source 
The srv_del_conn_from_list() function is now responsible to update the server
counters and the connection flags when a connection is removed from an idle list
(safe, idle or available). It is called when a connection is released or when a
connection is set as private. This function also removes the connection from the
idle list if necessary.
This commit is contained in:
Christopher Faulet 2020-07-02 16:03:30 +02:00
parent 3d52f0f1f8
commit c6e7563b1a
2 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
include/haproxy/connection.h
View File

@ -346,11 +346,12 @@ static inline void conn_set_owner(struct connection *conn, void *owner, void (*c
/* Mark the connection <conn> as private and remove it from the available connection list */ /* Mark the connection <conn> as private and remove it from the available connection list */
static inline void conn_set_private(struct connection *conn) static inline void conn_set_private(struct connection *conn)
{ {
if (!(conn->flags & CO_FL_PRIVATE)) {
conn->flags |= CO_FL_PRIVATE; conn->flags |= CO_FL_PRIVATE;
/* Be sure to remove the connection from the available_conns list */ if (obj_type(conn->target) == OBJ_TYPE_SERVER)
if (!MT_LIST_ISEMPTY(&conn->list)) srv_del_conn_from_list(__objt_server(conn->target), conn);
MT_LIST_DEL(&conn->list); }
} }
/* Allocates a struct sockaddr from the pool if needed, assigns it to *sap and /* Allocates a struct sockaddr from the pool if needed, assigns it to *sap and
@ -464,10 +465,17 @@ static inline void conn_force_unsubscribe(struct connection *conn)
/* Releases a connection previously allocated by conn_new() */ /* Releases a connection previously allocated by conn_new() */
static inline void conn_free(struct connection *conn) static inline void conn_free(struct connection *conn)
{ {
/* Remove ourself from the session's connections list, if any. */ if (conn->flags & CO_FL_PRIVATE) {
if (!LIST_ISEMPTY(&conn->session_list)) { /* The connection is private, so remove it from the session's
* connections list, if any.
*/
if (!LIST_ISEMPTY(&conn->session_list))
session_unown_conn(conn->owner, conn); session_unown_conn(conn->owner, conn);
} }
else {
if (obj_type(conn->target) == OBJ_TYPE_SERVER)
srv_del_conn_from_list(__objt_server(conn->target), conn);
}
sockaddr_free(&conn->src); sockaddr_free(&conn->src);
sockaddr_free(&conn->dst); sockaddr_free(&conn->dst);
@ -488,23 +496,7 @@ static inline void conn_free(struct connection *conn)
if (conn->ctx != NULL && conn->mux == NULL) if (conn->ctx != NULL && conn->mux == NULL)
*(void **)conn->ctx = NULL; *(void **)conn->ctx = NULL;
/* The connection is currently in the server's idle list, so tell it
* there's one less connection available in that list.
*/
if (conn->idle_time > 0) {
struct server *srv = __objt_server(conn->target);
_HA_ATOMIC_SUB(&srv->curr_idle_conns, 1);
_HA_ATOMIC_SUB(conn->flags & CO_FL_SAFE_LIST ? &srv->curr_safe_nb : &srv->curr_idle_nb, 1);
_HA_ATOMIC_SUB(&srv->curr_idle_thr[tid], 1);
} else {
struct server *srv = objt_server(conn->target);
if (srv)
_HA_ATOMIC_SUB(&srv->curr_used_conns, 1);
}
conn_force_unsubscribe(conn); conn_force_unsubscribe(conn);
MT_LIST_DEL((struct mt_list *)&conn->list);
pool_free(pool_head_connection, conn); pool_free(pool_head_connection, conn);
} }

21
include/haproxy/server.h
View File

@ -263,6 +263,27 @@ static inline void srv_use_idle_conn(struct server *srv, struct connection *conn
srv->est_need_conns = srv->curr_used_conns; srv->est_need_conns = srv->curr_used_conns;
} }
static inline void srv_del_conn_from_list(struct server *srv, struct connection *conn)
{
if (conn->flags & CO_FL_LIST_MASK) {
/* The connection is currently in the server's idle list, so tell it
* there's one less connection available in that list.
*/
_HA_ATOMIC_SUB(&srv->curr_idle_conns, 1);
_HA_ATOMIC_SUB(conn->flags & CO_FL_SAFE_LIST ? &srv->curr_safe_nb : &srv->curr_idle_nb, 1);
_HA_ATOMIC_SUB(&srv->curr_idle_thr[tid], 1);
}
else {
/* The connction is not private and not in any server's idle
* list, so decrement the current number of used connections
*/
_HA_ATOMIC_SUB(&srv->curr_used_conns, 1);
}
/* Remove the connection from any list (safe, idle or available) */
MT_LIST_DEL((struct mt_list *)&conn->list);
}
/* This adds an idle connection to the server's list if the connection is /* This adds an idle connection to the server's list if the connection is
* reusable, not held by any owner anymore, but still has available streams. * reusable, not held by any owner anymore, but still has available streams.
*/ */