From 96f7260e6162ee67af56713d1e3717beeac4180e Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Tue, 3 Mar 2020 17:13:02 +0100 Subject: [PATCH] MINOR: debug: use resolve_sym_name() to dump task handlers Now in "show threads", the task/tasklet handler will be resolved using this function, which will provide more detailed results and will still support offsets to main for unresolved symbols. (cherry picked from commit 2e89b0930b32b6f694df1c7b35271686acc7cb93) Signed-off-by: Willy Tarreau --- src/debug.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/src/debug.c b/src/debug.c index 0138142..288fbcd 100644 --- a/src/debug.c +++ b/src/debug.c @@ -117,20 +117,9 @@ void ha_task_dump(struct buffer *buf, const struct task *task, const char *pfx) task->call_date ? (unsigned long long)(now_mono_time() - task->call_date) : 0, task->call_date ? " ns ago" : ""); - chunk_appendf(buf, "%s" - " fct=%p=main%s%ld (%s) ctx=%p", - pfx, - task->process, - ((void *)task->process - (void *)main) < 0 ? "" : "+", - (long)((void *)task->process - (void *)main), - task->process == process_stream ? "process_stream" : - task->process == task_run_applet ? "task_run_applet" : - task->process == si_cs_io_cb ? "si_cs_io_cb" : -#ifdef USE_LUA - task->process == hlua_process_task ? "hlua_process_task" : -#endif - "?", - task->context); + chunk_appendf(buf, "%s fct=%p(", pfx, task->process); + resolve_sym_name(buf, NULL, task->process); + chunk_appendf(buf,") ctx=%p", task->context); if (task->process == task_run_applet && (appctx = task->context)) chunk_appendf(buf, "(%s)\n", appctx->applet->name); -- 1.7.10.4