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

MINOR: connection: use MT_LIST_ADDQ() to add connections to idle lists

Browse Source 
When a connection is added to an idle list, it's already detached and
cannot be seen by two threads at once, so there's no point using
TRY_ADDQ, there will never be any conflict. Let's just use the cheaper
ADDQ.
This commit is contained in:
Willy Tarreau 2020-07-10 08:28:20 +02:00
parent 8689127816
commit a9d7b76f6a
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/haproxy/server.h
View File

@ -273,11 +273,11 @@ static inline int srv_add_to_idle_list(struct server *srv, struct connection *co
conn->idle_time = now_ms; conn->idle_time = now_ms;
if (is_safe) { if (is_safe) {
conn->flags = (conn->flags & ~CO_FL_LIST_MASK) | CO_FL_SAFE_LIST; conn->flags = (conn->flags & ~CO_FL_LIST_MASK) | CO_FL_SAFE_LIST;
MT_LIST_TRY_ADDQ(&srv->safe_conns[tid], (struct mt_list *)&conn->list); MT_LIST_ADDQ(&srv->safe_conns[tid], (struct mt_list *)&conn->list);
_HA_ATOMIC_ADD(&srv->curr_safe_nb, 1); _HA_ATOMIC_ADD(&srv->curr_safe_nb, 1);
} else { } else {
conn->flags = (conn->flags & ~CO_FL_LIST_MASK) | CO_FL_IDLE_LIST; conn->flags = (conn->flags & ~CO_FL_LIST_MASK) | CO_FL_IDLE_LIST;
MT_LIST_TRY_ADDQ(&srv->idle_conns[tid], (struct mt_list *)&conn->list); MT_LIST_ADDQ(&srv->idle_conns[tid], (struct mt_list *)&conn->list);
_HA_ATOMIC_ADD(&srv->curr_idle_nb, 1); _HA_ATOMIC_ADD(&srv->curr_idle_nb, 1);
} }
_HA_ATOMIC_ADD(&srv->curr_idle_thr[tid], 1); _HA_ATOMIC_ADD(&srv->curr_idle_thr[tid], 1);

2
src/backend.c
View File

@ -1345,7 +1345,7 @@ int connect_server(struct stream *s)
if (tokill_conn) { if (tokill_conn) {
/* We got one, put it into the concerned thread's to kill list, and wake it's kill task */ /* We got one, put it into the concerned thread's to kill list, and wake it's kill task */
MT_LIST_TRY_ADDQ(&idle_conns[i].toremove_conns, MT_LIST_ADDQ(&idle_conns[i].toremove_conns,
(struct mt_list *)&tokill_conn->list); (struct mt_list *)&tokill_conn->list);
task_wakeup(idle_conns[i].cleanup_task, TASK_WOKEN_OTHER); task_wakeup(idle_conns[i].cleanup_task, TASK_WOKEN_OTHER);
HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[tid].takeover_lock); HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[tid].takeover_lock);

4
src/mux_fcgi.c
View File

@ -2956,9 +2956,9 @@ static struct task *fcgi_io_cb(struct task *t, void *ctx, unsigned short status)
struct server *srv = objt_server(conn->target); struct server *srv = objt_server(conn->target);
if (conn_in_list == CO_FL_SAFE_LIST) if (conn_in_list == CO_FL_SAFE_LIST)
MT_LIST_TRY_ADDQ(&srv->safe_conns[tid], &conn->list); MT_LIST_ADDQ(&srv->safe_conns[tid], &conn->list);
else else
MT_LIST_TRY_ADDQ(&srv->idle_conns[tid], &conn->list); MT_LIST_ADDQ(&srv->idle_conns[tid], &conn->list);
} }
return NULL; return NULL;
} }

4
src/mux_h1.c
View File

@ -2265,9 +2265,9 @@ static struct task *h1_io_cb(struct task *t, void *ctx, unsigned short status)
struct server *srv = objt_server(conn->target); struct server *srv = objt_server(conn->target);
if (conn_in_list == CO_FL_SAFE_LIST) if (conn_in_list == CO_FL_SAFE_LIST)
MT_LIST_TRY_ADDQ(&srv->safe_conns[tid], &conn->list); MT_LIST_ADDQ(&srv->safe_conns[tid], &conn->list);
else else
MT_LIST_TRY_ADDQ(&srv->idle_conns[tid], &conn->list); MT_LIST_ADDQ(&srv->idle_conns[tid], &conn->list);
} }
return NULL; return NULL;
} }

4
src/mux_h2.c
View File

@ -3565,9 +3565,9 @@ static struct task *h2_io_cb(struct task *t, void *ctx, unsigned short status)
struct server *srv = objt_server(conn->target); struct server *srv = objt_server(conn->target);
if (conn_in_list == CO_FL_SAFE_LIST) if (conn_in_list == CO_FL_SAFE_LIST)
MT_LIST_TRY_ADDQ(&srv->safe_conns[tid], &conn->list); MT_LIST_ADDQ(&srv->safe_conns[tid], &conn->list);
else else
MT_LIST_TRY_ADDQ(&srv->idle_conns[tid], &conn->list); MT_LIST_ADDQ(&srv->idle_conns[tid], &conn->list);
} }
leave: leave:

4
src/ssl_sock.c
View File

@ -5676,9 +5676,9 @@ leave:
struct server *srv = objt_server(conn->target); struct server *srv = objt_server(conn->target);
if (conn_in_list == CO_FL_SAFE_LIST) if (conn_in_list == CO_FL_SAFE_LIST)
MT_LIST_TRY_ADDQ(&srv->safe_conns[tid], &conn->list); MT_LIST_ADDQ(&srv->safe_conns[tid], &conn->list);
else else
MT_LIST_TRY_ADDQ(&srv->idle_conns[tid], &conn->list); MT_LIST_ADDQ(&srv->idle_conns[tid], &conn->list);
} }
return NULL; return NULL;
} }