From: Amaury Denoyelle Date: Thu, 23 Jul 2026 14:15:24 +0000 (+0200) Subject: MINOR: server: rename global servers_list to all_servers X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=4154c44632f1641b5823a1222c65246f2f62aaed;p=thirdparty%2Fhaproxy.git MINOR: server: rename global servers_list to all_servers Rename global to . This name better reflects that it contains all the servers and servers a similar purpose to list. --- diff --git a/include/haproxy/server.h b/include/haproxy/server.h index 44f82137e..5662666a7 100644 --- a/include/haproxy/server.h +++ b/include/haproxy/server.h @@ -44,7 +44,7 @@ extern struct idle_conns idle_conns[MAX_THREADS]; extern struct task *idle_conn_task[MAX_THREADS]; extern struct eb_root idle_conn_srv[MAX_THREADS]; -extern struct mt_list servers_list; +extern struct mt_list all_servers; extern struct dict server_key_dict; int srv_downtime(const struct server *s); diff --git a/src/cfgparse.c b/src/cfgparse.c index 9a901d96e..2e538ed66 100644 --- a/src/cfgparse.c +++ b/src/cfgparse.c @@ -2363,7 +2363,7 @@ int check_config_validity() * we must finish to initialize certain things on the servers, * as some of the fields may be accessed soon */ - MT_LIST_FOR_EACH_ENTRY_LOCKED(newsrv, &servers_list, global_list, back) { + MT_LIST_FOR_EACH_ENTRY_LOCKED(newsrv, &all_servers, global_list, back) { err_code |= srv_preinit(newsrv); if (err_code & ERR_CODE) goto out; diff --git a/src/server.c b/src/server.c index 8248c6cc4..1dc5e1001 100644 --- a/src/server.c +++ b/src/server.c @@ -78,7 +78,7 @@ struct srv_kw_list srv_keywords = { struct eb_root idle_conn_srv[MAX_THREADS]; struct task *idle_conn_task[MAX_THREADS] __read_mostly = {}; -struct mt_list servers_list = MT_LIST_HEAD_INIT(servers_list); +struct mt_list all_servers = MT_LIST_HEAD_INIT(all_servers); static struct task *server_atomic_sync_task = NULL; static event_hdl_async_equeue server_atomic_sync_queue; @@ -3135,7 +3135,7 @@ void srv_settings_cpy(struct server *srv, const struct server *src, int srv_tmpl } } -/* Allocates a server, attaches it to the global servers_list +/* Allocates a server, attaches it to the global list * and adds it to server list. Before deleting the server with * srv_drop(), srv_detach() must be called to remove it from the parent * proxy list @@ -3154,7 +3154,7 @@ struct server *new_server(struct proxy *proxy) srv->obj_type = OBJ_TYPE_SERVER; srv->proxy = proxy; - MT_LIST_APPEND(&servers_list, &srv->global_list); + MT_LIST_APPEND(&all_servers, &srv->global_list); LIST_INIT(&srv->srv_rec_item); LIST_INIT(&srv->ip_rec_item); LIST_INIT(&srv->pp_tlvs);