]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: server: remove idle lock in srv_cleanup_connections
authorWilly Tarreau <w@1wt.eu>
Fri, 6 Nov 2020 11:07:31 +0000 (12:07 +0100)
committerWilly Tarreau <w@1wt.eu>
Fri, 6 Nov 2020 12:22:44 +0000 (13:22 +0100)
This function used to grab the idle lock when scanning the threads for
idle connections, but it doesn't need it since the lock only protects
the tree. Let's remove it.

src/server.c

index 81f4e463ef6118e439143f44adf4a9d55b1135d3..1e9f46ec7264e4f8281bacd89fa18a2d8a6278a4 100644 (file)
@@ -5222,7 +5222,6 @@ static void srv_cleanup_connections(struct server *srv)
        int i;
 
        /* check all threads starting with ours */
-       HA_SPIN_LOCK(OTHER_LOCK, &idle_conn_srv_lock);
        for (i = tid;;) {
                did_remove = 0;
                if (srv_migrate_conns_to_remove(&srv->idle_conns[i], &idle_conns[i].toremove_conns, -1) > 0)
@@ -5235,7 +5234,6 @@ static void srv_cleanup_connections(struct server *srv)
                if ((i = ((i + 1 == global.nbthread) ? 0 : i + 1)) == tid)
                        break;
        }
-       HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conn_srv_lock);
 }
 
 struct task *srv_cleanup_idle_connections(struct task *task, void *context, unsigned short state)