From d8aa21a611435446dcd2e498b77db0af7b87799e Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Fri, 26 Feb 2021 00:30:22 +0100 Subject: [PATCH] CLEANUP: server: rename srv_cleanup_{idle,toremove}_connections() These function names are unbearably long, they don't even fit into the screen in "show profiling", let's trim the "_connections" to "_conns", which happens to match the name of the lists there. --- include/haproxy/server.h | 4 ++-- src/cfgparse.c | 4 ++-- src/server.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/haproxy/server.h b/include/haproxy/server.h index 33ec08b0f..2abba3502 100644 --- a/include/haproxy/server.h +++ b/include/haproxy/server.h @@ -68,8 +68,8 @@ int snr_resolution_cb(struct resolv_requester *requester, struct dns_counters *c int srvrq_resolution_error_cb(struct resolv_requester *requester, int error_code); int snr_resolution_error_cb(struct resolv_requester *requester, int error_code); struct server *snr_check_ip_callback(struct server *srv, void *ip, unsigned char *ip_family); -struct task *srv_cleanup_idle_connections(struct task *task, void *ctx, unsigned short state); -struct task *srv_cleanup_toremove_connections(struct task *task, void *context, unsigned short state); +struct task *srv_cleanup_idle_conns(struct task *task, void *ctx, unsigned short state); +struct task *srv_cleanup_toremove_conns(struct task *task, void *context, unsigned short state); /* * Registers the server keyword list as a list of valid keywords for next diff --git a/src/cfgparse.c b/src/cfgparse.c index 317ef2a23..247b3c40c 100644 --- a/src/cfgparse.c +++ b/src/cfgparse.c @@ -3270,14 +3270,14 @@ out_uri_auth_compat: if (!idle_conn_task) goto err; - idle_conn_task->process = srv_cleanup_idle_connections; + idle_conn_task->process = srv_cleanup_idle_conns; idle_conn_task->context = NULL; for (i = 0; i < global.nbthread; i++) { idle_conns[i].cleanup_task = task_new(1UL << i); if (!idle_conns[i].cleanup_task) goto err; - idle_conns[i].cleanup_task->process = srv_cleanup_toremove_connections; + idle_conns[i].cleanup_task->process = srv_cleanup_toremove_conns; idle_conns[i].cleanup_task->context = NULL; HA_SPIN_INIT(&idle_conns[i].idle_conns_lock); MT_LIST_INIT(&idle_conns[i].toremove_conns); diff --git a/src/server.c b/src/server.c index 0e7671ed5..5bbad8292 100644 --- a/src/server.c +++ b/src/server.c @@ -4561,7 +4561,7 @@ static void srv_update_status(struct server *s) *s->adm_st_chg_cause = 0; } -struct task *srv_cleanup_toremove_connections(struct task *task, void *context, unsigned short state) +struct task *srv_cleanup_toremove_conns(struct task *task, void *context, unsigned short state) { struct connection *conn; @@ -4629,7 +4629,7 @@ static void srv_cleanup_connections(struct server *srv) } } -struct task *srv_cleanup_idle_connections(struct task *task, void *context, unsigned short state) +struct task *srv_cleanup_idle_conns(struct task *task, void *context, unsigned short state) { struct server *srv; struct eb32_node *eb;