From 17417fb0ec9842de1774e1e76f1f11c00cdafc47 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Sat, 31 Oct 2020 09:01:25 -0400 Subject: gdb, gdbsupport: add debug_prefixed_printf, remove boilerplate functions The *_debug_print_1 functions are all very similar, the only difference being the subsystem name. Remove them all and make the logging macros use a new debug_prefixed_printf function directly. gdb/ChangeLog: * infrun.c (infrun_debug_printf_1): Remove. (displaced_debug_printf_1): Remove. (stop_all_threads): Use debug_prefixed_printf. * infrun.h (infrun_debug_printf_1): Remove. (infrun_debug_printf): Use debug_prefixed_printf. (displaced_debug_printf_1): Remove. (displaced_debug_printf): Use debug_prefixed_printf. * linux-nat.c (linux_nat_debug_printf_1): Remove. (linux_nat_debug_printf): Use debug_prefixed_printf. gdbsupport/ChangeLog: * common-debug.cc (debug_prefixed_printf): New. * common-debug.h (debug_prefixed_printf): New declaration. * event-loop.cc (event_loop_debug_printf_1): Remove. * event-loop.h (event_loop_debug_printf_1): Remove. (event_loop_debug_printf): Use debug_prefixed_printf. (event_loop_ui_debug_printf): Use debug_prefixed_printf. Change-Id: Ib323087c7257f0060121d302055c41eb64aa60c6 --- gdb/ChangeLog | 12 ++++++++++++ gdb/infrun.c | 26 ++------------------------ gdb/infrun.h | 24 ++++-------------------- gdb/linux-nat.c | 18 ++---------------- 4 files changed, 20 insertions(+), 60 deletions(-) (limited to 'gdb') diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9154179..78ab40b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,17 @@ 2020-10-31 Simon Marchi + * infrun.c (infrun_debug_printf_1): Remove. + (displaced_debug_printf_1): Remove. + (stop_all_threads): Use debug_prefixed_printf. + * infrun.h (infrun_debug_printf_1): Remove. + (infrun_debug_printf): Use debug_prefixed_printf. + (displaced_debug_printf_1): Remove. + (displaced_debug_printf): Use debug_prefixed_printf. + * linux-nat.c (linux_nat_debug_printf_1): Remove. + (linux_nat_debug_printf): Use debug_prefixed_printf. + +2020-10-31 Simon Marchi + * configure: Re-generate. * sanitize.m4: Replace AC_TRY_LINK with AC_LINK_IFELSE + AC_LANG_PROGRAM. diff --git a/gdb/infrun.c b/gdb/infrun.c index de2437f..53d7209 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -105,17 +105,6 @@ static int infrun_is_async = -1; /* See infrun.h. */ void -infrun_debug_printf_1 (const char *func_name, const char *fmt, ...) -{ - va_list ap; - va_start (ap, fmt); - debug_prefixed_vprintf ("infrun", func_name, fmt, ap); - va_end (ap); -} - -/* See infrun.h. */ - -void infrun_async (int enable) { if (infrun_is_async != enable) @@ -179,17 +168,6 @@ show_debug_infrun (struct ui_file *file, int from_tty, fprintf_filtered (file, _("Inferior debugging is %s.\n"), value); } -/* See infrun.h. */ - -void -displaced_debug_printf_1 (const char *func_name, const char *fmt, ...) -{ - va_list ap; - va_start (ap, fmt); - debug_prefixed_vprintf ("displaced", func_name, fmt, ap); - va_end (ap); -} - /* Support for disabling address space randomization. */ bool disable_randomization = true; @@ -4667,10 +4645,10 @@ stop_all_threads (void) target_thread_events (false); } - /* Use infrun_debug_printf_1 directly to get a meaningful function + /* Use debug_prefixed_printf directly to get a meaningful function name. */ if (debug_infrun) - infrun_debug_printf_1 ("stop_all_threads", "done"); + debug_prefixed_printf ("infrun", "stop_all_threads", "done"); }; /* Request threads to stop, and then wait for the stops. Because diff --git a/gdb/infrun.h b/gdb/infrun.h index 4fc1bf9..93b8aeb 100644 --- a/gdb/infrun.h +++ b/gdb/infrun.h @@ -31,34 +31,18 @@ struct thread_info; /* True if we are debugging run control. */ extern unsigned int debug_infrun; -/* Print an "infrun" debug statement. Should be used through - infrun_debug_printf. */ -void ATTRIBUTE_PRINTF (2, 3) infrun_debug_printf_1 - (const char *func_name, const char *fmt, ...); +/* Print an "infrun" debug statement. */ #define infrun_debug_printf(fmt, ...) \ - do \ - { \ - if (debug_infrun) \ - infrun_debug_printf_1 (__func__, fmt, ##__VA_ARGS__); \ - } \ - while (0) + debug_prefixed_printf ("infrun", __func__, fmt, ##__VA_ARGS__) /* True if we are debugging displaced stepping. */ extern bool debug_displaced; -/* Print a "displaced" debug statement. Should be used through - displaced_debug_printf. */ -void ATTRIBUTE_PRINTF (2, 3) displaced_debug_printf_1 - (const char *func_name, const char *fmt, ...); +/* Print a "displaced" debug statement. */ #define displaced_debug_printf(fmt, ...) \ - do \ - { \ - if (debug_displaced) \ - displaced_debug_printf_1 (__func__, fmt, ##__VA_ARGS__); \ - } \ - while (0) + debug_prefixed_printf ("displaced", __func__, fmt, ##__VA_ARGS__) /* Nonzero if we want to give control to the user when we're notified of shared library events by the dynamic linker. */ diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c index 24f9716..d79ea84 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c @@ -199,24 +199,10 @@ show_debug_linux_nat (struct ui_file *file, int from_tty, value); } -/* Print a debug statement. Should be used through linux_nat_debug_printf. */ - -static void ATTRIBUTE_PRINTF (2, 3) -linux_nat_debug_printf_1 (const char *func_name, const char *fmt, ...) -{ - va_list ap; - va_start (ap, fmt); - debug_prefixed_vprintf ("linux-nat", func_name, fmt, ap); - va_end (ap); -} +/* Print a linux-nat debug statement. */ #define linux_nat_debug_printf(fmt, ...) \ - do \ - { \ - if (debug_linux_nat) \ - linux_nat_debug_printf_1 (__func__, fmt, ##__VA_ARGS__); \ - } \ - while (0) + debug_prefixed_printf ("linux-nat", __func__, fmt, ##__VA_ARGS__) struct simple_pid_list { -- cgit v1.1