mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 06:11:32 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: sessions: Start to store the outgoing connection in sessions.

Browse Source 
Introduce a new field in session, "srv_conn", and a linked list of sessions
in the connection. It will be used later when we'll switch connections
from being managed by the stream, to being managed by the session.
This commit is contained in:
Olivier Houchard 2018-11-13 16:44:31 +01:00 committed by Willy Tarreau
parent 060ed43361
commit 131fd89d5a
4 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/proto/connection.h
View File

@ -558,6 +558,7 @@ static inline void conn_init(struct connection *conn)
conn->destroy_cb = NULL;
conn->proxy_netns = NULL;
LIST_INIT(&conn->list);
LIST_INIT(&conn->session_list);
conn->send_wait = NULL;
conn->recv_wait = NULL;
}
@ -664,6 +665,13 @@ static inline void conn_force_unsubscribe(struct connection *conn)
/* Releases a connection previously allocated by conn_new() */
static inline void conn_free(struct connection *conn)
{
struct session *sess, *sess_back;
list_for_each_entry_safe(sess, sess_back, &conn->session_list, conn_list) {
sess->srv_conn = NULL;
LIST_DEL(&sess->conn_list);
LIST_INIT(&sess->conn_list);
}
conn_force_unsubscribe(conn);
pool_free(pool_head_connection, conn);
}

1
include/types/connection.h
View File

@ -408,6 +408,7 @@ struct connection {
struct wait_event *send_wait; /* Task to wake when we're ready to send */
struct wait_event *recv_wait; /* Task to wake when we're ready to recv */
struct list list; /* attach point to various connection lists (idle, ...) */
struct list session_list; /* List of all sessions attached to this connection */
int xprt_st; /* transport layer state, initialized to zero */
int tmp_early_data; /* 1st byte of early data, if any */
int sent_early_data; /* Amount of early data we sent so far */

2
include/types/session.h
View File

@ -47,6 +47,8 @@ struct session {
struct vars vars; /* list of variables for the session scope. */
struct task *task; /* handshake timeout processing */
long t_handshake; /* handshake duration, -1 = not completed */
struct connection *srv_conn; /* Server connection we last used */
struct list conn_list; /* List element for the session list in each connection */
};
#endif /* _TYPES_SESSION_H */

2
src/session.c
View File

@ -53,6 +53,8 @@ struct session *session_new(struct proxy *fe, struct listener *li, enum obj_type
vars_init(&sess->vars, SCOPE_SESS);
sess->task = NULL;
sess->t_handshake = -1; /* handshake not done yet */
LIST_INIT(&sess->conn_list);
sess->srv_conn = NULL;
HA_ATOMIC_UPDATE_MAX(&fe->fe_counters.conn_max,
HA_ATOMIC_ADD(&fe->feconn, 1));
if (li)