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

CLEANUP: connections: rename the toremove_lock to takeover_lock

Browse Source 
This lock was misnamed and a bit confusing. It's only used for takeover
so let's call it takeover_lock.
This commit is contained in:
Olivier Houchard 2020-06-29 20:15:59 +02:00 committed by Willy Tarreau
parent bbee1f7e78
commit f8f4c2ef60
8 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/haproxy/connection-t.h
View File

@ -606,7 +606,7 @@ struct tlv_ssl {
*/ */
struct idle_conns { struct idle_conns {
struct mt_list toremove_conns; struct mt_list toremove_conns;
__decl_thread(HA_SPINLOCK_T toremove_lock); __decl_thread(HA_SPINLOCK_T takeover_lock);
struct task *cleanup_task; struct task *cleanup_task;
} THREAD_ALIGNED(64); } THREAD_ALIGNED(64);

4
include/haproxy/connection.h
View File

@ -494,9 +494,9 @@ static inline void conn_free(struct connection *conn)
} }
conn_force_unsubscribe(conn); conn_force_unsubscribe(conn);
HA_SPIN_LOCK(OTHER_LOCK, &idle_conns[tid].toremove_lock); HA_SPIN_LOCK(OTHER_LOCK, &idle_conns[tid].takeover_lock);
MT_LIST_DEL((struct mt_list *)&conn->list); MT_LIST_DEL((struct mt_list *)&conn->list);
HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[tid].toremove_lock); HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[tid].takeover_lock);
pool_free(pool_head_connection, conn); pool_free(pool_head_connection, conn);
} }

14
src/backend.c
View File

@ -1086,7 +1086,7 @@ static struct connection *conn_backend_get(struct server *srv, int is_safe)
* to end up with two threads using the same connection. * to end up with two threads using the same connection.
*/ */
i = tid; i = tid;
HA_SPIN_LOCK(OTHER_LOCK, &idle_conns[tid].toremove_lock); HA_SPIN_LOCK(OTHER_LOCK, &idle_conns[tid].takeover_lock);
conn = MT_LIST_POP(&mt_list[tid], struct connection *, list); conn = MT_LIST_POP(&mt_list[tid], struct connection *, list);
/* If we failed to pick a connection from the idle list, let's try again with /* If we failed to pick a connection from the idle list, let's try again with
@ -1099,7 +1099,7 @@ static struct connection *conn_backend_get(struct server *srv, int is_safe)
mt_list = srv->safe_conns; mt_list = srv->safe_conns;
} }
} }
HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[tid].toremove_lock); HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[tid].takeover_lock);
/* If we found a connection in our own list, and we don't have to /* If we found a connection in our own list, and we don't have to
* steal one from another thread, then we're done. * steal one from another thread, then we're done.
@ -1129,7 +1129,7 @@ static struct connection *conn_backend_get(struct server *srv, int is_safe)
if (!srv->curr_idle_thr[i] || i == tid) if (!srv->curr_idle_thr[i] || i == tid)
continue; continue;
HA_SPIN_LOCK(OTHER_LOCK, &idle_conns[i].toremove_lock); HA_SPIN_LOCK(OTHER_LOCK, &idle_conns[i].takeover_lock);
mt_list_for_each_entry_safe(conn, &mt_list[i], list, elt1, elt2) { mt_list_for_each_entry_safe(conn, &mt_list[i], list, elt1, elt2) {
if (conn->mux->takeover && conn->mux->takeover(conn) == 0) { if (conn->mux->takeover && conn->mux->takeover(conn) == 0) {
MT_LIST_DEL_SAFE(elt1); MT_LIST_DEL_SAFE(elt1);
@ -1151,7 +1151,7 @@ static struct connection *conn_backend_get(struct server *srv, int is_safe)
} }
} }
} }
HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[i].toremove_lock); HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[i].takeover_lock);
} }
if (!found) if (!found)
@ -1328,7 +1328,7 @@ int connect_server(struct stream *s)
// see it possibly larger. // see it possibly larger.
ALREADY_CHECKED(i); ALREADY_CHECKED(i);
HA_SPIN_LOCK(OTHER_LOCK, &idle_conns[tid].toremove_lock); HA_SPIN_LOCK(OTHER_LOCK, &idle_conns[tid].takeover_lock);
tokill_conn = MT_LIST_POP(&srv->idle_conns[i], tokill_conn = MT_LIST_POP(&srv->idle_conns[i],
struct connection *, list); struct connection *, list);
if (!tokill_conn) if (!tokill_conn)
@ -1340,10 +1340,10 @@ int connect_server(struct stream *s)
MT_LIST_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].toremove_lock); HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[tid].takeover_lock);
break; break;
} }
HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[tid].toremove_lock); HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[tid].takeover_lock);
} }
} }

2
src/cfgparse.c
View File

@ -3571,7 +3571,7 @@ out_uri_auth_compat:
goto err; goto err;
idle_conns[i].cleanup_task->process = srv_cleanup_toremove_connections; idle_conns[i].cleanup_task->process = srv_cleanup_toremove_connections;
idle_conns[i].cleanup_task->context = NULL; idle_conns[i].cleanup_task->context = NULL;
HA_SPIN_INIT(&idle_conns[i].toremove_lock); HA_SPIN_INIT(&idle_conns[i].takeover_lock);
MT_LIST_INIT(&idle_conns[i].toremove_conns); MT_LIST_INIT(&idle_conns[i].toremove_conns);
} }
} }

10
src/mux_fcgi.c
View File

@ -2918,13 +2918,13 @@ static struct task *fcgi_io_cb(struct task *t, void *ctx, unsigned short status)
int ret = 0; int ret = 0;
HA_SPIN_LOCK(OTHER_LOCK, &idle_conns[tid].toremove_lock); HA_SPIN_LOCK(OTHER_LOCK, &idle_conns[tid].takeover_lock);
if (tl->context == NULL) { if (tl->context == NULL) {
/* The connection has been taken over by another thread, /* The connection has been taken over by another thread,
* we're no longer responsible for it, so just free the * we're no longer responsible for it, so just free the
* tasklet, and do nothing. * tasklet, and do nothing.
*/ */
HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[tid].toremove_lock); HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[tid].takeover_lock);
tasklet_free(tl); tasklet_free(tl);
return NULL; return NULL;
@ -2938,7 +2938,7 @@ static struct task *fcgi_io_cb(struct task *t, void *ctx, unsigned short status)
if (conn_in_list) if (conn_in_list)
MT_LIST_DEL(&conn->list); MT_LIST_DEL(&conn->list);
HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[tid].toremove_lock); HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[tid].takeover_lock);
if (!(fconn->wait_event.events & SUB_RETRY_SEND)) if (!(fconn->wait_event.events & SUB_RETRY_SEND))
ret = fcgi_send(fconn); ret = fcgi_send(fconn);
@ -3093,7 +3093,7 @@ static struct task *fcgi_timeout_task(struct task *t, void *context, unsigned sh
/* We're about to destroy the connection, so make sure nobody attempts /* We're about to destroy the connection, so make sure nobody attempts
* to steal it from us. * to steal it from us.
*/ */
HA_SPIN_LOCK(OTHER_LOCK, &idle_conns[tid].toremove_lock); HA_SPIN_LOCK(OTHER_LOCK, &idle_conns[tid].takeover_lock);
if (fconn->conn->flags & CO_FL_LIST_MASK) if (fconn->conn->flags & CO_FL_LIST_MASK)
MT_LIST_DEL(&fconn->conn->list); MT_LIST_DEL(&fconn->conn->list);
@ -3104,7 +3104,7 @@ static struct task *fcgi_timeout_task(struct task *t, void *context, unsigned sh
if (!t->context) if (!t->context)
fconn = NULL; fconn = NULL;
HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[tid].toremove_lock); HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[tid].takeover_lock);
} }
task_destroy(t); task_destroy(t);

10
src/mux_h1.c
View File

@ -2219,13 +2219,13 @@ static struct task *h1_io_cb(struct task *t, void *ctx, unsigned short status)
int ret = 0; int ret = 0;
HA_SPIN_LOCK(OTHER_LOCK, &idle_conns[tid].toremove_lock); HA_SPIN_LOCK(OTHER_LOCK, &idle_conns[tid].takeover_lock);
if (tl->context == NULL) { if (tl->context == NULL) {
/* The connection has been taken over by another thread, /* The connection has been taken over by another thread,
* we're no longer responsible for it, so just free the * we're no longer responsible for it, so just free the
* tasklet, and do nothing. * tasklet, and do nothing.
*/ */
HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[tid].toremove_lock); HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[tid].takeover_lock);
tasklet_free(tl); tasklet_free(tl);
return NULL; return NULL;
} }
@ -2241,7 +2241,7 @@ static struct task *h1_io_cb(struct task *t, void *ctx, unsigned short status)
if (conn_in_list) if (conn_in_list)
MT_LIST_DEL(&conn->list); MT_LIST_DEL(&conn->list);
HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[tid].toremove_lock); HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[tid].takeover_lock);
if (!(h1c->wait_event.events & SUB_RETRY_SEND)) if (!(h1c->wait_event.events & SUB_RETRY_SEND))
ret = h1_send(h1c); ret = h1_send(h1c);
@ -2309,7 +2309,7 @@ static struct task *h1_timeout_task(struct task *t, void *context, unsigned shor
/* We're about to destroy the connection, so make sure nobody attempts /* We're about to destroy the connection, so make sure nobody attempts
* to steal it from us. * to steal it from us.
*/ */
HA_SPIN_LOCK(OTHER_LOCK, &idle_conns[tid].toremove_lock); HA_SPIN_LOCK(OTHER_LOCK, &idle_conns[tid].takeover_lock);
if (h1c->conn->flags & CO_FL_LIST_MASK) if (h1c->conn->flags & CO_FL_LIST_MASK)
MT_LIST_DEL(&h1c->conn->list); MT_LIST_DEL(&h1c->conn->list);
@ -2320,7 +2320,7 @@ static struct task *h1_timeout_task(struct task *t, void *context, unsigned shor
if (!t->context) if (!t->context)
h1c = NULL; h1c = NULL;
HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[tid].toremove_lock); HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[tid].takeover_lock);
} }
task_destroy(t); task_destroy(t);

22
src/mux_h2.c
View File

@ -3524,13 +3524,13 @@ static struct task *h2_io_cb(struct task *t, void *ctx, unsigned short status)
int ret = 0; int ret = 0;
HA_SPIN_LOCK(OTHER_LOCK, &idle_conns[tid].toremove_lock); HA_SPIN_LOCK(OTHER_LOCK, &idle_conns[tid].takeover_lock);
if (t->context == NULL) { if (t->context == NULL) {
/* The connection has been taken over by another thread, /* The connection has been taken over by another thread,
* we're no longer responsible for it, so just free the * we're no longer responsible for it, so just free the
* tasklet, and do nothing. * tasklet, and do nothing.
*/ */
HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[tid].toremove_lock); HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[tid].takeover_lock);
tasklet_free(tl); tasklet_free(tl);
goto leave; goto leave;
} }
@ -3547,7 +3547,7 @@ static struct task *h2_io_cb(struct task *t, void *ctx, unsigned short status)
if (conn_in_list) if (conn_in_list)
MT_LIST_DEL(&conn->list); MT_LIST_DEL(&conn->list);
HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[tid].toremove_lock); HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[tid].takeover_lock);
if (!(h2c->wait_event.events & SUB_RETRY_SEND)) if (!(h2c->wait_event.events & SUB_RETRY_SEND))
ret = h2_send(h2c); ret = h2_send(h2c);
@ -3643,15 +3643,15 @@ static int h2_process(struct h2c *h2c)
} }
/* connections in error must be removed from the idle lists */ /* connections in error must be removed from the idle lists */
HA_SPIN_LOCK(OTHER_LOCK, &idle_conns[tid].toremove_lock); HA_SPIN_LOCK(OTHER_LOCK, &idle_conns[tid].takeover_lock);
MT_LIST_DEL((struct mt_list *)&conn->list); MT_LIST_DEL((struct mt_list *)&conn->list);
HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[tid].toremove_lock); HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[tid].takeover_lock);
} }
else if (h2c->st0 == H2_CS_ERROR) { else if (h2c->st0 == H2_CS_ERROR) {
/* connections in error must be removed from the idle lists */ /* connections in error must be removed from the idle lists */
HA_SPIN_LOCK(OTHER_LOCK, &idle_conns[tid].toremove_lock); HA_SPIN_LOCK(OTHER_LOCK, &idle_conns[tid].takeover_lock);
MT_LIST_DEL((struct mt_list *)&conn->list); MT_LIST_DEL((struct mt_list *)&conn->list);
HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[tid].toremove_lock); HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[tid].takeover_lock);
} }
if (!b_data(&h2c->dbuf)) if (!b_data(&h2c->dbuf))
@ -3722,7 +3722,7 @@ static struct task *h2_timeout_task(struct task *t, void *context, unsigned shor
/* We're about to destroy the connection, so make sure nobody attempts /* We're about to destroy the connection, so make sure nobody attempts
* to steal it from us. * to steal it from us.
*/ */
HA_SPIN_LOCK(OTHER_LOCK, &idle_conns[tid].toremove_lock); HA_SPIN_LOCK(OTHER_LOCK, &idle_conns[tid].takeover_lock);
if (h2c->conn->flags & CO_FL_LIST_MASK) if (h2c->conn->flags & CO_FL_LIST_MASK)
MT_LIST_DEL(&h2c->conn->list); MT_LIST_DEL(&h2c->conn->list);
@ -3733,7 +3733,7 @@ static struct task *h2_timeout_task(struct task *t, void *context, unsigned shor
if (!t->context) if (!t->context)
h2c = NULL; h2c = NULL;
HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[tid].toremove_lock); HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[tid].takeover_lock);
} }
task_destroy(t); task_destroy(t);
@ -3780,9 +3780,9 @@ static struct task *h2_timeout_task(struct task *t, void *context, unsigned shor
} }
/* in any case this connection must not be considered idle anymore */ /* in any case this connection must not be considered idle anymore */
HA_SPIN_LOCK(OTHER_LOCK, &idle_conns[tid].toremove_lock); HA_SPIN_LOCK(OTHER_LOCK, &idle_conns[tid].takeover_lock);
MT_LIST_DEL((struct mt_list *)&h2c->conn->list); MT_LIST_DEL((struct mt_list *)&h2c->conn->list);
HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[tid].toremove_lock); HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[tid].takeover_lock);
/* either we can release everything now or it will be done later once /* either we can release everything now or it will be done later once
* the last stream closes. * the last stream closes.

8
src/server.c
View File

@ -5207,7 +5207,7 @@ static void srv_cleanup_connections(struct server *srv)
HA_SPIN_LOCK(OTHER_LOCK, &idle_conn_srv_lock); HA_SPIN_LOCK(OTHER_LOCK, &idle_conn_srv_lock);
for (i = tid;;) { for (i = tid;;) {
did_remove = 0; did_remove = 0;
HA_SPIN_LOCK(OTHER_LOCK, &idle_conns[i].toremove_lock); HA_SPIN_LOCK(OTHER_LOCK, &idle_conns[i].takeover_lock);
for (j = 0; j < srv->curr_idle_conns; j++) { for (j = 0; j < srv->curr_idle_conns; j++) {
conn = MT_LIST_POP(&srv->idle_conns[i], struct connection *, list); conn = MT_LIST_POP(&srv->idle_conns[i], struct connection *, list);
if (!conn) if (!conn)
@ -5218,7 +5218,7 @@ static void srv_cleanup_connections(struct server *srv)
did_remove = 1; did_remove = 1;
MT_LIST_ADDQ(&idle_conns[i].toremove_conns, (struct mt_list *)&conn->list); MT_LIST_ADDQ(&idle_conns[i].toremove_conns, (struct mt_list *)&conn->list);
} }
HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[i].toremove_lock); HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[i].takeover_lock);
if (did_remove) if (did_remove)
task_wakeup(idle_conns[i].cleanup_task, TASK_WOKEN_OTHER); task_wakeup(idle_conns[i].cleanup_task, TASK_WOKEN_OTHER);
@ -5287,7 +5287,7 @@ struct task *srv_cleanup_idle_connections(struct task *task, void *context, unsi
max_conn = (exceed_conns * srv->curr_idle_thr[i]) / max_conn = (exceed_conns * srv->curr_idle_thr[i]) /
curr_idle + 1; curr_idle + 1;
HA_SPIN_LOCK(OTHER_LOCK, &idle_conns[i].toremove_lock); HA_SPIN_LOCK(OTHER_LOCK, &idle_conns[i].takeover_lock);
for (j = 0; j < max_conn; j++) { for (j = 0; j < max_conn; j++) {
struct connection *conn = MT_LIST_POP(&srv->idle_conns[i], struct connection *, list); struct connection *conn = MT_LIST_POP(&srv->idle_conns[i], struct connection *, list);
if (!conn) if (!conn)
@ -5298,7 +5298,7 @@ struct task *srv_cleanup_idle_connections(struct task *task, void *context, unsi
did_remove = 1; did_remove = 1;
MT_LIST_ADDQ(&idle_conns[i].toremove_conns, (struct mt_list *)&conn->list); MT_LIST_ADDQ(&idle_conns[i].toremove_conns, (struct mt_list *)&conn->list);
} }
HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[i].toremove_lock); HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[i].takeover_lock);
if (did_remove && max_conn < srv->curr_idle_thr[i]) if (did_remove && max_conn < srv->curr_idle_thr[i])
srv_is_empty = 0; srv_is_empty = 0;
if (did_remove) if (did_remove)