mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 07:07:04 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: debug: replace ha_thread_dump() with its two components

Browse Source 
At the few places we were calling ha_thread_dump(), now we're
calling separately ha_thread_dump_fill() and ha_thread_dump_done()
once the data are consumed.
This commit is contained in:
Willy Tarreau 2024-10-19 14:15:20 +02:00
parent d7c34ba479
commit afeac4bc02
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/haproxy/debug.h
View File

@ -27,7 +27,6 @@ struct buffer;
extern unsigned int debug_commands_issued; extern unsigned int debug_commands_issued;
void ha_task_dump(struct buffer *buf, const struct task *task, const char *pfx); void ha_task_dump(struct buffer *buf, const struct task *task, const char *pfx);
void ha_thread_dump_one(int thr, int from_signal); void ha_thread_dump_one(int thr, int from_signal);
void ha_thread_dump(struct buffer *buf, int thr);
void ha_dump_backtrace(struct buffer *buf, const char *prefix, int dump); void ha_dump_backtrace(struct buffer *buf, const char *prefix, int dump);
void ha_backtrace_to_stderr(void); void ha_backtrace_to_stderr(void);
void ha_panic(void); void ha_panic(void);

24
src/debug.c
View File

@ -416,15 +416,6 @@ void ha_thread_dump_done(struct buffer *buf, int thr)
} while (!HA_ATOMIC_CAS(&ha_thread_ctx[thr].thread_dump_buffer, &old, buf)); } while (!HA_ATOMIC_CAS(&ha_thread_ctx[thr].thread_dump_buffer, &old, buf));
} }
/* performs a complete thread dump: calls the remote thread and marks the
* buffer as read.
*/
void ha_thread_dump(struct buffer *buf, int thr)
{
ha_thread_dump_fill(buf, thr);
ha_thread_dump_done(NULL, thr);
}
/* dumps into the buffer some information related to task <task> (which may /* dumps into the buffer some information related to task <task> (which may
* either be a task or a tasklet, and prepend each line except the first one * either be a task or a tasklet, and prepend each line except the first one
* with <pfx>. The buffer is only appended and the first output starts by the * with <pfx>. The buffer is only appended and the first output starts by the
@ -519,11 +510,12 @@ static int cli_io_handler_show_threads(struct appctx *appctx)
do { do {
chunk_reset(&trash); chunk_reset(&trash);
ha_thread_dump(&trash, *thr); if (ha_thread_dump_fill(&trash, *thr)) {
ha_thread_dump_done(NULL, *thr);
if (applet_putchk(appctx, &trash) == -1) { if (applet_putchk(appctx, &trash) == -1) {
/* failed, try again */ /* failed, try again */
return 0; return 0;
}
} }
(*thr)++; (*thr)++;
} while (*thr < global.nbthread); } while (*thr < global.nbthread);
@ -686,8 +678,10 @@ void ha_panic()
chunk_appendf(&trash, "Thread %u is about to kill the process.\n", tid + 1); chunk_appendf(&trash, "Thread %u is about to kill the process.\n", tid + 1);
for (thr = 0; thr < global.nbthread; thr++) { for (thr = 0; thr < global.nbthread; thr++) {
ha_thread_dump(&trash, thr); if (!ha_thread_dump_fill(&trash, thr))
continue;
DISGUISE(write(2, trash.area, trash.data)); DISGUISE(write(2, trash.area, trash.data));
ha_thread_dump_done(NULL, thr);
b_force_xfer(buf, &trash, b_room(buf)); b_force_xfer(buf, &trash, b_room(buf));
chunk_reset(&trash); chunk_reset(&trash);
} }