1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MINOR: debug: do not statify a few debugging functions often used with wdt/dbg

Browse Source 
A few functions are used when debugging debug signals and watchdog, but
being static, they're not resolved and are hard to spot in dumps, and
they appear as any random other function plus an offset. Let's just not
mark them static anymore, it only hurts:
  - cli_io_handler_show_threads()
  - debug_run_cli_deadlock()
  - debug_parse_cli_loop()
  - debug_parse_cli_panic()
This commit is contained in:
Willy Tarreau 2025-04-15 09:25:27 +02:00
parent 47f8397afb
commit 5b5960359f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/debug.c
View File

@ -552,8 +552,9 @@ void ha_task_dump(struct buffer *buf, const struct task *task, const char *pfx)
/* This function dumps all profiling settings. It returns 0 if the output /* This function dumps all profiling settings. It returns 0 if the output
* buffer is full and it needs to be called again, otherwise non-zero. * buffer is full and it needs to be called again, otherwise non-zero.
* Note: to not statify this one, it's hard to spot in backtraces!
*/ */
static int cli_io_handler_show_threads(struct appctx *appctx) int cli_io_handler_show_threads(struct appctx *appctx)
{ {
int *thr = appctx->svcctx; int *thr = appctx->svcctx;
@ -958,7 +959,7 @@ static int debug_parse_cli_close(char **args, char *payload, struct appctx *appc
} }
/* this is meant to cause a deadlock when more than one task is running it or when run twice */ /* this is meant to cause a deadlock when more than one task is running it or when run twice */
static struct task *debug_run_cli_deadlock(struct task *task, void *ctx, unsigned int state) struct task *debug_run_cli_deadlock(struct task *task, void *ctx, unsigned int state)
{ {
static HA_SPINLOCK_T lock __maybe_unused; static HA_SPINLOCK_T lock __maybe_unused;
@ -1021,7 +1022,7 @@ static int debug_parse_cli_log(char **args, char *payload, struct appctx *appctx
} }
/* parse a "debug dev loop" command. It always returns 1. */ /* parse a "debug dev loop" command. It always returns 1. */
static int debug_parse_cli_loop(char **args, char *payload, struct appctx *appctx, void *private) int debug_parse_cli_loop(char **args, char *payload, struct appctx *appctx, void *private)
{ {
struct timeval deadline, curr; struct timeval deadline, curr;
int loop = atoi(args[3]); int loop = atoi(args[3]);
@ -1054,7 +1055,7 @@ static int debug_parse_cli_loop(char **args, char *payload, struct appctx *appct
} }
/* parse a "debug dev panic" command. It always returns 1, though it should never return. */ /* parse a "debug dev panic" command. It always returns 1, though it should never return. */
static int debug_parse_cli_panic(char **args, char *payload, struct appctx *appctx, void *private) int debug_parse_cli_panic(char **args, char *payload, struct appctx *appctx, void *private)
{ {
if (!cli_has_level(appctx, ACCESS_LVL_ADMIN)) if (!cli_has_level(appctx, ACCESS_LVL_ADMIN))
return 1; return 1;