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: server: rename srv_cleanup_{idle,toremove}_connections()

Browse Source 
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.
This commit is contained in:
Willy Tarreau 2021-02-26 00:30:22 +01:00
parent 9205ab31d2
commit d8aa21a611
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/haproxy/server.h
View File

@ -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 srvrq_resolution_error_cb(struct resolv_requester *requester, int error_code);
int snr_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 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_idle_conns(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_toremove_conns(struct task *task, void *context, unsigned short state);
/* /*
* Registers the server keyword list <kwl> as a list of valid keywords for next * Registers the server keyword list <kwl> as a list of valid keywords for next

4
src/cfgparse.c
View File

@ -3270,14 +3270,14 @@ out_uri_auth_compat:
if (!idle_conn_task) if (!idle_conn_task)
goto err; goto err;
idle_conn_task->process = srv_cleanup_idle_connections; idle_conn_task->process = srv_cleanup_idle_conns;
idle_conn_task->context = NULL; idle_conn_task->context = NULL;
for (i = 0; i < global.nbthread; i++) { for (i = 0; i < global.nbthread; i++) {
idle_conns[i].cleanup_task = task_new(1UL << i); idle_conns[i].cleanup_task = task_new(1UL << i);
if (!idle_conns[i].cleanup_task) if (!idle_conns[i].cleanup_task)
goto err; 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; idle_conns[i].cleanup_task->context = NULL;
HA_SPIN_INIT(&idle_conns[i].idle_conns_lock); HA_SPIN_INIT(&idle_conns[i].idle_conns_lock);
MT_LIST_INIT(&idle_conns[i].toremove_conns); MT_LIST_INIT(&idle_conns[i].toremove_conns);

4
src/server.c
View File

@ -4561,7 +4561,7 @@ static void srv_update_status(struct server *s)
*s->adm_st_chg_cause = 0; *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; 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 server *srv;
struct eb32_node *eb; struct eb32_node *eb;